Index: firmware/.cproject
===================================================================
diff -u -r3e7129b2d9746fa402cb92870710d5df280a840c -rd694913cb85c7b3fe8835a007a750c5f5f78258e
--- firmware/.cproject (.../.cproject) (revision 3e7129b2d9746fa402cb92870710d5df280a840c)
+++ firmware/.cproject (.../.cproject) (revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -100,6 +100,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: firmware/.settings/com.ti.ccstudio.project.core.prefs
===================================================================
diff -u
--- firmware/.settings/com.ti.ccstudio.project.core.prefs (revision 0)
+++ firmware/.settings/com.ti.ccstudio.project.core.prefs (revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -0,0 +1,4 @@
+ccsVersionValidationPolicy=warning
+compilerVersionValidationPolicy=flexible
+eclipse.preferences.version=1
+productVersionsValidationPolicy=flexible
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r5960618dff4c2abf61dd707f94676539c4d1658b -rd694913cb85c7b3fe8835a007a750c5f5f78258e
--- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 5960618dff4c2abf61dd707f94676539c4d1658b)
+++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -1209,11 +1209,17 @@
handleReceiveROPermeateSampleReadyToDispenseFromDG( message );
break;
- // NOTE: this always must be the last case
- case MSG_ID_TESTER_LOGIN_REQUEST:
- handleTesterLogInRequest( message );
- break;
-
+ case MSG_ID_FW_SET_ENTER_BOOTLOADER:
+ case MSG_ID_FW_ENTER_BOOTLOADER_NOW:
+ case MSG_ID_FW_REBOOT_NOW:
+ handleRebootNowRequest( message );
+ break;
+
+ // NOTE: this always must be the last case
+ case MSG_ID_TESTER_LOGIN_REQUEST:
+ handleTesterLogInRequest( message );
+ break;
+
default:
// Un-recognized or un-handled message ID received - ignore
break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5960618dff4c2abf61dd707f94676539c4d1658b -rd694913cb85c7b3fe8835a007a750c5f5f78258e
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 5960618dff4c2abf61dd707f94676539c4d1658b)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -42,7 +42,6 @@
#include "TreatmentEnd.h"
#include "TreatmentRecirc.h"
#include "TreatmentStop.h"
-#include "Update.h"
#include "Utilities.h"
#include "Valves.h"
#include "WatchdogMgmt.h"
@@ -8577,6 +8576,9 @@
* @brief
* The handleRebootNowRequest function handles a
* request immediately jump to the bootloader application.
+ * The handleRebootNowRequest function handles a
+ * request to reboot the system. A software reset will cause the bootloader
+ * to stay active.
* @details Inputs: none
* @details Outputs: message handled
* @param message : a pointer to the message to handle
@@ -8591,8 +8593,8 @@
if (result)
{
- // Jump to the bootloader, there is no coming back from this.
- startBootloader();
+ // Trigger a software reset.
+ systemREG1->SYSECR = (0x2) << 14;
}
}
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r5960618dff4c2abf61dd707f94676539c4d1658b -rd694913cb85c7b3fe8835a007a750c5f5f78258e
--- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 5960618dff4c2abf61dd707f94676539c4d1658b)
+++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision d694913cb85c7b3fe8835a007a750c5f5f78258e)
@@ -988,6 +988,7 @@
// MSG_ID_HD_BLOOD_PUMP_HARD_STOP
void handleBloodPumpHardStopRequest( MESSAGE_T *message );
+
// MSG_ID_HD_SET_ENTER_BOOTLOADER
void handleSetBootloaderRequest( MESSAGE_T *message );
@@ -1024,6 +1025,11 @@
// MSG_ID_HD_RECIRULATION_PCT_OVERRIDE
void handleTestHDRecirulationPctOverrideRequest( MESSAGE_T* message );
+// MSG_ID_FW_SET_ENTER_BOOTLOADER
+// MSG_ID_FW_ENTER_BOOTLOADER_NOW
+// MSG_ID_FW_REBOOT_NOW
+void handleRebootNowRequest( MESSAGE_T *message );
+
/**@}*/
#endif