diff options
Diffstat (limited to 'bootloader')
| -rwxr-xr-x | bootloader/Core/Src/main.c | 3 | ||||
| -rwxr-xr-x | bootloader/plinkybl debug.launch | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/bootloader/Core/Src/main.c b/bootloader/Core/Src/main.c index 2f45dc4..a16aade 100755 --- a/bootloader/Core/Src/main.c +++ b/bootloader/Core/Src/main.c @@ -341,8 +341,9 @@ int main(void) /* USER CODE BEGIN 3 */ if (encstate==1) startreset=true; - if (encstate==0x80 && startreset) { + if (encstate==0x0 && startreset) { // released the encoder + HAL_Delay(100); scb_reset_system(); } if (encheld>10000) diff --git a/bootloader/plinkybl debug.launch b/bootloader/plinkybl debug.launch index 6908cb2..1c6fef8 100755 --- a/bootloader/plinkybl debug.launch +++ b/bootloader/plinkybl debug.launch @@ -5,7 +5,7 @@ <stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.debug_auth_certif_path" value=""/> <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.debug_auth_check_enable" value="false"/> <stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.debug_auth_key_path" value=""/> - <stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.debug_auth_permission" value="debug_non_secure_L3"/> + <stringAttribute key="com.st.stm32cube.ide.mcu.debug.launch.debug_auth_permission" value=""/> <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_live_expr" value="true"/> <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.launch.enable_swv" value="false"/> <intAttribute key="com.st.stm32cube.ide.mcu.debug.launch.formatVersion" value="2"/> @@ -73,7 +73,7 @@ <stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug/plinkybl.elf"/> <stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="plinkybl"/> <booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/> - <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value=""/> + <stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.384220978"/> <booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> <listEntry value="/plinkybl"/> |