Index: firmware/.cproject
===================================================================
diff -u -r1581e96d8d520cfa7ee7a27030a240ed0155c697 -r5fee19014b35574d67b210f71581a6013650528e
--- firmware/.cproject (.../.cproject) (revision 1581e96d8d520cfa7ee7a27030a240ed0155c697)
+++ firmware/.cproject (.../.cproject) (revision 5fee19014b35574d67b210f71581a6013650528e)
@@ -105,6 +105,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fisheye: Tag 5fee19014b35574d67b210f71581a6013650528e refers to a dead (removed) revision in file `firmware/App/Modes/Update.c'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5fee19014b35574d67b210f71581a6013650528e refers to a dead (removed) revision in file `firmware/App/Modes/Update.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rdad52d69c15f96d2b7ca7e22138f5d07a3948a9f -r5fee19014b35574d67b210f71581a6013650528e
--- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision dad52d69c15f96d2b7ca7e22138f5d07a3948a9f)
+++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 5fee19014b35574d67b210f71581a6013650528e)
@@ -1185,15 +1185,9 @@
handleSetHDServiceTime( message );
break;
- case MSG_ID_HD_SET_ENTER_BOOTLOADER:
- handleSetBootloaderRequest( message );
- break;
-
- case MSG_ID_HD_ENTER_BOOTLOADER_NOW:
- handleEnterBootloaderNowRequest( message );
- break;
-
- case MSG_ID_HD_REBOOT_NOW:
+ case MSG_ID_FW_SET_ENTER_BOOTLOADER:
+ case MSG_ID_FW_ENTER_BOOTLOADER_NOW:
+ case MSG_ID_FW_REBOOT_NOW:
handleRebootNowRequest( message );
break;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r72831229355e23d75b0e48dbbf134cf0b3e77001 -r5fee19014b35574d67b210f71581a6013650528e
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 72831229355e23d75b0e48dbbf134cf0b3e77001)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 5fee19014b35574d67b210f71581a6013650528e)
@@ -40,7 +40,6 @@
#include "TreatmentEnd.h"
#include "TreatmentRecirc.h"
#include "TreatmentStop.h"
-#include "Update.h"
#include "Utilities.h"
#include "Valves.h"
#include "WatchdogMgmt.h"
@@ -8014,6 +8013,7 @@
/*********************************************************************//**
* @brief
+<<<<<<< HEAD
* The handleDialInPumpHardStopRequest function handles a
* request to stop the dial in pump.
* @details Inputs: none
@@ -8128,8 +8128,11 @@
/*********************************************************************//**
* @brief
* The handleEnterBootloaderNowRequest function handles a
+=======
+ * The handleRebootNowRequest function handles a
+>>>>>>> Update messaging and project
* request to reboot the system. A software reset will cause the bootloader
- * to stay active for XX seconds.
+ * to stay active.
* @details Inputs: none
* @details Outputs: message handled
* @param message : a pointer to the message to handle
@@ -8144,8 +8147,8 @@
if (result)
{
- // Jump to the bootloader, there is no coming back from this.
- rebootSystemNow();
+ // Trigger a software reset.
+ systemREG1->SYSECR = (0x2) << 14;
}
}
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rdad52d69c15f96d2b7ca7e22138f5d07a3948a9f -r5fee19014b35574d67b210f71581a6013650528e
--- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision dad52d69c15f96d2b7ca7e22138f5d07a3948a9f)
+++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 5fee19014b35574d67b210f71581a6013650528e)
@@ -959,6 +959,7 @@
// MSG_ID_HD_BATTERY_COMM_STATUS_OVERRIDE
void handleBatteryI2CStatusOverrideRequest( MESSAGE_T *message );
+<<<<<<< HEAD
// MSG_ID_HD_DIAL_IN_PUMP_HARD_STOP
void handleDialInPumpHardStopRequest( MESSAGE_T * message );
@@ -983,6 +984,11 @@
void handleEnterBootloaderNowRequest( MESSAGE_T *message );
// MSG_ID_HD_REBOOT_NOW
+=======
+// MSG_ID_FW_SET_ENTER_BOOTLOADER
+// MSG_ID_FW_ENTER_BOOTLOADER_NOW
+// MSG_ID_FW_REBOOT_NOW
+>>>>>>> Update messaging and project
void handleRebootNowRequest( MESSAGE_T *message );
/**@}*/