Index: firmware/App/Controllers/Voltages.c =================================================================== diff -u -r59d52f24473a340bb553dda2f12d86c18cbd3664 -rf19f3deed8f9ee103482fa0232df44f8a73eae30 --- firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 59d52f24473a340bb553dda2f12d86c18cbd3664) +++ firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) @@ -77,7 +77,7 @@ // ********** private data ********** static VOLTAGES_STATE_T voltagesState; ///< Current state of voltages monitor state machine. -static U32 voltagesDataPublicationTimerCounter = 0; ///< Used to schedule voltages monitor data publication to CAN bus. +static U32 voltagesDataPublicationTimerCounter = 14; ///< Used to schedule voltages monitor data publication to CAN bus. /// Interval (in ms) at which to publish voltages monitor data to CAN bus. static OVERRIDE_U32_T voltagesDataPublishInterval = { VOLTAGES_DATA_PUB_INTERVAL, VOLTAGES_DATA_PUB_INTERVAL, 0, 0 }; @@ -210,14 +210,14 @@ { if ( ++voltageAlarmPerisistenceCtr[ i ] > VOLTAGES_ALARM_PERSISTENCE ) { - //SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts ) + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts ) } } else if ( volts < MIN_VOLTAGES[ i ] ) { if ( ++voltageAlarmPerisistenceCtr[ i ] > VOLTAGES_ALARM_PERSISTENCE ) { - //SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts ) + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts ) } } else Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -r9f2e4e5933d2e418b75f91e3db5df69c71878d43 -rf19f3deed8f9ee103482fa0232df44f8a73eae30 --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 9f2e4e5933d2e418b75f91e3db5df69c71878d43) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) @@ -36,7 +36,7 @@ { INT_ADC_DIAL_IN_PUMP_SPEED, // 0 INT_ADC_PS_THERMISTOR, // 1 - INT_ADC_PBA_ADC_REF, // 2 + INT_ADC_PBA_ADC_REF, // 2 INT_ADC_24V_ACTUATORS_REG, // 3 INT_ADC_1_2V_PROCESSOR, // 4 INT_ADC_5V_SENSORS, // 5 Index: firmware/HD.dil =================================================================== diff -u -rf3326a3d0fd2a465a518e31ee578e335db301c27 -rf19f3deed8f9ee103482fa0232df44f8a73eae30 --- firmware/HD.dil (.../HD.dil) (revision f3326a3d0fd2a465a518e31ee578e335db301c27) +++ firmware/HD.dil (.../HD.dil) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) @@ -1,4 +1,4 @@ -# RM46L852PGE 04/14/21 14:13:15 +# RM46L852PGE 04/16/21 19:37:46 # ARCH=RM46L852PGE # @@ -5553,10 +5553,10 @@ DRIVER.ADC.VAR.ADC2_GROUP2_RAM_PARITY_ENA.VALUE=0 DRIVER.ADC.VAR.ADC1_GROUP1_PIN3_ENABLE.VALUE=0x00000008 DRIVER.ADC.VAR.ADC1_GROUP0_CHANNEL_TOTAL_TIME.VALUE=0.000000 -DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=6 +DRIVER.ADC.VAR.ADC1_GROUP1_FIFO_SIZE.VALUE=19 DRIVER.ADC.VAR.ADC1_GROUP2_DISCHARGE_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_SAMPLE_PRESCALER.VALUE=0 -DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=6 +DRIVER.ADC.VAR.ADC1_GROUP1_LENGTH.VALUE=20 DRIVER.ADC.VAR.ADC2_GROUP1_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP2_CONVERSION_TIME.VALUE=3.271 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DIR.VALUE=0 @@ -5682,7 +5682,7 @@ DRIVER.ADC.VAR.ADC2_GROUP2_HW_TRIGGER_SOURCE.VALUE=EVENT DRIVER.ADC.VAR.ADC2_GROUP2_ID_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC2_GROUP1_ACTUAL_SAMPLE_TIME.VALUE=387.08 -DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=58 +DRIVER.ADC.VAR.ADC1_GROUP2_LENGTH.VALUE=44 DRIVER.ADC.VAR.ADC1_GROUP0_BND.VALUE=0 DRIVER.ADC.VAR.ADC2_GROUP2_CHANNEL_TOTAL_TIME.VALUE=0.000000 DRIVER.ADC.VAR.ADC2_GROUP2_CONTINUOUS_ENABLE.VALUE=0x00000000 @@ -5701,7 +5701,7 @@ DRIVER.ADC.VAR.ADC1_GROUP2_PIN5_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN23_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP0_PIN15_ENABLE.VALUE=0x00000000 -DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=3 +DRIVER.ADC.VAR.ADC1_GROUP1_BND.VALUE=10 DRIVER.ADC.VAR.ADC2_GROUP2_PIN13_ENABLE.VALUE=0x00000000 DRIVER.ADC.VAR.ADC1_GROUP1_PIN19_ENABLE.VALUE=0x00080000 DRIVER.ADC.VAR.ADC2_PORT_BIT0_DOUT.VALUE=0 Index: firmware/include/adc.h =================================================================== diff -u -ref0b3f0ec00fadc50f95e0db1a6477fb4b076ea1 -rf19f3deed8f9ee103482fa0232df44f8a73eae30 --- firmware/include/adc.h (.../adc.h) (revision ef0b3f0ec00fadc50f95e0db1a6477fb4b076ea1) +++ firmware/include/adc.h (.../adc.h) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) @@ -240,7 +240,7 @@ #define ADC1_G1SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT) #define ADC1_G2SRC_CONFIGVALUE ((uint32)0x00000000U | (uint32)ADC1_EVENT) -#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)0U << 16U)|(0U + 3U)) +#define ADC1_BNDCR_CONFIGVALUE ((uint32)((uint32)0U << 16U)|(0U + 10U)) #define ADC1_BNDEND_CONFIGVALUE (2U) #define ADC1_G0SAMP_CONFIGVALUE (0U) Index: firmware/source/adc.c =================================================================== diff -u -rf3326a3d0fd2a465a518e31ee578e335db301c27 -rf19f3deed8f9ee103482fa0232df44f8a73eae30 --- firmware/source/adc.c (.../adc.c) (revision f3326a3d0fd2a465a518e31ee578e335db301c27) +++ firmware/source/adc.c (.../adc.c) (revision f19f3deed8f9ee103482fa0232df44f8a73eae30) @@ -86,7 +86,7 @@ adcREG1->CLOCKCR = 25U; /** - Setup memory boundaries */ - adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 3U); + adcREG1->BNDCR = (uint32)((uint32)0U << 16U) | (0U + 10U); adcREG1->BNDEND = (adcREG1->BNDEND & 0xFFFF0000U) | (2U); /** - Setup event group conversion mode @@ -334,7 +334,7 @@ static const uint32 s_adcFiFoSize[2U][3U] = { {0U, - 6U, + 19U, 32U}, {16U, 16U,