Merge pull request #41 from FASTSHIFT/dev

Dev
FASTSHIFT · Nov 18, 2021 · bb4c83a · bb4c83a
2 parents fd6e4e7 + ba03ab2
commit bb4c83a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Software/X-Track/MDK-ARM/Objects/X-Track.hex b/Software/X-Track/MDK-ARM/Objects/X-Track.hex
@@ -3485,7 +3485,7 @@
 :10D9B00005210C201EF0F4F800210C200DF012FBC4
 :10D9C00020460DF0D5FA01210C200DF00BFB12A121
 :10D9D000104803F0D6FFFDF7ABFF032101201EF036
-:10D9E000DFF802210B201EF0DBF8BDE8104000201C
+:10D9E000DFF801210B201EF0DBF8BDE8104000201D
 :10D9F00000F0FCBBF4060020506F7765723A2057A8
 :10DA0000616974696E675B25646D735D2E2E2E0DE2
 :10DA10000A000000D8160320506F7765723A204F35
@@ -3560,7 +3560,7 @@
 :10DE6000ECE7000074F103089805002002494868B7
 :10DE700000224A6070470000D00000207047000078
 :10DE800002A207A108A00CF04BBF000076322E3092
-:10DE9000204E6F76203134203230323100000000C5
+:10DE9000204E6F76203138203230323100000000C1
 :10DEA00076312E3000000000582D545241434B0073
 :10DEB0000448DFED050A90ED010AB8EE400A20EEB5
 :10DEC000200A7047F8000020BD37063A064810B512
@@ -3904,8 +3904,8 @@
 :10F3E000CDE9011015A318A21AA1284601F000F9D1
 :10F3F00027B0F0BD2D000000534446415420763123
 :10F4000030313032000000004F4B00004552524F67
-:10F41000520000004E6F7620313420323032310AF3
-:10F4200031353A33333A34380000000041524D430D
+:10F41000520000004E6F7620313820323032310AEF
+:10F4200031343A31323A30330000000041524D431A
 :10F43000430A7635303630373530000076382E3195
 :10F440002E312064657600005F5649464558546564
 :10F4500063680000582D545241434B2076322E30C1

diff --git a/Software/X-Track/USER/HAL/HAL_Power.cpp b/Software/X-Track/USER/HAL/HAL_Power.cpp
@@ -90,7 +90,7 @@ void HAL::Power_Init()
 
     Power_ADC_Init();
     pinMode(CONFIG_BAT_DET_PIN, INPUT_ANALOG);
-    pinMode(CONFIG_BAT_CHG_DET_PIN, INPUT_PULLDOWN);
+    pinMode(CONFIG_BAT_CHG_DET_PIN, INPUT_PULLUP);
 
 //    Power_SetAutoLowPowerTimeout(5 * 60);
 //    Power_HandleTimeUpdate();