Index: firmware/App/Monitors/Pressures.c =================================================================== diff -u -r56100135135bb715d316b5fd002a4a4951b9334a -rf3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa --- firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision 56100135135bb715d316b5fd002a4a4951b9334a) +++ firmware/App/Monitors/Pressures.c (.../Pressures.c) (revision f3a26c402a2ec88f5ee7dbb8eb7127ab5b4692aa) @@ -520,8 +520,8 @@ static PRESSURE_STATE_T handlePressureContReadState( void ) { PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE; - F32 fpgaArtPres = getPressure( PRESSURE_SENSOR_ARTERIAL ) - arterialPressureOffset; - F32 fpgaVenPres = getPressure( PRESSURE_SENSOR_VENOUS ) - venousPressureOffset; + F32 fpgaArtPres = getPressure( H2 ) - arterialPressureOffset; + F32 fpgaVenPres = getPressure( H14 ) - venousPressureOffset; // Filter inline pressure readings filterInlinePressureReadings( fpgaArtPres, fpgaVenPres ); @@ -966,15 +966,15 @@ { PRESSURE_DATA_T data; - data.arterialPressure = getFilteredArterialPressure(); - data.venousPressure = getFilteredVenousPressure(); + data.h2Pressure = getFilteredArterialPressure(); + data.h14Pressure = getFilteredVenousPressure(); data.presLimitState = currPresLimitsState; - data.artMinLimit = currentArterialMinLimit; - data.artMaxLimit = currentArterialMaxLimit; - data.venMinLimit = currentVenousMinLimit; - data.venMaxLimit = currentVenousMaxLimit; - data.arterialLongFilterPres = longFilteredArterialPressure; - data.venousLongFilterPres = longFilteredVenousPressure; + data.h2MinLimit = currentArterialMinLimit; + data.h2MaxLimit = currentArterialMaxLimit; + data.h14MinLimit = currentVenousMinLimit; + data.h14MaxLimit = currentVenousMaxLimit; + data.h2LongFilterPres = longFilteredArterialPressure; + data.h14LongFilterPres = longFilteredVenousPressure; broadcastData( MSG_ID_TD_PRESSURE_DATA, COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08*)&data, sizeof( PRESSURE_DATA_T ) ); pressureDataPublicationTimerCounter = 0;