Index: firmware/.launches/DG.launch =================================================================== diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/.launches/DG.launch (.../DG.launch) (revision 83b1a65b576994e1f8e1476629d8f1277cd67720) +++ firmware/.launches/DG.launch (.../DG.launch) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -1,6 +1,7 @@ + @@ -14,9 +15,12 @@ + + + Index: firmware/App/Services/CommBuffers.h =================================================================== diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision eff7b1575f008f81b29ef906f6346fac6012d3ab) +++ firmware/App/Services/CommBuffers.h (.../CommBuffers.h) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -24,16 +24,12 @@ typedef enum Comm_Buffers { COMM_BUFFER_NOT_USED = 0, // CAN message boxes start at 1 - COMM_BUFFER_OUT_CAN_HD_ALARM, - COMM_BUFFER_IN_CAN_DG_ALARM, - COMM_BUFFER_IN_CAN_UI_ALARM, - COMM_BUFFER_OUT_CAN_HD_2_DG, - COMM_BUFFER_IN_CAN_DG_2_HD, - COMM_BUFFER_OUT_CAN_HD_2_UI, - COMM_BUFFER_OUT_CAN_HD_BROADCAST, - COMM_BUFFER_IN_CAN_DG_BROADCAST, - COMM_BUFFER_IN_CAN_UI_2_HD, - COMM_BUFFER_IN_CAN_UI_BROADCAST, + COMM_BUFFER_OUT_CAN_DG_ALARM, + COMM_BUFFER_IN_CAN_HD_2_DG, + COMM_BUFFER_OUT_CAN_DG_2_HD, + COMM_BUFFER_OUT_CAN_DG_BROADCAST, + COMM_BUFFER_IN_CAN_PC_2_DG, + COMM_BUFFER_OUT_CAN_DG_2_PC, COMM_BUFFER_IN_UART_PC, COMM_BUFFER_OUT_UART_PC, NUM_OF_COMM_BUFFERS Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r83b1a65b576994e1f8e1476629d8f1277cd67720 -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 83b1a65b576994e1f8e1476629d8f1277cd67720) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -34,9 +34,9 @@ // ********** private definitions ********** -#define NUM_OF_CAN_OUT_BUFFERS 4 // # of CAN buffers for transmit -#define NUM_OF_CAN_IN_BUFFERS 6 // # of CAN buffers for receiving -#define NUM_OF_MSG_IN_BUFFERS 7 // # of Msg buffers for receiving +#define NUM_OF_CAN_OUT_BUFFERS 5 // # of CAN buffers for transmit +#define NUM_OF_CAN_IN_BUFFERS 3 // # of CAN buffers for receiving +#define NUM_OF_MSG_IN_BUFFERS 4 // # of Msg buffers for receiving #define SCI1_RECEIVE_DMA_REQUEST 30 #define SCI1_TRANSMIT_DMA_REQUEST 31 @@ -45,21 +45,18 @@ const COMM_BUFFER_T CAN_OUT_BUFFERS[NUM_OF_CAN_OUT_BUFFERS] = { - COMM_BUFFER_OUT_CAN_HD_ALARM, - COMM_BUFFER_OUT_CAN_HD_2_DG, - COMM_BUFFER_OUT_CAN_HD_2_UI, - COMM_BUFFER_OUT_CAN_HD_BROADCAST + COMM_BUFFER_OUT_CAN_DG_ALARM, + COMM_BUFFER_OUT_CAN_DG_2_HD, + COMM_BUFFER_OUT_CAN_DG_BROADCAST, + COMM_BUFFER_OUT_CAN_DG_2_PC, + COMM_BUFFER_OUT_UART_PC }; const COMM_BUFFER_T MSG_IN_BUFFERS[NUM_OF_MSG_IN_BUFFERS] = { - COMM_BUFFER_IN_CAN_DG_ALARM, - COMM_BUFFER_IN_CAN_UI_ALARM, - COMM_BUFFER_IN_CAN_DG_2_HD, - COMM_BUFFER_IN_CAN_DG_BROADCAST, - COMM_BUFFER_IN_CAN_UI_2_HD, - COMM_BUFFER_IN_CAN_UI_BROADCAST, - COMM_BUFFER_IN_UART_PC + COMM_BUFFER_IN_CAN_HD_2_DG, + COMM_BUFFER_IN_CAN_PC_2_DG, + COMM_BUFFER_IN_UART_PC }; static U08 pcXmitPacket[PC_MESSAGE_PACKET_SIZE] = {0,0,0,0,0,0,0,0};// = {1,2,3,4,5,6,7,8}; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -raa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision aa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -123,7 +123,7 @@ msgSize = serializeMessage( msg, data ); // add serialized message data to appropriate comm buffer - result = addToCommBuffer( COMM_BUFFER_OUT_CAN_HD_2_UI, data, msgSize ); + result = addToCommBuffer( COMM_BUFFER_OUT_CAN_DG_2_HD, data, msgSize ); return result; } @@ -163,7 +163,7 @@ # define START 1 #ifdef RM46_EVAL_BOARD_TARGET - //toggleUserLED(); + toggleUserLED(); #endif // If we start therapy @@ -264,7 +264,7 @@ msgSize = serializeMessage( msg, data ); // add serialized message data to appropriate comm buffer - result = addToCommBuffer( COMM_BUFFER_OUT_CAN_HD_2_UI, data, msgSize ); + result = addToCommBuffer( COMM_BUFFER_OUT_CAN_DG_2_HD, data, msgSize ); return result; } Index: firmware/DG.dil =================================================================== diff -u -raa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/DG.dil (.../DG.dil) (revision aa2d2d9c54eda4fbc18a3cdcba48222cd4b4177f) +++ firmware/DG.dil (.../DG.dil) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -1,4 +1,4 @@ -# RM46L852PGE 11/21/19 17:37:18 +# RM46L852PGE 12/03/19 13:09:15 # ARCH=RM46L852PGE # @@ -3417,7 +3417,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_14_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_14_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_13_INT_ENA_REF.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON.VALUE=0x00000000 +DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON.VALUE=0x00000200 DRIVER.CAN.VAR.CAN_2_MESSAGE_63_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_55_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_47_INT_ENA.VALUE=0x00000000 @@ -3758,7 +3758,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_23_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_15_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_RAM_PARITY_ENA.VALUE=0x00000005 -DRIVER.CAN.VAR.CAN_1_MESSAGE_10_BOOL_ENA.VALUE=1 +DRIVER.CAN.VAR.CAN_1_MESSAGE_10_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_1_ENA.VALUE=0x80000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_5_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_PORT_TX_PDR.VALUE=0 @@ -3852,7 +3852,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_14_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_9_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_TQ.VALUE=222.577 -DRIVER.CAN.VAR.CAN_1_MESSAGE_7_BOOL_ENA.VALUE=1 +DRIVER.CAN.VAR.CAN_1_MESSAGE_7_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_BRPE.VALUE=0 DRIVER.CAN.VAR.CAN_3_MESSAGE_7_ID.VALUE=7 DRIVER.CAN.VAR.CAN_2_MESSAGE_4_RTR.VALUE=0x00000000 @@ -4019,7 +4019,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_26_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_18_INT_ENA_REF.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_3_EOB.VALUE=0x00000080 -DRIVER.CAN.VAR.CAN_1_MESSAGE_3_DIR.VALUE=0x00000000 +DRIVER.CAN.VAR.CAN_1_MESSAGE_3_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_61_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_53_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_45_INT_ENA.VALUE=0x00000000 @@ -4086,7 +4086,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_28_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_28_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_8_INT_ENA_REF.VALUE=0x00000001 -DRIVER.CAN.VAR.CAN_1_SHIFT.VALUE=0 +DRIVER.CAN.VAR.CAN_1_SHIFT.VALUE=18 DRIVER.CAN.VAR.CAN_2_MESSAGE_64_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_2_MESSAGE_56_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_2_MESSAGE_50_MASK.VALUE=0x000007FF @@ -4104,7 +4104,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_14_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_9_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_BRPE.VALUE=0 -DRIVER.CAN.VAR.CAN_1_MASK.VALUE=0x1FFFFFFF +DRIVER.CAN.VAR.CAN_1_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_3_MESSAGE_61_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_53_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_45_INT_LEVEL.VALUE=0x00000000 @@ -4250,7 +4250,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_11_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_11_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_5_ENA.VALUE=0x80000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_3_INT_ENA.VALUE=0x00000400 +DRIVER.CAN.VAR.CAN_1_MESSAGE_3_INT_ENA.VALUE=0x00000800 DRIVER.CAN.VAR.CAN_1_MESSAGE_3_BOOL_ENA.VALUE=1 DRIVER.CAN.VAR.CAN_3_MESSAGE_58_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_PORT_RX_PSL.VALUE=1 @@ -4384,7 +4384,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_14_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_1_MESSAGE_6_ENA.VALUE=0x80000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_1_RTR.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_1_ID.VALUE=0x1 +DRIVER.CAN.VAR.CAN_1_MESSAGE_1_ID.VALUE=0x002 DRIVER.CAN.VAR.CAN_1_MESSAGE_63_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_55_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_47_DLC.VALUE=8 @@ -4440,8 +4440,8 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_34_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_26_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_18_RTR.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_2_ID.VALUE=0x2 -DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON_TR.VALUE=0 +DRIVER.CAN.VAR.CAN_1_MESSAGE_2_ID.VALUE=0x008 +DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON_TR.VALUE=103 DRIVER.CAN.VAR.CAN_3_MESSAGE_31_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_23_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_15_DLC.VALUE=8 @@ -4503,7 +4503,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_36_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_2_MESSAGE_28_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_2_MESSAGE_1_INT_ENA.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_7_ENA.VALUE=0x80000000 +DRIVER.CAN.VAR.CAN_1_MESSAGE_7_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_51_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_43_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_35_INT_LEVEL.VALUE=0x00000000 @@ -4512,7 +4512,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_11_ID.VALUE=11 DRIVER.CAN.VAR.CAN_3_MESSAGE_10_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_7_INT_LEVEL.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_3_ID.VALUE=0x4 +DRIVER.CAN.VAR.CAN_1_MESSAGE_3_ID.VALUE=0x010 DRIVER.CAN.VAR.CAN_1_MESSAGE_2_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_64_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_56_DLC.VALUE=8 @@ -4574,13 +4574,13 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_35_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_27_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_19_RTR.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_4_ID.VALUE=0x8 +DRIVER.CAN.VAR.CAN_1_MESSAGE_4_ID.VALUE=0x080 DRIVER.CAN.VAR.CAN_3_MESSAGE_40_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_32_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_24_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_16_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_8_DLC.VALUE=8 -DRIVER.CAN.VAR.CAN_1_NOMINAL_AUTO_BUS_ON_TIME.VALUE=0.000 +DRIVER.CAN.VAR.CAN_1_NOMINAL_AUTO_BUS_ON_TIME.VALUE=996.758 DRIVER.CAN.VAR.CAN_2_SHIFT.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_64_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_64_DIR.VALUE=0x20000000 @@ -4645,14 +4645,14 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_23_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_1_MESSAGE_15_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_15_MASK.VALUE=0x000007FF -DRIVER.CAN.VAR.CAN_1_MESSAGE_8_ENA.VALUE=0x80000000 +DRIVER.CAN.VAR.CAN_1_MESSAGE_8_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_21_ID.VALUE=21 DRIVER.CAN.VAR.CAN_3_MESSAGE_13_ID.VALUE=13 DRIVER.CAN.VAR.CAN_3_MESSAGE_11_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_64_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_56_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_48_INT_LEVEL.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_5_ID.VALUE=0x10 +DRIVER.CAN.VAR.CAN_1_MESSAGE_5_ID.VALUE=0x402 DRIVER.CAN.VAR.CAN_1_MESSAGE_3_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_57_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_1_MESSAGE_49_DLC.VALUE=8 @@ -4721,7 +4721,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_44_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_36_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_28_RTR.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_6_ID.VALUE=0x20 +DRIVER.CAN.VAR.CAN_1_MESSAGE_6_ID.VALUE=0x403 DRIVER.CAN.VAR.CAN_3_MESSAGE_41_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_33_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_3_MESSAGE_25_DLC.VALUE=8 @@ -4782,7 +4782,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_25_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_17_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_1_BOOL_ENA.VALUE=0 -DRIVER.CAN.VAR.CAN_1_MESSAGE_9_ENA.VALUE=0x80000000 +DRIVER.CAN.VAR.CAN_1_MESSAGE_9_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_31_ID.VALUE=31 DRIVER.CAN.VAR.CAN_3_MESSAGE_23_ID.VALUE=23 DRIVER.CAN.VAR.CAN_3_MESSAGE_20_RTR.VALUE=0x00000000 @@ -4843,7 +4843,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_25_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_3_MESSAGE_17_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_58_ENA.VALUE=0x00000000 -DRIVER.CAN.VAR.CAN_1_MESSAGE_9_BOOL_ENA.VALUE=1 +DRIVER.CAN.VAR.CAN_1_MESSAGE_9_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_3_MESSAGE_40_ID.VALUE=40 DRIVER.CAN.VAR.CAN_3_MESSAGE_32_ID.VALUE=32 DRIVER.CAN.VAR.CAN_3_MESSAGE_24_ID.VALUE=24 @@ -4963,7 +4963,7 @@ DRIVER.CAN.VAR.CAN_1_MESSAGE_37_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_29_INT_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_9_MASK.VALUE=0x000007FF -DRIVER.CAN.VAR.CAN_1_IDENTIFIER_MODE.VALUE=0x40000000 +DRIVER.CAN.VAR.CAN_1_IDENTIFIER_MODE.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_41_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_33_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_25_INT_LEVEL.VALUE=0x00000000 @@ -4975,7 +4975,7 @@ DRIVER.CAN.VAR.CAN_2_MESSAGE_55_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_2_MESSAGE_47_DLC.VALUE=8 DRIVER.CAN.VAR.CAN_2_MESSAGE_39_DLC.VALUE=8 -DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON_TIME.VALUE=0 +DRIVER.CAN.VAR.CAN_1_AUTO_BUS_ON_TIME.VALUE=1000 DRIVER.CAN.VAR.CAN_3_MESSAGE_6_EOB.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_6_DIR.VALUE=0x20000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_30_INT_ENA_REF.VALUE=0x00000000 @@ -5204,7 +5204,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_8_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_1_MESSAGE_57_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_49_BOOL_ENA.VALUE=0 -DRIVER.CAN.VAR.CAN_1_MESSAGE_10_ENA.VALUE=0x80000000 +DRIVER.CAN.VAR.CAN_1_MESSAGE_10_ENA.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_10_INT_LEVEL.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_3_MESSAGE_3_RTR.VALUE=0x00000000 DRIVER.CAN.VAR.CAN_2_MESSAGE_2_ID.VALUE=2 @@ -5498,7 +5498,7 @@ DRIVER.CAN.VAR.CAN_3_MESSAGE_24_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_3_MESSAGE_16_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_3_MESSAGE_10_MASK.VALUE=0x000007FF -DRIVER.CAN.VAR.CAN_1_MESSAGE_8_BOOL_ENA.VALUE=1 +DRIVER.CAN.VAR.CAN_1_MESSAGE_8_BOOL_ENA.VALUE=0 DRIVER.CAN.VAR.CAN_1_MESSAGE_2_MASK.VALUE=0x000007FF DRIVER.CAN.VAR.CAN_3_MESSAGE_59_ID.VALUE=59 DRIVER.CAN.VAR.CAN_3_MESSAGE_50_RTR.VALUE=0x00000000 Index: firmware/Debug/App/Drivers/subdir_rules.mk =================================================================== diff -u -r2656aa6e11f4804dad57791321808fc0e925567e -r88b7f489c8da945997f1516600a30032393f5088 --- firmware/Debug/App/Drivers/subdir_rules.mk (.../subdir_rules.mk) (revision 2656aa6e11f4804dad57791321808fc0e925567e) +++ firmware/Debug/App/Drivers/subdir_rules.mk (.../subdir_rules.mk) (revision 88b7f489c8da945997f1516600a30032393f5088) @@ -6,7 +6,7 @@ App/Drivers/%.obj: ../App/Drivers/%.c $(GEN_OPTS) | $(GEN_FILES) @echo 'Building file: "$<"' @echo 'Invoking: ARM Compiler' - "/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace/dgfirmware/firmware/App" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Tasks" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Modes" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Drivers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Controllers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Services" --include_path="/home/fw/workspace/dgfirmware/firmware" --include_path="/home/fw/workspace/dgfirmware/firmware/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="App/Drivers/$(basename $(IF1MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x1U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x002U & (uint32)0x000007FFU) << (uint32)18U); canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000800U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF1CMD = (uint8) 0xF8U; canREG1->IF1NO = 1U; @@ -216,7 +216,7 @@ } /* Wait */ canREG1->IF2MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x2U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x008U & (uint32)0x000007FFU) << (uint32)18U); canREG1->IF2MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF2CMD = (uint8) 0xF8U; canREG1->IF2NO = 2U; @@ -235,8 +235,8 @@ } /* Wait */ canREG1->IF1MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x4U & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; + canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x010U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000800U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF1CMD = (uint8) 0xF8U; canREG1->IF1NO = 3U; @@ -254,7 +254,7 @@ } /* Wait */ canREG1->IF2MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x8U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x080U & (uint32)0x000007FFU) << (uint32)18U); canREG1->IF2MCTL = 0x00001000U | (uint32)0x00000800U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF2CMD = (uint8) 0xF8U; canREG1->IF2NO = 4U; @@ -273,7 +273,7 @@ } /* Wait */ canREG1->IF1MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x10U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x402U & (uint32)0x000007FFU) << (uint32)18U); canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF1CMD = (uint8) 0xF8U; canREG1->IF1NO = 5U; @@ -292,87 +292,11 @@ } /* Wait */ canREG1->IF2MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x20U & (uint32)0x000007FFU) << (uint32)18U); + canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x403U & (uint32)0x000007FFU) << (uint32)18U); canREG1->IF2MCTL = 0x00001000U | (uint32)0x00000800U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; canREG1->IF2CMD = (uint8) 0xF8U; canREG1->IF2NO = 6U; - /** - Initialize message 7 - * - Wait until IF1 is ready for use - * - Set message mask - * - Set message control word - * - Set message arbitration - * - Set IF1 control byte - * - Set IF1 message number - */ - /*SAFETYMCUSW 28 D MR:NA "Potentially infinite loop found - Hardware Status check for execution sequence" */ - while ((canREG1->IF1STAT & 0x80U) ==0x80U) - { - } /* Wait */ - - canREG1->IF1MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x20000000U | (uint32)((uint32)((uint32)0x40U & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000800U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; - canREG1->IF1CMD = (uint8) 0xF8U; - canREG1->IF1NO = 7U; - - /** - Initialize message 8 - * - Wait until IF2 is ready for use - * - Set message mask - * - Set message control word - * - Set message arbitration - * - Set IF2 control byte - * - Set IF2 message number - */ - /*SAFETYMCUSW 28 D MR:NA "Potentially infinite loop found - Hardware Status check for execution sequence" */ - while ((canREG1->IF2STAT & 0x80U) ==0x80U) - { - } /* Wait */ - - canREG1->IF2MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x80U & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; - canREG1->IF2CMD = (uint8) 0xF8U; - canREG1->IF2NO = 8U; - - /** - Initialize message 9 - * - Wait until IF1 is ready for use - * - Set message mask - * - Set message control word - * - Set message arbitration - * - Set IF1 control byte - * - Set IF1 message number - */ - /*SAFETYMCUSW 28 D MR:NA "Potentially infinite loop found - Hardware Status check for execution sequence" */ - while ((canREG1->IF1STAT & 0x80U) ==0x80U) - { - } /* Wait */ - - canREG1->IF1MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x100U & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF1MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; - canREG1->IF1CMD = (uint8) 0xF8U; - canREG1->IF1NO = 9U; - - /** - Initialize message 10 - * - Wait until IF2 is ready for use - * - Set message mask - * - Set message control word - * - Set message arbitration - * - Set IF2 control byte - * - Set IF2 message number - */ - /*SAFETYMCUSW 28 D MR:NA "Potentially infinite loop found - Hardware Status check for execution sequence" */ - while ((canREG1->IF2STAT & 0x80U) ==0x80U) - { - } /* Wait */ - - canREG1->IF2MSK = 0xC0000000U | (uint32)((uint32)((uint32)0x000007FFU & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2ARB = (uint32)0x80000000U | (uint32)0x00000000U | (uint32)0x00000000U | (uint32)((uint32)((uint32)0x200U & (uint32)0x000007FFU) << (uint32)18U); - canREG1->IF2MCTL = 0x00001000U | (uint32)0x00000400U | (uint32)0x00000000U | (uint32)0x00000080U | (uint32)8U; - canREG1->IF2CMD = (uint8) 0xF8U; - canREG1->IF2NO = 10U; - /** - Setup IF1 for data transmission * - Wait until IF1 is ready for use * - Set IF1 control byte