Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -18,47 +18,35 @@ const INT_ADC_CHANNEL_T ADC_CHANNEL_NUM_TO_CHANNEL_ID[ MAX_ADC_CHANNELS ] = { INT_ADC_NOT_USED, // 0 - INT_ADC_PS_THERMISTOR, // 1 - INT_ADC_PBA_ADC_REF, // 2 - INT_ADC_24V_ACTUATORS_REG, // 3 - INT_ADC_1_2V_PROCESSOR, // 4 - INT_ADC_5V_SENSORS, // 5 + INT_ADC_24V_ACTUATORS_REG, // 1 + INT_ADC_1_2V_PROCESSOR, // 2 + INT_ADC_5V_SENSORS, // 3 + INT_ADC_NOT_USED, // 4 + INT_ADC_NOT_USED, // 5 INT_ADC_NOT_USED, // 6 - INT_ADC_NOT_USED, // 7 - INT_ADC_PRIMARY_ALARM_CURRENT_HG, // 8 - INT_ADC_NOT_USED, // 9 - INT_ADC_BOARD_THERMISTOR, // 10 - INT_ADC_1_25_FPGA_ADC_REF, // 11 - INT_ADC_3_3V, // 12 - INT_ADC_5V_LOGIC, // 13 - INT_ADC_PRIMARY_ALARM_CURRENT_LG, // 14 + INT_ADC_BOARD_THERMISTOR, // 7 + INT_ADC_1_25_FPGA_ADC_REF, // 8 + INT_ADC_3_3V, // 9 + INT_ADC_5V_LOGIC, // 10 + INT_ADC_NOT_USED, // 11 + INT_ADC_BACKUP_V, // 12 + INT_ADC_NOT_USED, // 13 + INT_ADC_NOT_USED, // 14 INT_ADC_NOT_USED, // 15 - INT_ADC_BLOOD_PUMP_SPEED, // 16 - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, // 17 - INT_ADC_BACKUP_V, // 18 - INT_ADC_NOT_USED, // 19 - INT_ADC_NOT_USED, // 20 - INT_ADC_NOT_USED, // 21 - INT_ADC_24V_ACTUATORS, // 22 - INT_ADC_NOT_USED // 23 + INT_ADC_24V_ACTUATORS, // 16 + INT_ADC_NOT_USED // 17 }; const F32 ADC_CHANNEL_READ_TO_UNITS[ NUM_OF_INT_ADC_CHANNELS ] = { 0.0, // - INT_ADC_NOT_USED - 1.601601, // RPM - INT_ADC_BLOOD_PUMP_SPEED - 0.003002, // A - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT - 0.001221, // V - INT_ADC_PS_THERMISTOR - 0.001465, // V - INT_ADC_REFIN_1 0.009420, // V - INT_ADC_24V_ACTUATORS_REG 0.000733, // V - INT_ADC_1_2V_PROCESSOR 0.001465, // V - INT_ADC_5V_SENSORS - 0.014650, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_HG 0.001221, // V - INT_ADC_BOARD_THERMISTOR 0.000733, // V - INT_ADC_1_25_FPGA_ADC_REF 0.001465, // V - INT_ADC_3_3V 0.001465, // V - INT_ADC_5V_LOGIC - 0.073240, // mA - INT_ADC_PRIMARY_ALARM_CURRENT_LG 0.007106, // V - INT_ADC_24V_ACTUATORS 0.007106, // V - INT_ADC_BACKUP_V 0.000000, // V - INT_ADC_DUMMY Index: firmware/App/Drivers/InternalADC.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/InternalADC.h (.../InternalADC.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_DRIVERS_INTERNALADC_H_ -#define APP_DRIVERS_INTERNALADC_H_ +#ifndef __INT_ADC_H__ +#define __INT_ADC_H__ #include "ROCommon.h" @@ -24,19 +24,13 @@ typedef enum Int_ADC_Channels { INT_ADC_NOT_USED = 0, ///< Not used - INT_ADC_BLOOD_PUMP_SPEED, ///< Internal ADC channel for blood pump speed - INT_ADC_BLOOD_PUMP_MOTOR_CURRENT, ///< Internal ADC channel for blood pump current - INT_ADC_PS_THERMISTOR, ///< Internal ADC channel for power supply temperature - INT_ADC_PBA_ADC_REF, ///< Internal ADC channel for reference voltage to PBA ADC channel) INT_ADC_24V_ACTUATORS_REG, ///< Internal ADC channel for 24V regen (diode drop) to actuators INT_ADC_1_2V_PROCESSOR, ///< Internal ADC channel for 1.2V to processor INT_ADC_5V_SENSORS, ///< Internal ADC channel for 5V to sensors - INT_ADC_PRIMARY_ALARM_CURRENT_HG, ///< Internal ADC channel for primary alarm audio current high gain INT_ADC_BOARD_THERMISTOR, ///< Internal ADC channel for PCB temperature INT_ADC_1_25_FPGA_ADC_REF, ///< Internal ADC channel for FPGA ADC reference voltage INT_ADC_3_3V, ///< Internal ADC channel for 3.3V INT_ADC_5V_LOGIC, ///< Internal ADC channel for 5V to logic - INT_ADC_PRIMARY_ALARM_CURRENT_LG, ///< Internal ADC channel for primary alarm audio current low gain INT_ADC_24V_ACTUATORS, ///< Internal ADC channel for 24V to actuators INT_ADC_BACKUP_V, ///< Internal ADC channel for VBackup INT_ADC_DUMMY, ///< Internal ADC channel - not used, needed to get even number of channels Index: firmware/App/Drivers/PAL.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Drivers/PAL.h (.../PAL.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/PAL.h (.../PAL.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_DRIVERS_PAL_H_ -#define APP_DRIVERS_PAL_H_ +#ifndef __PAL_H__ +#define __PAL_H__ #include "ROCommon.h" Index: firmware/App/Drivers/SafetyShutdown.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Drivers/SafetyShutdown.h (.../SafetyShutdown.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_DRIVERS_SAFETYSHUTDOWN_H_ -#define APP_DRIVERS_SAFETYSHUTDOWN_H_ +#ifndef __SAFETYSHUTDOWN_H__ +#define __SAFETYSHUTDOWN_H__ #include "ROCommon.h" Index: firmware/App/Modes/ModeFault.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Modes/ModeFault.c (.../ModeFault.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -3,7 +3,7 @@ #include "ModeFault.h" /** - * @addtogroup TDFaultMode + * @addtogroup ROFaultMode * @{ */ Index: firmware/App/Modes/ModeFault.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Modes/ModeFault.h (.../ModeFault.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,15 +1,15 @@ -#ifndef APP_MODES_MODEFAULT_H_ -#define APP_MODES_MODEFAULT_H_ +#ifndef __MODE_FAULT_H__ +#define __MODE_FAULT_H__ #include "ROCommon.h" #include "RODefs.h" /** - * @defgroup TDFaultMode TDFaultMode + * @defgroup ROFaultMode ROFaultMode * @brief FaultMode unit. * - * @addtogroup TDFaultMode + * @addtogroup ROFaultMode * @{ */ Index: firmware/App/Modes/ModeInitPOST.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Modes/ModeInitPOST.h (.../ModeInitPOST.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_MODES_MODEINITPOST_H_ -#define APP_MODES_MODEINITPOST_H_ +#ifndef __MODE_INIT_POST_H__ +#define __MODE_INIT_POST_H__ #include "ROCommon.h" #include "RODefs.h" Index: firmware/App/Modes/ModeStandby.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Modes/ModeStandby.h (.../ModeStandby.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_MODES_MODESTANDBY_H_ -#define APP_MODES_MODESTANDBY_H_ +#ifndef __MODE_STANDBY_H__ +#define __MODE_STANDBY_H__ #include "ROCommon.h" #include "RODefs.h" Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_MODES_OPERATIONMODES_H_ -#define APP_MODES_OPERATIONMODES_H_ +#ifndef __OP_MODES_H__ +#define __OP_MODES_H__ #include "ROCommon.h" #include "RODefs.h" Index: firmware/App/Services/AlarmMgmtRO.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/AlarmMgmtRO.c (.../AlarmMgmtRO.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/AlarmMgmtRO.c (.../AlarmMgmtRO.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -97,14 +97,14 @@ if ( TRUE == isTransitionToFaultRequired() ) { // If alarm is a DD fault and the alarm manager can transition to fault immediately, go to fault mode - requestNewOperationMode( MODE_FAUL ); + requestNewOperationMode( RO_MODE_FAUL ); } } } } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_ACTIVATE, alarm ) } } @@ -156,8 +156,6 @@ *************************************************************************/ void activateAlarm2Data( ALARM_ID_T alarm, ALARM_DATA_T alarmData1, ALARM_DATA_T alarmData2, BOOL outside ) { - - // broadcast alarm and data if alarm not already active if ( ( FALSE == isAlarmActive( alarm ) ) && ( TRUE == isDDCommunicating() ) ) { @@ -217,7 +215,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_CLEAR, alarm ) } } @@ -251,7 +249,7 @@ } else { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID, alarm ) } } @@ -287,7 +285,7 @@ data.safetyShutdownStatus = (U32)isSafetyShutdownActivated(); - broadcastData( MSG_ID_DD_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) ); + broadcastData( MSG_ID_RO_ALARM_INFO_DATA, COMM_BUFFER_OUT_CAN_RO_ALARM, (U08*)&data, sizeof( SAFETY_SHUTDOWN_ACTIVATION_DATA_T ) ); alarmInfoPublicationTimerCounter = 0; } } Index: firmware/App/Services/AlarmMgmtRO.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/AlarmMgmtRO.h (.../AlarmMgmtRO.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/AlarmMgmtRO.h (.../AlarmMgmtRO.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_SERVICES_ALARMMGMTRO_H_ -#define APP_SERVICES_ALARMMGMTRO_H_ +#ifndef __ALARM_MGMT_RO_H__ +#define __ALARM_MGMT_RO_H__ /** * @defgroup AlarmManagement AlarmManagement Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,7 +1,7 @@ -#ifndef APP_SERVICES_ALARMMGMTSWFAULTS_H_ -#define APP_SERVICES_ALARMMGMTSWFAULTS_H_ +#ifndef __ALARM_MGMT_SW_FAULTS_H__ +#define __ALARM_MGMT_SW_FAULTS_H__ /** * @addtogroup AlarmManagement @@ -109,6 +109,9 @@ SW_FAULT_ID_PRES_OCCL_INVALID_STATE = 92, SW_FAULT_ID_PRES_LIMITS_INVALID_STATE = 93, SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID = 94, + SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL = 95, + SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER = 96, + SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT = 97, NUM_OF_SW_FAULT_IDS } SW_FAULT_ID_T; Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -15,7 +15,7 @@ #include "Utilities.h" /** - * @addtogroup FpgaDD + * @addtogroup FpgaRO * @{ */ Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,14 +1,14 @@ -#ifndef APP_SERVICES_FPGARO_H_ -#define APP_SERVICES_FPGARO_H_ +#ifndef __FPGA_RO_H__ +#define __FPGA_RO_H__ #include "ROCommon.h" /** - * @defgroup FpgaTD FpgaTD - * @brief FPGA service unit for TD firmware. - * The FPGA unit contains get/set functions for the TD FPGA registers. + * @defgroup FpgaRO FpgaRO + * @brief FPGA service unit for RO firmware. + * The FPGA unit contains get/set functions for the RO FPGA registers. * * @addtogroup FpgaTD * @{ Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -64,7 +64,7 @@ *************************************************************************/ void phantomInterrupt(void) { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_PHANTOM_INTERRUPT ) } /*********************************************************************//** @@ -97,7 +97,7 @@ break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_RTI_NOTIFICATION, notification ) break; } } @@ -142,7 +142,7 @@ can1ParityCnt++; if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_PARITY ) ) { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_CAN_PARITY_ERROR ) } } // Bus off - our transmitter has counted 255+ errors @@ -151,7 +151,7 @@ can1BusOffCnt++; if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_CAN_OFF ) ) { - SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR ) + SET_ALARM_WITH_1_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_CAN_OFF_ERROR ) } } // Warning - our transmitter has counted 96+ errors @@ -224,40 +224,14 @@ break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_UNEXPECTED_DMA_INTERRUPT, channel ) break; } } } /*********************************************************************//** * @brief - * The edgeNotification function handles hall sensor interrupts. - * @details \b Alarm: ALARM_ID_TD_SOFTWARE_FAULT if given edge is invalid/unexpected. - * @details \b Inputs: none - * @details \b Outputs: Hall sensor interrupt is handled according given pulse edge. - * @param hetREG HET controller associated with the edge - * @param edge ID of pulse edge that triggered this interrupt - * @return none - *************************************************************************/ -void edgeNotification(hetBASE_t * hetREG, uint32 edge) -{ - if ( hetREG == hetREG1 ) - { - switch ( edge ) - { - case HET1_EDGE_BP_ROTOR_HALL_SENSOR: - break; - - default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INTERRUPTS_INVALID_EDGE_DETECTED, edge ) - break; - } - } -} - -/*********************************************************************//** - * @brief * The getSci2FEOEError function returns the sci2FEOEError (OE - Overrun, * FE - Framing Error) status and resets the status if TRUE * @details \b Inputs: sci2FEOEError Index: firmware/App/Services/Interrupts.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/Interrupts.h (.../Interrupts.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/Interrupts.h (.../Interrupts.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_SERVICES_INTERRUPTS_H_ -#define APP_SERVICES_INTERRUPTS_H_ +#ifndef __INTERRUPTS_H__ +#define __INTERRUPTS_H__ #include "ROCommon.h" Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,8 +1,6 @@ #include // for memcpy() -#include "reg_system.h" - #include "Compatible.h" #include "Messaging.h" #include "OperationModes.h" @@ -47,7 +45,6 @@ COMM_BUFFER_NOT_USED, ///< Buffer for outgoing HD to PC messages so no response buffer }; - typedef BOOL (*MsgFuncPtr)( MESSAGE_T* ); /// Message handling function lookup table @@ -80,7 +77,6 @@ #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr)) - // ********** private data ********** static BOOL testerLoggedIn = FALSE; ///< Flag indicates whether tester logged in or not. @@ -308,43 +304,6 @@ /*********************************************************************//** * @brief - * The sendEvent function constructs an DG event message to the UI and - * queues the msg for transmit on the appropriate CAN channel. - * @details \b Inputs: none - * @details \b Outputs: DG event msg constructed and queued. - * @param event Enumeration of event type that occurred - * @param dat1 First data associated with event - * @param dat2 Second data associated with event - * @return TRUE if msg successfully queued for transmit, FALSE if not - *************************************************************************/ -BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ) -{ - BOOL result; - MESSAGE_T msg; - EVENT_PAYLOAD_T eventStruct; - - eventStruct.event = (U32)event; - eventStruct.dataType1 = (U32)dat1.dataType; - eventStruct.data1 = dat1.data; - eventStruct.dataType2 = (U32)dat2.dataType; - eventStruct.data2 = dat2.data; - - // Create a message record - blankMessage( &msg ); - msg.hdr.msgID = MSG_ID_RO_EVENT; - msg.hdr.payloadLen = sizeof( EVENT_PAYLOAD_T ); - - memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_T ) ); - - // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer - // TODO : validate the change , DD -> UI channel removed and added DD broadcast instead. - result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_RO_BROADCAST, ACK_NOT_REQUIRED ); - - return result; -} - -/*********************************************************************//** - * @brief * The broadcastAlarmTriggered function constructs an alarm triggered msg to * be broadcast and queues the msg for transmit on the appropriate CAN channel. * @details \b Inputs: none @@ -446,6 +405,43 @@ return result; } +/*********************************************************************//** + * @brief + * The sendEvent function constructs an DG event message to the UI and + * queues the msg for transmit on the appropriate CAN channel. + * @details \b Inputs: none + * @details \b Outputs: DG event msg constructed and queued. + * @param event Enumeration of event type that occurred + * @param dat1 First data associated with event + * @param dat2 Second data associated with event + * @return TRUE if msg successfully queued for transmit, FALSE if not + *************************************************************************/ +BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ) +{ + BOOL result; + MESSAGE_T msg; + EVENT_PAYLOAD_T eventStruct; + + eventStruct.event = (U32)event; + eventStruct.dataType1 = (U32)dat1.dataType; + eventStruct.data1 = dat1.data; + eventStruct.dataType2 = (U32)dat2.dataType; + eventStruct.data2 = dat2.data; + + // Create a message record + blankMessage( &msg ); + msg.hdr.msgID = MSG_ID_RO_EVENT; + msg.hdr.payloadLen = sizeof( EVENT_PAYLOAD_T ); + + memcpy( &msg.payload, &eventStruct, sizeof( EVENT_PAYLOAD_T ) ); + + // 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_RO_BROADCAST, ACK_NOT_REQUIRED ); + + return result; +} + + // *********************************************************************** // **************** Message Handling Helper Functions ******************** // *********************************************************************** Index: firmware/App/Services/Messaging.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/Messaging.h (.../Messaging.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/Messaging.h (.../Messaging.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_SERVICES_MESSAGING_H_ -#define APP_SERVICES_MESSAGING_H_ +#ifndef __MESSAGING_H__ +#define __MESSAGING_H__ #include "ROCommon.h" #include "RODefs.h" @@ -40,24 +40,22 @@ BOOL broadcastAlarmConditionCleared( U32 alarm ); +BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ); + void handleIncomingMessage( MESSAGE_T *message ); // ACK MSG BOOL sendACKMsg( MESSAGE_T *message ); void handleUITDResetInServiceModeRequest( MESSAGE_T* message ); -// handler functions **************************************** - BOOL handleSetROOperationMode( MESSAGE_T *message ); // Test Support Messaging Functions ************************** BOOL isTestingActivated( void ); void setTesterStatusToLoggedOut( void ); -BOOL sendEvent( RO_EVENT_ID_T event, EVENT_DATA_T dat1, EVENT_DATA_T dat2 ); - BOOL handleTesterLogInRequest( MESSAGE_T *message ); BOOL handleROSoftwareResetRequest( MESSAGE_T *message ); Index: firmware/App/Services/MsgQueues.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/MsgQueues.c (.../MsgQueues.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -181,7 +181,7 @@ } else // Invalid message queue { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_MSG_QUEUES_IS_FULL_INVALID_QUEUE, queue ) } return result; Index: firmware/App/Services/MsgQueues.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/MsgQueues.h (.../MsgQueues.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_SERVICES_MSGQUEUES_H_ -#define APP_SERVICES_MSGQUEUES_H_ +#ifndef __MSG_QUEUES_H__ +#define __MSG_QUEUES_H__ #include "ROCommon.h" Index: firmware/App/Services/SystemCommRO.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/SystemCommRO.c (.../SystemCommRO.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/SystemCommRO.c (.../SystemCommRO.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -21,9 +21,7 @@ // ********** private definitions ********** -#define UI_COMM_TIMEOUT_IN_MS 7500 // TODO remove? ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD. -#define UI_COMM_SERVICE_MODE_TIMEOUT_IN_MS (2 * SEC_PER_MIN * MS_PER_SECOND) // TODO remove? ///< Maximum time (in ms) that UI is allowed to wait before checking in with HD when in service mode. -#define DG_COMM_TIMEOUT_IN_MS 1000 // TODO remove? ///< DG has not checked in for this much time +#define DG_COMM_TIMEOUT_IN_MS 1000 ///< DD has not checked in for this much time #define MAX_COMM_CRC_FAILURES 5 ///< Maximum number of CRC errors within window period before alarm #define MAX_COMM_CRC_FAILURE_WINDOW_MS (10 * SEC_PER_MIN * MS_PER_SECOND) ///< CRC error window @@ -55,7 +53,7 @@ // ********** private data ********** -static volatile BOOL tdIsOnlyCANNode = TRUE; ///< Flag indicating whether HD is alone on CAN bus. +static volatile BOOL roIsOnlyCANNode = TRUE; ///< Flag indicating whether RO is alone on CAN bus. static volatile BOOL ddIsCommunicating = FALSE; ///< Has DD sent a message since last check static U32 timeOfLastDDCheckIn = 0; ///< Last time DD checked in static volatile BOOL uiIsCommunicating = FALSE; ///< Has UI sent a message since last check @@ -67,8 +65,8 @@ /*********************************************************************//** * @brief - * The initSystemCommTD function initializes the system communication unit - * for the TD firmware. + * The initSystemCommRO function initializes the system communication unit + * for the RO firmware. * @details \b Inputs: none * @details \b Outputs: SystemComm unit initialized. * @return none @@ -147,7 +145,7 @@ *************************************************************************/ BOOL isOnlyCANNode( void ) { - return tdIsOnlyCANNode; + return roIsOnlyCANNode; } /*********************************************************************//** @@ -161,7 +159,7 @@ *************************************************************************/ void setOnlyCANNode( BOOL only ) { - tdIsOnlyCANNode = only; + roIsOnlyCANNode = only; } /*********************************************************************//** @@ -196,23 +194,12 @@ if ( TRUE == uiDidCommunicate ) { RO_OP_MODE_T opMode = getCurrentOperationMode(); - U32 uiTO_MS = ( MODE_SERV == opMode ? UI_COMM_SERVICE_MODE_TIMEOUT_IN_MS : UI_COMM_TIMEOUT_IN_MS ); - if ( TRUE == didTimeout( timeOfLastUICheckIn, uiTO_MS ) ) - { -#ifndef _RELEASE_ -// if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_COMM_ALARMS ) != SW_CONFIG_ENABLE_VALUE ) -#endif - { - activateAlarmNoData( ALARM_ID_TD_UI_COMM_TIMEOUT ); - } - } - if ( TRUE == didTimeout( timeOfLastDDCheckIn, DG_COMM_TIMEOUT_IN_MS ) ) { #ifndef RUN_WITHOUT_DD // Only alarm on DG comm loss while in the treatment workflow - if ( MODE_PRET == opMode || MODE_TREA == opMode || MODE_POST == opMode ) + /*if ( RO_MODE_PRET == opMode || RO_MODE_TREA == opMode || RO_MODE_POST == opMode ) { activateAlarmNoData( ALARM_ID_TD_DD_COMM_TIMEOUT ); // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status @@ -223,6 +210,7 @@ clearAlarmCondition( ALARM_ID_TD_DD_COMM_TIMEOUT ); } ddIsCommunicating = FALSE; + */ #endif } } Index: firmware/App/Services/SystemCommRO.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Services/SystemCommRO.h (.../SystemCommRO.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Services/SystemCommRO.h (.../SystemCommRO.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_SERVICES_SYSTEMCOMMRO_H_ -#define APP_SERVICES_SYSTEMCOMMRO_H_ +#ifndef __SYSTEM_COMM_TD_H__ +#define __SYSTEM_COMM_TD_H__ #include "ROCommon.h" #include "CommBuffers.h" Index: firmware/App/Tasks/TaskBG.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Tasks/TaskBG.h (.../TaskBG.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Tasks/TaskBG.h (.../TaskBG.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,7 +1,7 @@ -#ifndef APP_TASKS_TASKBG_H_ -#define APP_TASKS_TASKBG_H_ +#ifndef __TASK_BACKGROUND_H__ +#define __TASK_BACKGROUND_H__ /** * @defgroup TaskBackground TaskBackground Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -26,11 +26,6 @@ *************************************************************************/ void taskGeneral( void ) { -#ifdef TASK_TIMING_OUTPUT_ENABLED - // Set GPIO high to indicate general task has begun executing - setCPLDLampGreen( PIN_SIGNAL_HIGH ); -#endif - // Check in with watchdog manager checkInWithWatchdogMgmt( TASK_GENERAL ); // Do this first to keep timing consistent with watchdog management Index: firmware/App/Tasks/TaskGeneral.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Tasks/TaskGeneral.h (.../TaskGeneral.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_TASKS_TASKGENERAL_H_ -#define APP_TASKS_TASKGENERAL_H_ +#ifndef __TASK_GENERAL_H__ +#define __TASK_GENERAL_H__ #include "ROCommon.h" Index: firmware/App/Tasks/TaskPriority.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Tasks/TaskPriority.h (.../TaskPriority.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_TASKS_TASKPRIORITY_H_ -#define APP_TASKS_TASKPRIORITY_H_ +#ifndef __TASK_PRIORITY_H__ +#define __TASK_PRIORITY_H__ /** * @defgroup TaskPriority TaskPriority Index: firmware/App/Tasks/TaskTimer.h =================================================================== diff -u -r533272e6ef2873fcfe7a41338a6c88c7a601605d -r129a1c2f4343bc85efdb4767c2dec35e4ba8ce98 --- firmware/App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision 533272e6ef2873fcfe7a41338a6c88c7a601605d) +++ firmware/App/Tasks/TaskTimer.h (.../TaskTimer.h) (revision 129a1c2f4343bc85efdb4767c2dec35e4ba8ce98) @@ -1,6 +1,6 @@ -#ifndef APP_TASKS_TASKTIMER_H_ -#define APP_TASKS_TASKTIMER_H_ +#ifndef __TASK_TIMER_H__ +#define __TASK_TIMER_H__ /** * @defgroup TaskTimer TaskTimer