Index: firmware/.launches/HD.launch
===================================================================
diff -u -rb831c4f803bd92f6a16f854e3d02222fe76a379e -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/.launches/HD.launch (.../HD.launch) (revision b831c4f803bd92f6a16f854e3d02222fe76a379e)
+++ firmware/.launches/HD.launch (.../HD.launch) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -9,6 +9,7 @@
+
@@ -32,6 +33,7 @@
+
@@ -40,6 +42,7 @@
+
@@ -49,6 +52,7 @@
+
Index: firmware/App/Common.h
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/App/Common.h (.../Common.h) (revision 1c80d60fe6a95297a8a8033a3c7eade53e72779a)
+++ firmware/App/Common.h (.../Common.h) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -22,7 +22,7 @@
// ********** build switches **********
#ifndef _VECTORCAST_
-// #define RM46_EVAL_BOARD_TARGET 1
+ #define RM46_EVAL_BOARD_TARGET 1
// #define SIMULATE_UI 1
// #define DEBUG_ENABLED 1
// #define ACK_NOT_IMPLEMENTED 1
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re85815f8334417aa2ffac8bc366d25ed72ab4e1e -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision e85815f8334417aa2ffac8bc366d25ed72ab4e1e)
+++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -1012,11 +1012,8 @@
U32 years;
memcpy(&years, &message->payload[5], sizeof(U32));
- // TODO: Change setRTCTimestamp to return a boolean for this
- result = TRUE;
+ result = setRTCTimestamp( seconds, minutes, hours, days, months, years );
- setRTCTimestamp( seconds, minutes, hours, days, months, years );
-
// respond to request
sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
}
Index: firmware/App/Services/WatchdogMgmt.c
===================================================================
diff -u -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0 -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
+++ firmware/App/Services/WatchdogMgmt.c (.../WatchdogMgmt.c) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -105,7 +105,7 @@
petWatchdog();
resetWDTaskCheckIns();
}
-
+#ifndef RM46_EVAL_BOARD_TARGET
// check to see if watchdog has expired
if ( getCPLDWatchdogExpired() == PIN_SIGNAL_HIGH )
{
@@ -118,6 +118,7 @@
#endif
}
}
+#endif
}
/*************************************************************************
Index: firmware/HD.dil
===================================================================
diff -u -r1c80d60fe6a95297a8a8033a3c7eade53e72779a -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/HD.dil (.../HD.dil) (revision 1c80d60fe6a95297a8a8033a3c7eade53e72779a)
+++ firmware/HD.dil (.../HD.dil) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -1,4 +1,4 @@
-# RM46L852PGE 01/22/20 12:55:22
+# RM46L852PGE 02/04/20 17:48:12
#
ARCH=RM46L852PGE
#
@@ -2569,7 +2569,7 @@
DRIVER.MIBSPI.VAR.MIBSPI5_PARPOL2.VALUE=0
DRIVER.MIBSPI.VAR.MIBSPI3_PORT_BIT2_PDR.VALUE=0
DRIVER.MIBSPI.VAR.MIBSPI3_TG5_BUF_DFSEL.VALUE=0
-DRIVER.MIBSPI.VAR.MIBSPI3_TG0_BUF_CSNR.VALUE=CS_0
+DRIVER.MIBSPI.VAR.MIBSPI3_TG0_BUF_CSNR.VALUE=CS_1
DRIVER.MIBSPI.VAR.MIBSPI3_CHARLEN2.VALUE=16
DRIVER.MIBSPI.VAR.MIBSPI5_PARPOL3.VALUE=0
DRIVER.MIBSPI.VAR.MIBSPI3_CHARLEN3.VALUE=16
@@ -7207,7 +7207,7 @@
DRIVER.PINMUX.VAR.DMA_IFT_COUNT_24.VALUE=0
DRIVER.PINMUX.VAR.DMA_IFT_COUNT_16.VALUE=0
DRIVER.PINMUX.VAR.DMA_INTLFSEN_12.VALUE=1
-DRIVER.PINMUX.VAR.MUX30_OPTION0.VALUE=1
+DRIVER.PINMUX.VAR.MUX30_OPTION0.VALUE=0
DRIVER.PINMUX.VAR.MUX22_OPTION0.VALUE=0
DRIVER.PINMUX.VAR.MUX14_OPTION0.VALUE=0
DRIVER.PINMUX.VAR.DMA_FIDXD_29.VALUE=0
@@ -7497,7 +7497,7 @@
DRIVER.PINMUX.VAR.DMA_TTYPE_16.VALUE=FRAME_TRANSFER
DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_16.VALUE=0
DRIVER.PINMUX.VAR.DMA_STADD_2.VALUE=0
-DRIVER.PINMUX.VAR.MUX21_OPTION0.VALUE=0
+DRIVER.PINMUX.VAR.MUX21_OPTION0.VALUE=1
DRIVER.PINMUX.VAR.MUX13_OPTION0.VALUE=0
DRIVER.PINMUX.VAR.DMA_TTYPE_25.VALUE=FRAME_TRANSFER
DRIVER.PINMUX.VAR.DMA_CP0_IDADDR_25.VALUE=0
Index: firmware/source/mibspi.c
===================================================================
diff -u -rfe01fd0124c0c43737474781730608d55d0f0bda -ra8451b47c75daac4189cf58bfaa007606d559376
--- firmware/source/mibspi.c (.../mibspi.c) (revision fe01fd0124c0c43737474781730608d55d0f0bda)
+++ firmware/source/mibspi.c (.../mibspi.c) (revision a8451b47c75daac4189cf58bfaa007606d559376)
@@ -214,7 +214,7 @@
| (uint16)((uint16)0U << 11U) /* lock transmission */
| (uint16)((uint16)0U << 8U) /* data format */
/*SAFETYMCUSW 334 S MR:10.5 "LDRA Tool issue" */
- | ((uint16)(~((uint16)0xFFU ^ (uint16)CS_0)) & (uint16)0x00FFU); /* chip select */
+ | ((uint16)(~((uint16)0xFFU ^ (uint16)CS_1)) & (uint16)0x00FFU); /* chip select */
i++;
}
#endif
@@ -223,7 +223,7 @@
| (uint16)((uint16)0U << 10U) /* enable WDELAY */
| (uint16)((uint16)0U << 8U) /* data format */
/*SAFETYMCUSW 334 S MR:10.5 "LDRA Tool issue" */
- | ((uint16)(~((uint16)0xFFU ^ (uint16)CS_0)) & (uint16)0x00FFU); /* chip select */
+ | ((uint16)(~((uint16)0xFFU ^ (uint16)CS_1)) & (uint16)0x00FFU); /* chip select */
i++;