check for signal with and without pullup

AlkaMotors · Jul 9, 2021 · b6362cb · b6362cb
1 parent de082e2
commit b6362cb
Show file tree

Hide file tree

Showing 40 changed files with 96 additions and 6,227 deletions.
diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
@@ -1,27 +1,52 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-	<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1950554462" name="Debug">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="113421523670123703" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-	<configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1362137836" name="Release">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="113421523670123703" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
+
+    <configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.1950554462" name="Debug">
+
+        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+
+            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+
+            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+
+            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+
+            <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="196851133827872175" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+
+                <language-scope id="org.eclipse.cdt.core.gcc"/>
+
+                <language-scope id="org.eclipse.cdt.core.g++"/>
+
+            </provider>
+
+        </extension>
+
+    </configuration>
+
+    <configuration id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.release.1362137836" name="Release">
+
+        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+
+            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+
+            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+
+            <provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
+
+            <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="196851133827872175" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+
+                <language-scope id="org.eclipse.cdt.core.gcc"/>
+
+                <language-scope id="org.eclipse.cdt.core.g++"/>
+
+            </provider>
+
+        </extension>
+
+    </configuration>
+
 </project>
diff --git a/Core/Src/main.c b/Core/Src/main.c
@@ -1,8 +1,8 @@
 /* Bootloader */
 
-#define BOOTLOADER_VERSION 9
+#define BOOTLOADER_VERSION 10
 
-//#define USE_PA2
+#define USE_PA2
 
 /* Includes ------------------------------------------------------------------*/
 #include <stdbool.h>
@@ -532,6 +532,49 @@ save_flash_nolib(rxBuffer, 48, EEPROM_START_ADD);
 }
 }
 
+void checkForSignal(){
+	//uint8_t floating_or_signal= 0;
+	  LL_GPIO_SetPinPull(input_port, input_pin, LL_GPIO_PULL_DOWN);
+	  delayMicroseconds(500);
+
+	  for(int i = 0 ; i < 500; i ++){
+		 if( !(input_port->IDR & input_pin)){
+			 low_pin_count++;
+		 }else{
+		//	 high_pin_count++;
+		 }
+
+		  delayMicroseconds(10);
+	  }
+			 if(low_pin_count == 0){
+				 return;           // all high while pin is pulled low, bootloader signal
+			 }
+
+		 low_pin_count = 0;
+
+		 LL_GPIO_SetPinPull(input_port, input_pin, LL_GPIO_PULL_NO);
+		 delayMicroseconds(500);
+
+		 for(int i = 0 ; i < 500; i ++){
+		 if( !(input_port->IDR & input_pin)){
+			 low_pin_count++;
+		 }
+
+		  delayMicroseconds(10);
+	  }
+		 if(low_pin_count == 0){
+			 return;            // when floated all
+		 }
+
+		 if(low_pin_count > 0){
+			 jump();
+		 }
+
+
+
+}
+
+
 
 int main(void)
 {
@@ -550,21 +593,8 @@ int main(void)
 
    MX_GPIO_INPUT_INIT();     // init the pin with a pulldown
 
-  LL_GPIO_SetPinPull(input_port, input_pin, LL_GPIO_PULL_DOWN);
-  delayMicroseconds(1000);
-
-  for(int i = 0 ; i < 1000; i ++){
-	 if( !(input_port->IDR & input_pin)){  // if the pin is low for 10 checks out of 100 in  10ms or more its either no signal or signal. jump to application
-		 low_pin_count++;
-	 }
-	 if(low_pin_count > 10){
-		 jump();
-	 }
-	  delayMicroseconds(10);
-  }
-
-  LL_GPIO_SetPinPull(input_port, input_pin, LL_GPIO_PULL_UP);
-
+   checkForSignal();
+   LL_GPIO_SetPinPull(input_port, input_pin, LL_GPIO_PULL_UP);
   #ifdef USE_ADC_INPUT  // go right to application
   jump();
 

diff --git a/Debug/Core/Src/bootloader.su b/Debug/Core/Src/bootloader.su
diff --git a/Debug/Core/Src/main.su b/Debug/Core/Src/main.su
diff --git a/Debug/Core/Src/stm32f0xx_it.su b/Debug/Core/Src/stm32f0xx_it.su
diff --git a/Debug/Core/Src/subdir.mk b/Debug/Core/Src/subdir.mk
diff --git a/Debug/Core/Src/syscalls.su b/Debug/Core/Src/syscalls.su
diff --git a/Debug/Core/Src/sysmem.su b/Debug/Core/Src/sysmem.su
diff --git a/Debug/Core/Src/system_stm32f0xx.su b/Debug/Core/Src/system_stm32f0xx.su
diff --git a/Debug/Core/Startup/subdir.mk b/Debug/Core/Startup/subdir.mk
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_cortex.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_cortex.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_dma.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_dma.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_exti.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_exti.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.su
diff --git a/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.su b/Debug/Drivers/STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_gpio.su