Index: firmware/.cproject
===================================================================
diff -u -rd2dfbe0338029375e84218c3f090f1971d9878ae -rf5f9b7f7aebb2b985d61641713635bc422c29bc9
--- firmware/.cproject (.../.cproject) (revision d2dfbe0338029375e84218c3f090f1971d9878ae)
+++ firmware/.cproject (.../.cproject) (revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -105,6 +105,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 f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -0,0 +1,4 @@
+ccsVersionValidationPolicy=warning
+compilerVersionValidationPolicy=flexible
+eclipse.preferences.version=1
+productVersionsValidationPolicy=flexible
Fisheye: Tag f5f9b7f7aebb2b985d61641713635bc422c29bc9 refers to a dead (removed) revision in file `firmware/App/Modes/Update.c'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag f5f9b7f7aebb2b985d61641713635bc422c29bc9 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 -rfcde872fd7bdadac4db7d2e8903974bfbbc2b125 -rf5f9b7f7aebb2b985d61641713635bc422c29bc9
--- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision fcde872fd7bdadac4db7d2e8903974bfbbc2b125)
+++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -1163,15 +1163,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 -rfcde872fd7bdadac4db7d2e8903974bfbbc2b125 -rf5f9b7f7aebb2b985d61641713635bc422c29bc9
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision fcde872fd7bdadac4db7d2e8903974bfbbc2b125)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -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"
@@ -8013,6 +8012,7 @@
/*********************************************************************//**
* @brief
+<<<<<<< HEAD
* The handleDialInPumpHardStopRequest function handles a
* request to stop the dial in pump.
* @details Inputs: none
@@ -8127,8 +8127,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
@@ -8143,8 +8146,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 -r23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8 -rf5f9b7f7aebb2b985d61641713635bc422c29bc9
--- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 23ff586bf450a0fe6dd88bdac1fb433cfeb7e6e8)
+++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision f5f9b7f7aebb2b985d61641713635bc422c29bc9)
@@ -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 );
@@ -975,6 +976,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 );
/**@}*/