Index: firmware/.cproject
===================================================================
diff -u -rccb8fe95bdb4416a675d3c5d35a86289123fb370 -rdd3356035996866e5db7678d352f933fc22ad789
--- firmware/.cproject (.../.cproject) (revision ccb8fe95bdb4416a675d3c5d35a86289123fb370)
+++ firmware/.cproject (.../.cproject) (revision dd3356035996866e5db7678d352f933fc22ad789)
@@ -41,7 +41,7 @@
@@ -135,7 +138,7 @@
Index: firmware/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u -r789c1a1b2bfc0e4f8b416bd08c0822babf85d32f -rdd3356035996866e5db7678d352f933fc22ad789
--- firmware/.settings/org.eclipse.core.resources.prefs (.../org.eclipse.core.resources.prefs) (revision 789c1a1b2bfc0e4f8b416bd08c0822babf85d32f)
+++ firmware/.settings/org.eclipse.core.resources.prefs (.../org.eclipse.core.resources.prefs) (revision dd3356035996866e5db7678d352f933fc22ad789)
@@ -11,6 +11,8 @@
encoding//Debug/App/Tasks/subdir_vars.mk=UTF-8
encoding//Debug/FWCommon/FlashDriver/subdir_rules.mk=UTF-8
encoding//Debug/FWCommon/FlashDriver/subdir_vars.mk=UTF-8
+encoding//Debug/FWCommon/FlashDrvr/subdir_rules.mk=UTF-8
+encoding//Debug/FWCommon/FlashDrvr/subdir_vars.mk=UTF-8
encoding//Debug/FWCommon/subdir_rules.mk=UTF-8
encoding//Debug/FWCommon/subdir_vars.mk=UTF-8
encoding//Debug/makefile=UTF-8
@@ -28,6 +30,8 @@
encoding//Release/App/Services/subdir_vars.mk=UTF-8
encoding//Release/App/Tasks/subdir_rules.mk=UTF-8
encoding//Release/App/Tasks/subdir_vars.mk=UTF-8
+encoding//Release/FWCommon/FlashDriver/subdir_rules.mk=UTF-8
+encoding//Release/FWCommon/FlashDriver/subdir_vars.mk=UTF-8
encoding//Release/FWCommon/subdir_rules.mk=UTF-8
encoding//Release/FWCommon/subdir_vars.mk=UTF-8
encoding//Release/makefile=UTF-8
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -rdd3356035996866e5db7678d352f933fc22ad789
--- firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision 8b56b0c617ac49536b8d53852b9621be873bade6)
+++ firmware/App/Controllers/LoadCell.c (.../LoadCell.c) (revision dd3356035996866e5db7678d352f933fc22ad789)
@@ -1,6 +1,6 @@
/**********************************************************************//**
*
- * Copyright (c) 2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
*
* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Controllers/LoadCell.h
===================================================================
diff -u -r8b56b0c617ac49536b8d53852b9621be873bade6 -rdd3356035996866e5db7678d352f933fc22ad789
--- firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision 8b56b0c617ac49536b8d53852b9621be873bade6)
+++ firmware/App/Controllers/LoadCell.h (.../LoadCell.h) (revision dd3356035996866e5db7678d352f933fc22ad789)
@@ -1,6 +1,6 @@
/**********************************************************************//**
*
- * Copyright (c) 2020 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
*
* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
* WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7acb9d914f79aaa921c95e1a4049594c889bf795 -rdd3356035996866e5db7678d352f933fc22ad789
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 7acb9d914f79aaa921c95e1a4049594c889bf795)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision dd3356035996866e5db7678d352f933fc22ad789)
@@ -274,8 +274,7 @@
memcpy( payloadPtr, &epoch, sizeof( U32 ) );
// serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-// result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_BROADCAST, ACK_NOT_REQUIRED );
- result = TRUE; // TODO - don't want DG broadcasting its time
+ result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
return result;
}
@@ -353,32 +352,7 @@
return result;
}
-#ifdef CAN_TEST
-void broadcastCANTest1LargeFrequentMessage()
-{
- static U16 seqNo = 0;
- MESSAGE_T msg;
- U32 i;
- // create a message record
- blankMessage( &msg );
- msg.hdr.msgID = MSG_ID_DG_CAN_TEST_1_LARGE_FREQ;
- msg.hdr.payloadLen = 96;
-
- for ( i = 0; i < 12; i++ )
- {
- memcpy(&msg.payload[i*8], &seqNo, 2);
- seqNo++;
- }
- memcpy(&msg.payload[94], &seqNo, 2);
- seqNo++;
-
- // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
- serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_BROADCAST, ACK_NOT_REQUIRED );
-}
-#endif
-
-
/*************************************************************************
* TEST SUPPORT FUNCTIONS
*************************************************************************/
@@ -527,54 +501,18 @@
DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
/*************************************************************************
- * @brief handleTestLoadCellA1OverrideRequest
- * The handleTestLoadCellA1OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
+ * @brief
+ * The handleTestLoadCellOverrideRequest function handles a request to \n
+ * override the value read from the given load cell.
* @details
* Inputs : none
* Outputs : message handled
* @param message : a pointer to the message to handle
* @return none
*************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellA1OverrideRequest, testSetLoadCellA1Override, testResetLoadCellA1Override )
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellOverrideRequest, testSetLoadCellOverride, testResetLoadCellOverride )
/*************************************************************************
- * @brief handleTestLoadCellA2OverrideRequest
- * The handleTestLoadCellA2OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellA2OverrideRequest, testSetLoadCellA2Override, testResetLoadCellA2Override )
-
-/*************************************************************************
- * @brief handleTestLoadCellB1OverrideRequest
- * The handleTestLoadCellB1OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellB1OverrideRequest, testSetLoadCellB1Override, testResetLoadCellB1Override )
-
-/*************************************************************************
- * @brief handleTestLoadCellB2OverrideRequest
- * The handleTestLoadCellB2OverrideRequest function handles a request to \n
- * override the value read from load cell A1 adc.
- * @details
- * Inputs : none
- * Outputs : message handled
- * @param message : a pointer to the message to handle
- * @return none
- *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestLoadCellB2OverrideRequest, testSetLoadCellB2Override, testResetLoadCellB2Override )
-
-/*************************************************************************
* @brief handleSetRTCTimestamp
* The handleSetRTCTimestamp function handles a request to write time and
* date to RTC