Index: firmware/App/Drivers/ConductivityTeensy.c =================================================================== diff -u -rf6c8ce1cc681f87467cdb4dc1685df74f39e2740 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 --- firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision f6c8ce1cc681f87467cdb4dc1685df74f39e2740) +++ firmware/App/Drivers/ConductivityTeensy.c (.../ConductivityTeensy.c) (revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7) @@ -103,7 +103,7 @@ static COND_EEPROM_DATA_T eePromDataTX; ///< Transmitted EEPROM data to Teensy for update EEPROM cmd. static COND_MEASUREMENT_SETTINGS_T measurementSettingsTX; ///< Transmitted measurement settings to Teensy for update measurement settings cmd. static COND_MEASUREMENT_SETTINGS_T measurementSettingsRX; ///< Received measurement settings by get measurement settings cmd. -static COND_MODELS_T currentConductivityModel = STANDARD; +static COND_MODELS_T currentConductivityModel; static BOOL eepromInit; // Command Map @@ -227,11 +227,12 @@ queueFrontIndex = 0; currentCmd = TEENSY_CMD_INIT_SENSOR; eepromInit = TRUE; - condInitStatus = COND_INIT_STATUS_UNITIALIZED; - condUpdateEEPROMstatus = COND_UPDATE_EEPROM_STATUS_UNITIALIZED; + condInitStatus = COND_INIT_STATUS_UNINITIALIZED; + condUpdateEEPROMstatus = COND_UPDATE_EEPROM_STATUS_UNINITIALIZED; condStopMeasurementSatus = 0; condSelectSensorStatus = 0; currentSelectedSensor = TEENSY_SENSOR_0; + currentConductivityModel = STANDARD; initCondDMAchannels(); @@ -496,7 +497,7 @@ state = txSelectSensor(); break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd ) break; } @@ -552,7 +553,7 @@ state = rxSelectSensor(); break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd ) break; } @@ -597,7 +598,7 @@ case TEENSY_CMD_SELECT_SENSOR: break; default: - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd ) + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd ) break; } @@ -947,7 +948,7 @@ switch ( condInitStatus ) { - case COND_INIT_STATUS_UNITIALIZED: + case COND_INIT_STATUS_UNINITIALIZED: break; case COND_INIT_STATUS_IN_PROGRESS: @@ -1034,7 +1035,7 @@ switch ( condInitStatus ) { - case COND_INIT_STATUS_UNITIALIZED: + case COND_INIT_STATUS_UNINITIALIZED: break; case COND_INIT_STATUS_IN_PROGRESS: @@ -1918,10 +1919,10 @@ condRawMeasurement[ tempSensor.sensorNum - 1 ] = tempSensor; // Calculate and store Conductivity from raw values - calculateConductivity( (TEENSY_SENSOR_INDEX_T)tempSensor.sensorNum - 1 ); + calculateConductivity( tempSensor.sensorNum - 1 ); // Calculate and store Temperature from raw values. - calculateTemperature( (TEENSY_SENSOR_INDEX_T)tempSensor.sensorNum - 1 ); + calculateTemperature( tempSensor.sensorNum - 1 ); parseStatus = COND_PARSE_SUCCESS; } Index: firmware/App/Drivers/ConductivityTeensy.h =================================================================== diff -u -rf6c8ce1cc681f87467cdb4dc1685df74f39e2740 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 --- firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision f6c8ce1cc681f87467cdb4dc1685df74f39e2740) +++ firmware/App/Drivers/ConductivityTeensy.h (.../ConductivityTeensy.h) (revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7) @@ -75,7 +75,7 @@ /// Enumeration of Initialization status of all the sensors connected to Teensy typedef enum Conductivity_Init_Status { - COND_INIT_STATUS_UNITIALIZED = 0, ///< The initialization process has not started. + COND_INIT_STATUS_UNINITIALIZED = 0, ///< The initialization process has not started. COND_INIT_STATUS_IN_PROGRESS, ///< The initialization process has started. COND_INIT_STATUS_INITIALIZED, ///< Initialization process completed and all the sensors were initialized successfully. COND_INIT_STATUS_FAILED ///< Initialization process completed but one or more sensor was not initialized properly. @@ -104,7 +104,7 @@ /// Enumeration of update EEPROM status typedef enum Conductivity_Update_Eeprom_Status { - COND_UPDATE_EEPROM_STATUS_UNITIALIZED = 0, ///< The initialization process has not started. + COND_UPDATE_EEPROM_STATUS_UNINITIALIZED = 0, ///< The initialization process has not started. COND_UPDATE_EEPROMSTATUS_IN_PROGRESS, ///< The initialization process has started. COND_UPDATE_EEPROM_STATUS_INITIALIZED, ///< Initialization process completed and all the sensors were initialized successfully. COND_UPDATE_EEPROM_STATUS_FAILED ///< Initialization process completed but one or more sensor was not initialized properly. @@ -171,19 +171,15 @@ F32 rtdRzMag; ///< Value of rtd_resistance F32 rtdRzPhase; ///< RTD Rz Phase. Hard coded to 0.0 } COND_SENSOR_DATA_T; -#pragma pack(pop) -/// Structure to receive EEPROM data from Teensy. These are coefficient values to calculate conductivity and temperature. -#pragma pack(push, 1) +/// Structure to receive EEPROM data from Teensy. These are coefficient values to calculate conductivity and temperature.) typedef struct { F64 doubleValue[DOUBLE_COUNT]; ///< Double Values stored in the EEPROM F32 floatValue[FLOAT_COUNT]; ///< Float Values stored in the EEPROM } COND_EEPROM_DATA_T; -#pragma pack(pop) /// Structure to receive conductivity measurement settings from Teensy -#pragma pack(push, 1) typedef struct { F32 SinFreq; ///< SinFreq : Frequency of excitation signal Index: firmware/App/Services/AlarmMgmtSWFaults.h =================================================================== diff -u -r830213bc6dcc1a684610caf78c79d55f2cb41e93 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 --- firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 830213bc6dcc1a684610caf78c79d55f2cb41e93) +++ firmware/App/Services/AlarmMgmtSWFaults.h (.../AlarmMgmtSWFaults.h) (revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7) @@ -148,6 +148,7 @@ SW_FAULT_ID_VOLTAGES_INVALID_SIGNAL = 117, SW_FAULT_ID_RINSE_PUMP_INVALID_EXEC_STATE = 118, SW_FAULT_ID_RINSE_PUMP_INVALID_STATE1 = 119, + SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE = 120, NUM_OF_SW_FAULT_IDS } DD_SW_FAULT_ID_T; @@ -189,7 +190,7 @@ FP_FAULT_ID_INVALID_ALARM_ID_REFERENCED1 = 32, FP_FAULT_ID_INVALID_ALARM_ID_REFERENCED2 = 33, FP_FAULT_ID_FPGA_INVALID_STATE = 34, - FP_FAULT_ID_ALARM_MGMT_INVALID_ALARM_TO_GET_PROPS = 35, + FP_FAULT_ID_ALARM_MGMFP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTEDT_INVALID_ALARM_TO_GET_PROPS = 35, FP_FAULT_ID_FPGA_WRITE_CMD_TOO_MUCH_DATA = 36, FP_FAULT_ID_FPGA_WRITE_RSP_TOO_MUCH_DATA = 37, FP_FAULT_ID_FPGA_READ_CMD_TOO_MUCH_DATA = 38, Index: firmware/App/Services/Interrupts.c =================================================================== diff -u -rf6c8ce1cc681f87467cdb4dc1685df74f39e2740 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7 --- firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision f6c8ce1cc681f87467cdb4dc1685df74f39e2740) +++ firmware/App/Services/Interrupts.c (.../Interrupts.c) (revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7) @@ -240,7 +240,7 @@ clearSCI2DMATransmitInterrupt(); signalFPGATransmitCompleted(); break; - +#ifdef __TEENSY_CONDUCTIVITY_DRIVER__ case DMA_CH1: // Conductivity receive channel clearSCIDMAReceiveInterrupt(); signalConductivityReceiptCompleted(); @@ -250,7 +250,7 @@ clearSCIDMATransmitInterrupt(); signalConductivityTransmitCompleted(); break; - +#endif default: // TODO - ignore? break;