From bcd7ddb6006701bbaf2a6d77512ac8525b863426 Mon Sep 17 00:00:00 2001
From: Clemens Elflein <clemens1@familie-elflein.de>
Date: Thu, 31 Oct 2024 00:16:23 +0100
Subject: [PATCH] allow booting into user program

---
 bootloader/.idea/workspace.xml | 17 +++++++----------
 bootloader/main.c              |  1 -
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/bootloader/.idea/workspace.xml b/bootloader/.idea/workspace.xml
index 57f2b59..729c55d 100644
--- a/bootloader/.idea/workspace.xml
+++ b/bootloader/.idea/workspace.xml
@@ -5,7 +5,7 @@
   </component>
   <component name="BackendCodeEditorMiscSettings">
     <option name="/Default/Housekeeping/GlobalSettingsUpgraded/IsUpgraded/@EntryValue" value="true" type="bool" />
-    <option name="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue" value="264" type="long" />
+    <option name="/Default/Environment/Hierarchy/GeneratedFilesCacheKey/Timestamp/@EntryValue" value="265" type="long" />
   </component>
   <component name="CMakePresetLoader">{
   &quot;useNewFormat&quot;: true
@@ -41,8 +41,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="1bb55a81-22ac-441c-9b50-0667791a71de" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/../.github/workflows/ci.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../.github/workflows/ci.yaml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/main.c" beforeDir="false" afterPath="$PROJECT_DIR$/main.c" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -90,6 +90,7 @@
     &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
     &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;main&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/clemens/Dev/fw-openmower-v2&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -100,11 +101,6 @@
   }
 }</component>
   <component name="RunManager" selected="Embedded GDB Server.xcore-jlink">
-    <configuration default="true" type="CLionExternalRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true">
-      <method v="2">
-        <option name="CLION.EXTERNAL.BUILD" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="ChibiOS" type="CMakeRunConfiguration" factoryName="Application" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" EMULATE_TERMINAL="false" PASS_PARENT_ENVS_2="true" PROJECT_NAME="xcore-boot" TARGET_NAME="ChibiOS" CONFIG_NAME="Debug - Debug">
       <method v="2">
         <option name="com.jetbrains.cidr.execution.CidrBuildBeforeRunTaskProvider$BuildBeforeRunTask" enabled="true" />
@@ -170,7 +166,8 @@
       <updated>1730246674813</updated>
       <workItem from="1730246676068" duration="6822000" />
       <workItem from="1730310905822" duration="4227000" />
-      <workItem from="1730325273241" duration="353000" />
+      <workItem from="1730325273241" duration="1470000" />
+      <workItem from="1730327830005" duration="1007000" />
     </task>
     <servers />
   </component>
@@ -192,12 +189,12 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/main.c</url>
-          <line>87</line>
+          <line>86</line>
           <option name="timeStamp" value="6" />
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/main.c</url>
-          <line>117</line>
+          <line>116</line>
           <option name="timeStamp" value="7" />
         </line-breakpoint>
       </breakpoints>
diff --git a/bootloader/main.c b/bootloader/main.c
index 36f196d..17e40f2 100644
--- a/bootloader/main.c
+++ b/bootloader/main.c
@@ -23,7 +23,6 @@ void link_up(struct netif *netif) {
 }
 
 void jump_to_user_program(void) {
-  return;
   RTC->BKP0R = 0xB0043D;
 #ifdef BOARD_HAS_EEPROM