Index: firmware/App/Controllers/AirPump.c =================================================================== diff -u -r4bcafe45ae40939d6b3471f4ccca7e2b4fa7c0f5 -r0e1203044c8a58afcb2a1d51b08d2073e4bee4a3 --- firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision 4bcafe45ae40939d6b3471f4ccca7e2b4fa7c0f5) +++ firmware/App/Controllers/AirPump.c (.../AirPump.c) (revision 0e1203044c8a58afcb2a1d51b08d2073e4bee4a3) @@ -32,13 +32,11 @@ */ // ********** private definitions ********** + #define AIR_PUMP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) #define DATA_PUBLISH_COUNTER_START_COUNT #define AIR_PUMP_GPIO_PIN 0x24 - -static const U32 AIR_PUMP_STATUS_PERSISTENCE = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ); - typedef enum AirPumpMotorStates { AIR_PUMP_MOTOR_OFF = 0, ///< Air Pump Off @@ -49,14 +47,12 @@ // ********** private data ********** +static const U32 AIR_PUMP_STATUS_PERSISTENCE = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ); static AIR_PUMP_MOTOR_STATE_T currentAirPumpMotorState; - static AIR_PUMP_STATE_T currentAirPumpState; static U32 airPumpDataPublicationTimerCounter; - static OVERRIDE_U32_T airPumpDataPublishInterval = { AIR_PUMP_DATA_PUB_INTERVAL, AIR_PUMP_DATA_PUB_INTERVAL, 0, 0 }; - // ********** private function prototypes ********** static AIR_PUMP_STATE_T handleAirPumpStartState( void ); @@ -72,7 +68,7 @@ } -static void setAirPumpMotor(AIR_PUMP_MOTOR_STATE_T state) +static void setAirPumpMotor( AIR_PUMP_MOTOR_STATE_T state ) { if ( state < NUM_OF_AIR_PUMP_MOTOR_STATES ) { @@ -96,11 +92,6 @@ } } -AIR_PUMP_MOTOR_STATE_T getAirPumpMotorState( void ) -{ - return (AIR_PUMP_MOTOR_STATE_T)gioGetBit( hetPORT1, AIR_PUMP_GPIO_PIN ); -} - AIR_PUMP_STATE_T getAirPumpState( void ) { return currentAirPumpState; @@ -155,7 +146,6 @@ { AIR_PUMP_PAYLOAD_T data; data.airPumpStateStatus = getAirPumpState(); - data.airPumpMotorStatus = getAirPumpMotorState(); broadcastData( MSG_ID_HD_AIR_PUMP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( AIR_PUMP_PAYLOAD_T ) ); } @@ -221,7 +211,7 @@ if ( TRUE == isTestingActivated() ) { - setAirPumpState( (AIR_PUMP_STATE_T) state ); + setAirPumpState( ( AIR_PUMP_STATE_T ) state ); result = TRUE; } Index: firmware/HD.dil =================================================================== diff -u -r8791132fbfcb8fa25fb11a9ab15d695686aaef75 -r0e1203044c8a58afcb2a1d51b08d2073e4bee4a3 --- firmware/HD.dil (.../HD.dil) (revision 8791132fbfcb8fa25fb11a9ab15d695686aaef75) +++ firmware/HD.dil (.../HD.dil) (revision 0e1203044c8a58afcb2a1d51b08d2073e4bee4a3) @@ -1,4 +1,4 @@ -# RM46L852PGE 11/21/22 13:24:17 +# RM46L852PGE 11/28/22 11:48:31 # ARCH=RM46L852PGE # @@ -6048,7 +6048,7 @@ DRIVER.HET.VAR.HET1_PWM4_ACTION.VALUE=3 DRIVER.HET.VAR.HET1_BIT25_PULL.VALUE=1 DRIVER.HET.VAR.HET1_BIT17_PULL.VALUE=1 -DRIVER.HET.VAR.HET1_BIT4_DIR.VALUE=0x00000000 +DRIVER.HET.VAR.HET1_BIT4_DIR.VALUE=0x00000010 DRIVER.HET.VAR.HET2_EDGE0_POLARITY.VALUE=0 DRIVER.HET.VAR.HET1_CAP6_POLARITY.VALUE=0 DRIVER.HET.VAR.HET1_BIT20_PULDIS.VALUE=0x00000000 @@ -7736,7 +7736,7 @@ DRIVER.PINMUX.VAR.DMA_INTFTCEN_9.VALUE=1 DRIVER.PINMUX.VAR.DMA_INTMP_2_VALUE.VALUE=0x0001 DRIVER.PINMUX.VAR.DMA_INTEN_16.VALUE=1 -DRIVER.PINMUX.VAR.MUX20_OPTION0.VALUE=1 +DRIVER.PINMUX.VAR.MUX20_OPTION0.VALUE=0 DRIVER.PINMUX.VAR.MUX12_OPTION0.VALUE=0 DRIVER.PINMUX.VAR.MUX20_OPTION1.VALUE=0 DRIVER.PINMUX.VAR.MUX12_OPTION1.VALUE=0 Index: firmware/include/het.h =================================================================== diff -u -r9224712d825c7ecee623abc78d704fbd3c2dbde8 -r0e1203044c8a58afcb2a1d51b08d2073e4bee4a3 --- firmware/include/het.h (.../het.h) (revision 9224712d825c7ecee623abc78d704fbd3c2dbde8) +++ firmware/include/het.h (.../het.h) (revision 0e1203044c8a58afcb2a1d51b08d2073e4bee4a3) @@ -359,10 +359,10 @@ | (uint32)0x00000000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ + | (uint32)0x00000010U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ | (uint32)0x00000000U \ - | (uint32)0x00000000U \ | (uint32)0x00000000U) #define HET1_PDR_CONFIGVALUE ((uint32)0x00000000U \ Index: firmware/source/het.c =================================================================== diff -u -r172b320a1007769c7452fe3f1cc7ac85b016f89a -r0e1203044c8a58afcb2a1d51b08d2073e4bee4a3 --- firmware/source/het.c (.../het.c) (revision 172b320a1007769c7452fe3f1cc7ac85b016f89a) +++ firmware/source/het.c (.../het.c) (revision 0e1203044c8a58afcb2a1d51b08d2073e4bee4a3) @@ -1138,10 +1138,10 @@ | (uint32) 0x00000000U | (uint32) 0x00000000U | (uint32) 0x00000000U + | (uint32) 0x00000010U | (uint32) 0x00000000U | (uint32) 0x00000000U | (uint32) 0x00000000U - | (uint32) 0x00000000U | (uint32) 0x00000000U; /** - Set HET pins open drain enable */