Index: firmware/.launches/DG.launch =================================================================== diff -u -rfeb93744f73bc0a3d58841bb02bd05c38357f35d -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/.launches/DG.launch (.../DG.launch) (revision feb93744f73bc0a3d58841bb02bd05c38357f35d) +++ firmware/.launches/DG.launch (.../DG.launch) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -1,6 +1,6 @@ - + Index: firmware/App/Controllers/DrainPump.c =================================================================== diff -u -r1abaeb395cb7ffb2cb0ea9c1ba65c353d9c416f8 -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 1abaeb395cb7ffb2cb0ea9c1ba65c353d9c416f8) +++ firmware/App/Controllers/DrainPump.c (.../DrainPump.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -257,7 +257,7 @@ // The RPM is only checked in open loop state that the pump is run at a fixed RPM. // The persistent alarm waits for a couple of seconds before raising an alarm, this is supposed to cover // when the pump is turned on and it takes a while to ramp up to target RPM. - if( drainPumpControlModeSet == PUMP_CONTROL_MODE_OPEN_LOOP ) + /*if( drainPumpControlModeSet == PUMP_CONTROL_MODE_OPEN_LOOP ) { U32 targetRPM = getTargetDrainPumpRPM(); F32 threshold = OPEN_LOOP_RPM_OUT_OF_RANGE * targetRPM; @@ -280,7 +280,7 @@ { activateSafetyShutdown(); } - } + }*/ // Publish drain pump data on interval publishDrainPumpData(); Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rd5b2e26598becc953ce0a7c8928c0c814fcc53a9 -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision d5b2e26598becc953ce0a7c8928c0c814fcc53a9) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -294,7 +294,7 @@ // Read the pressure at the sensor. The pump cannot be more that the maximum allowed pressure // to make sure the hardware (especially the ROF) is not damaged. If it is the case, we need to stop immediately - F32 actualPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); + /*F32 actualPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET ); BOOL isPressureMax = actualPressure >= MAX_ALLOWED_MEASURED_PRESSURE_PSI; checkPersistentAlarm( PERSISTENT_ALARM_RO_PUMP_PRESSURE_OUT_OF_RANGE, isPressureMax, actualPressure, MAX_ALLOWED_MEASURED_PRESSURE_PSI ); @@ -349,7 +349,7 @@ { activateSafetyShutdown(); } - } + }*/ // Publish RO pump data on interval publishROPumpData(); Index: firmware/App/Controllers/Thermistors.c =================================================================== diff -u -r374bab15ea30aba82ee139e8a494764db312f468 -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 374bab15ea30aba82ee139e8a494764db312f468) +++ firmware/App/Controllers/Thermistors.c (.../Thermistors.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -102,7 +102,7 @@ thermistorsStatus[ THERMISTOR_POWER_SUPPLY_2 ].betaValue = POWER_SUPPLY_THERMISTOR_BETA_VALUE; // Initialize a persistent alarm for thermistors temeprature out of range - initPersistentAlarm( PERSISTENT_ALARM_THERMISTOR_TEMPERATURE_OUT_OF_RANGE, ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE, + initPersistentAlarm( PERSISTENT_ALARM_THERMISTOR_TEMPERATURE_OUT_OF_RANGE, ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, TRUE, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD, MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD ); } @@ -234,7 +234,7 @@ // If the values are out of range, raise an alarm if ( temperature < MIN_ALLOWED_TEMPERATURE || temperature >= MAX_ALLOWED_TEMPERATURE ) { - SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_THERMISOTRS_TEMPERATURE_OUT_OF_RANGE, thermistor, temperature ); + SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE, thermistor, temperature ); // If any thermistor/sensor is not in range, POST has failed thermistorsSelfTestReslt = SELF_TEST_STATUS_FAILED; } Index: firmware/App/Services/SystemComm.c =================================================================== diff -u -r88f28230d288947ba84840b967e95b32e3deffaa -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 88f28230d288947ba84840b967e95b32e3deffaa) +++ firmware/App/Services/SystemComm.c (.../SystemComm.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -1204,6 +1204,10 @@ handleTestUVReactorsHealthOverride( message ); break; + case MSG_ID_DG_SET_CALIBRATION_DATA: + handleSetDGCalibration( message ); + break; + default: // TODO - unrecognized message ID received - ignore break; Index: firmware/App/Services/SystemCommMessages.c =================================================================== diff -u -r3d8b84b8ce7ee9526fbabccb9e51d691a3df6305 -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 3d8b84b8ce7ee9526fbabccb9e51d691a3df6305) +++ firmware/App/Services/SystemCommMessages.c (.../SystemCommMessages.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -2365,4 +2365,17 @@ sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result ); } +void handleSetDGCalibration( MESSAGE_T *message ) +{ + struct + { + F32 offset; + F32 gain; + U32 time; + } test; + + U32 dara = sizeof(test); + memcpy( &test, message->payload, sizeof(test)); +} + /**@}*/ Index: firmware/App/Services/SystemCommMessages.h =================================================================== diff -u -r00b32a5dad2e136d31cfaf0de16f7767b9920fec -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 00b32a5dad2e136d31cfaf0de16f7767b9920fec) +++ firmware/App/Services/SystemCommMessages.h (.../SystemCommMessages.h) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -256,6 +256,9 @@ // MSG_ID_DG_RO_PUMP_TARGET_PRESSURE_OVERRIDE void handleROPumpTargetPressureOverride( MESSAGE_T *message ); +// MSG_ID_DG_SET_CALIBRATION_DATA +void handleSetDGCalibration( MESSAGE_T *message ); + /**@}*/ #endif Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -r88f28230d288947ba84840b967e95b32e3deffaa -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 88f28230d288947ba84840b967e95b32e3deffaa) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -74,10 +74,10 @@ execSystemCommRx(); // monitor concentrate pumps - execConcentratePumpMonitor(); + //execConcentratePumpMonitor(); // Monitor thermistors state machine - execThermistors(); + //execThermistors(); // manage RO pump execROPumpController(); @@ -86,16 +86,16 @@ execDrainPumpController(); // manage concentrate pumps - execConcentratePumpController(); + //execConcentratePumpController(); // Manage fans controller - execFans(); + //execFans(); // manage time-based reservoir tasks - execReservoirs(); + //execReservoirs(); // Manage UV reactors controller - execUVReactos(); + //execUVReactos(); #ifndef DISABLE_HEATERS_AND_TEMPS // Primary heaters state machine Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -r79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 4d7d40a27130dc813d653f044cbb856b1b7d8481) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 79ad3aec7dd37a8acc7ab2391dc9dd806cb9e5cd) @@ -63,21 +63,21 @@ execInternalADC(); // monitor pressures - execPressures(); + //execPressures(); // monitor load cells - execLoadCell(); + //execLoadCell(); #ifndef DISABLE_HEATERS_AND_TEMPS // Temperature sensors read execTemperatureSensors(); #endif // conductivity sensors read - execConductivitySensors(); + //execConductivitySensors(); // control valves - execValves(); + //execValves(); #ifndef DISABLE_ACCELS // monitor accelerometer @@ -91,7 +91,7 @@ execDrainPumpMonitor(); // Heaters monitor - execHeatersMonitor(); + //execHeatersMonitor(); */ // 2nd pass for FPGA execFPGAOut();