From 4520fab4355f6541678d8c950287986ad63c3190 Mon Sep 17 00:00:00 2001 From: "Brown.Z" Date: Wed, 7 Sep 2022 16:22:43 +0800 Subject: [PATCH] Saving files before refreshing line endings --- .gitattributes | 15 +++++++++++++++ modules/ChibiOS | 2 +- modules/DroneCAN/DSDL | 2 +- modules/DroneCAN/dronecan_dsdlc | 2 +- modules/DroneCAN/libcanard | 2 +- modules/DroneCAN/pydronecan | 2 +- modules/gtest | 2 +- modules/mavlink | 2 +- modules/uavcan | 2 +- 9 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index cd250fd8b3..ae577c8b1c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,3 +10,18 @@ *.bin binary linguist-generated *.elf binary linguist-generated *.hex binary linguist-generated + +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.h text + +# Declare files that will always have CRLF line endings on checkout. +*.sln text eol=crlf + +# Denote all files that are truly binary and should not be modified. +*.png binary +*.jpg binary \ No newline at end of file diff --git a/modules/ChibiOS b/modules/ChibiOS index 38022f4fe0..d26621099b 160000 --- a/modules/ChibiOS +++ b/modules/ChibiOS @@ -1 +1 @@ -Subproject commit 38022f4fe00e08cfaae32147c40861c5362e6e0a +Subproject commit d26621099b3918c097e3fe7047c0c7999b2d7fd7 diff --git a/modules/DroneCAN/DSDL b/modules/DroneCAN/DSDL index 6bf9a446e5..c09dac9dd3 160000 --- a/modules/DroneCAN/DSDL +++ b/modules/DroneCAN/DSDL @@ -1 +1 @@ -Subproject commit 6bf9a446e553985a4eeaa7c1fb478a0a2253d8a1 +Subproject commit c09dac9dd35133edc8ba08f59b71c64d0e6328bd diff --git a/modules/DroneCAN/dronecan_dsdlc b/modules/DroneCAN/dronecan_dsdlc index 285a56e827..c00fc457e2 160000 --- a/modules/DroneCAN/dronecan_dsdlc +++ b/modules/DroneCAN/dronecan_dsdlc @@ -1 +1 @@ -Subproject commit 285a56e82741886b2bc7a5878d907aa443337cd8 +Subproject commit c00fc457e22c0b71e3a385f092b519830ef58ea2 diff --git a/modules/DroneCAN/libcanard b/modules/DroneCAN/libcanard index 95cb5c3b23..8e66f73398 160000 --- a/modules/DroneCAN/libcanard +++ b/modules/DroneCAN/libcanard @@ -1 +1 @@ -Subproject commit 95cb5c3b23f5b4b049eac57631b127ed6a2247dc +Subproject commit 8e66f733981c8acb5bed67d57b0079238e611cfa diff --git a/modules/DroneCAN/pydronecan b/modules/DroneCAN/pydronecan index 4c5b1eb297..8fb1b18ab3 160000 --- a/modules/DroneCAN/pydronecan +++ b/modules/DroneCAN/pydronecan @@ -1 +1 @@ -Subproject commit 4c5b1eb297eadb78ea14f582ccb2b7b4343b9483 +Subproject commit 8fb1b18ab3250695d85fe2943dfc68e8b45024b7 diff --git a/modules/gtest b/modules/gtest index 10b1902d89..c5fed93f94 160000 --- a/modules/gtest +++ b/modules/gtest @@ -1 +1 @@ -Subproject commit 10b1902d893ea8cc43c69541d70868f91af3646b +Subproject commit c5fed93f941865a0e912e9baf46ded713506590a diff --git a/modules/mavlink b/modules/mavlink index de9f545fee..60c48d29c6 160000 --- a/modules/mavlink +++ b/modules/mavlink @@ -1 +1 @@ -Subproject commit de9f545feef2f28dd56f87a1d3c2670b7d7a0e9b +Subproject commit 60c48d29c63875362cd3c4ee2ff7f08271c5a43f diff --git a/modules/uavcan b/modules/uavcan index de3174b0f3..5eec022030 160000 --- a/modules/uavcan +++ b/modules/uavcan @@ -1 +1 @@ -Subproject commit de3174b0f3aa9f55bc8ddfa1e7736c6a465cda18 +Subproject commit 5eec0220302dfaa23602d7ee901cde0579fbf9e2