Index: firmware/App/Services/NVMessagingDD.c =================================================================== diff -u -rb50ce33669efe6dfcf5f8a211c78a6c2c309adf3 -rac72b3fa86015b2c60c7687a4597dd4ae5c24dc8 --- firmware/App/Services/NVMessagingDD.c (.../NVMessagingDD.c) (revision b50ce33669efe6dfcf5f8a211c78a6c2c309adf3) +++ firmware/App/Services/NVMessagingDD.c (.../NVMessagingDD.c) (revision ac72b3fa86015b2c60c7687a4597dd4ae5c24dc8) @@ -2,7 +2,6 @@ * * Copyright (c) 2026-2027 Diality Inc. - All Rights Reserved. * -* THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file NVMessagingDD.c @@ -13,6 +12,7 @@ ***************************************************************************/ #include // For ceilf function +#include "ConductivitySensors.h" #include "Messaging.h" #include "NVJobQ.h" #include "NVMessagingDD.h" @@ -45,14 +45,6 @@ NUM_OF_NVM_SEND_RECORD_STATES ///< Number of NVM process records state. } SEND_RECORD_STATE_T; -/// NVM receive records states -typedef enum NVM_Receive_Records_States -{ - NVM_RECEIVE_RECORD_STATE_IDLE = 0, ///< NVM receive record idle. - NVM_RECEIVE_RECORD_STATE_RECEIVE, ///< NVM receive record receive. - NUM_OF_NVM_RECEIVE_RECORD_STATES ///< Number of NVM receive record. -} RECEIVE_RECORD_STATE_T; - #pragma pack(push, 1) /// DD NVM Record Payload @@ -68,7 +60,7 @@ BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_SYSTEM_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_SYSTEM_REC_PAYLOAD_T +}DD_NVM_GET_SYSTEM_REC_PAYLOAD_T; /// DD NVM Set System Record Response Payload typedef struct @@ -81,15 +73,15 @@ U32 topLevelSNRejectReason; ///< Reason to reject System record parameter topLevelSN[ MAX_TOP_LEVEL_SN_CHARS ] U32 mfgLocationRejectReason; ///< Reason to reject System record parameter mfgLocation U32 mfgDateRejectReason; ///< Reason to reject System record parameter mfgDate -}DD_NVM_SET_SYSTEM_REC_PAYLOAD_T +}DD_NVM_SET_SYSTEM_REC_PAYLOAD_T; /// DD NVM Get Service Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_SERVICE_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_SERVICE_REC_PAYLOAD_T +}DD_NVM_GET_SERVICE_REC_PAYLOAD_T; /// DD NVM Set Service Record Response Payload typedef struct @@ -102,20 +94,20 @@ U32 lastServiceEpochDateRejectReason; ///< Reason to reject Service record parameter lastServiceEpochDate U32 serviceIntervalSecondsRejectReason; ///< Reason to reject Service record parameter serviceIntervalSeconds U32 lastResetTimeEpochRejectReason; ///< Reason to reject Service record parameter lastResetTimeEpoch -}DD_NVM_SET_SERVICE_REC_PAYLOAD_T +}DD_NVM_SET_SERVICE_REC_PAYLOAD_T; /// DD NVM Get Usage Info Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_USAGE_INFO_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_USAGE_INFO_REC_PAYLOAD_T +}DD_NVM_GET_USAGE_INFO_REC_PAYLOAD_T; /// DD NVM Set Usage Info Record Response Payload typedef struct { - BOOL acceptedRejectReason; ///< Accepted/Rejected + BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Reason to reject the entire request U32 roWaterGenTotalLRejectReason; ///< Reason to reject Usage Info record parameter roWaterGenTotalL U32 roWaterGenSinceLastServiceLRejectReason; ///< Reason to reject Usage Info record parameter roWaterGenSinceLastServiceL @@ -124,7 +116,7 @@ U32 lastHeatActiveCoolCompleteDateEpochRejectReason; ///< Reason to reject Usage Info record parameter lastHeatActiveCoolCompleteDateEpoch U32 lastFilterFlushCompleteDateEpochRejectReason; ///< Reason to reject Usage Info record parameter lastFilterFlushCompleteDateEpoch U32 lastResetTimeEpochRejectReason; ///< Reason to reject Usage Info record parameter lastResetTimeEpoch -}DD_NVM_SET_USAGE_INFO_REC_PAYLOAD_T +}DD_NVM_SET_USAGE_INFO_REC_PAYLOAD_T; /// Institutional data reject reason structure. typedef struct @@ -140,47 +132,47 @@ BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_INSTIT_BASIC_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_INSTIT_BASIC_REC_PAYLOAD_T +}DD_NVM_GET_INSTIT_BASIC_REC_PAYLOAD_T; /// DD NVM Set Institutional Basic Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Reason to reject the entire request - INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_BASIC ] ///< Reject reasons for each param of basic institutional record. -}DD_NVM_SET_INSTIT_BASIC_REC_PAYLOAD_T + INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_BASIC ]; ///< Reject reasons for each param of basic institutional record. +}DD_NVM_SET_INSTIT_BASIC_REC_PAYLOAD_T; /// DD NVM Get Institutional Advanced Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_INSTIT_ADVANCED_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_INSTIT_ADVANCED_REC_PAYLOAD_T +}DD_NVM_GET_INSTIT_ADVANCED_REC_PAYLOAD_T; /// DD NVM Set Institutional Advanced Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Reason to reject the entire request - INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_ADVANCED ] ///< Reject reasons for each param of advanced institutional record. -}DD_NVM_SET_INSTIT_ADVANCED_REC_PAYLOAD_T + INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_ADVANCED ]; ///< Reject reasons for each param of advanced institutional record. +}DD_NVM_SET_INSTIT_ADVANCED_REC_PAYLOAD_T; /// DD NVM Get Institutional Additional Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. DD_INSTIT_ADDITIONAL_RECORD_T data; ///< Data to be sent -}DD_NVM_GET_INSTIT_ADDITIONAL_REC_PAYLOAD_T +}DD_NVM_GET_INSTIT_ADDITIONAL_REC_PAYLOAD_T; /// DD NVM Set Institutional Additional Record Response Payload typedef struct { BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Reason to reject the entire request - INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_ADDITIONAL ] ///< Reject reasons for each param of Additional institutional record. -}DD_NVM_SET_INSTIT_ADDITIONAL_REC_PAYLOAD_T + INSTIT_DATA_REJECT_REASON_T param[ NUM_OF_INSTIT_ADDITIONAL ]; ///< Reject reasons for each param of Additional institutional record. +}DD_NVM_SET_INSTIT_ADDITIONAL_REC_PAYLOAD_T; /// Linear reject reason calibration structure typedef struct @@ -327,7 +319,7 @@ BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Rejection reason if not accepted. U08 idx; ///< Index of conductivity sensor - DD_CONDUCTIVITY_SENSOR_T data; ///< Data to be sent + CONDUCTIVITY_COEFFICIENTS_T data; ///< Data to be sent } DD_NVM_GET_CONDUCTIVITY_SENSOR_CAL_REC_PAYLOAD_T; /// DD NVM Set Record Payload for Conductivity Sensor Calibration Data @@ -336,18 +328,18 @@ BOOL accepted; ///< Accepted/Rejected U32 rejectionReason; ///< Reason to reject the entire request U32 idxRejectReason; ///< Reason to reject conductivity sensor index - U32 coeff1RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff1 - U32 coeff2RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff2 - U32 coeff3RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff3 - U32 coeff4RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff4 - U32 coeff5RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff5 - U32 coeff6RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff6 - U32 coeff7RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff7 - U32 coeff8RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff8 - U32 coeff9RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff9 - U32 coeff10RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff10 - U32 coeff11RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff11 - U32 coeff12RejectReason; ///< Reason to reject conductivity sensor calibration record parameter coeff12 + U32 K_highRejectReason; ///< Reason to reject conductivity sensor calibration record parameter K_high + U32 alpha_higRejectReason; ///< Reason to reject conductivity sensor calibration record parameter alpha_high + U32 eta_highRejectReason; ///< Reason to reject conductivity sensor calibration record parameter eta_high + U32 zeta_highRejectReason; ///< Reason to reject conductivity sensor calibration record parameter zeta_high + U32 K_lowRejectReason; ///< Reason to reject conductivity sensor calibration record parameter K_low + U32 alpha_lowRejectReason; ///< Reason to reject conductivity sensor calibration record parameter alpha_low + U32 eta_lowRejectReason; ///< Reason to reject conductivity sensor calibration record parameter eta_low + U32 zeta_lowRejectReason; ///< Reason to reject conductivity sensor calibration record parameter zeta_low + U32 betaRejectReason; ///< Reason to reject conductivity sensor calibration record parameter beta + U32 deltaRejectReason; ///< Reason to reject conductivity sensor calibration record parameter delta + U32 reserved1RejectReason; ///< Reason to reject conductivity sensor calibration record parameter reserved1 + U32 reserved2RejectReason; ///< Reason to reject conductivity sensor calibration record parameter reserved2 U32 calibrationTimeRejectReason; ///< Reason to reject conductivity sensor calibration record parameter calibrationTime } DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_REC_PAYLOAD_T; @@ -356,20 +348,14 @@ // ********** private data ********** static SEND_RECORD_STATE_T nvMExecSendRecordState; ///< NVM exec process record state. -static RECEIVE_RECORD_STATE_T nvmExecreceiveRecordState; ///< NVM exec receive record state. static U32 newRecordStartTimer; ///< New record availability start timer. static BOOL isNewCalRecordAvailable; ///< Signal to indicate whether a new NVM data is available. static NV_DATA_T recordToPublish; ///< Record type which is being processed currently for sending static NV_DATA_T nvPublishRecordType; ///< Used to index over isPublishRecordRequested in the idle state -static NVM_RECORD_TYPE_T currentRxRecordType; ///< Record type which is being processed currently for receiving static U32 recordSendDataIntervalCounter; ///< Record data send to CAN bust interval counter. static U32 sendRetryCount; ///< Counter for number of retries to send a record -static U32 calRecordReceiveStartTime; ///< Time stamp the calibration record was received. -static U32 institRecordReceiveStartTime; ///< Time stamp the institutional record was received. -static DD_INSTIT_REC_TYPE sendInstitRec; ///< Current Institutional Record to be sent -static DD_CAL_REC_TYPE sendCalRec; ///< Current Calibration Record to be sent static U08 sendCalIdx; ///< Current Index of sensor calibration data to be sent -static BOOL isPublishRecordRequested[ NV_DATA_T ]; ///< Record state machine publish request flag. +static BOOL isPublishRecordRequested[ NUM_OF_NV_DD_DATA ]; ///< Record state machine publish request flag. // ********** private function prototypes ********** @@ -394,8 +380,8 @@ static SEND_RECORD_STATE_T handleSendBloodLeakSensorCalRecord( void ); static SEND_RECORD_STATE_T handleSendConductivitySensorCalRecord( void ); -static void updateSendRetryCount( BOOL sendStatus ); -static SEND_RECORD_STATE_T updateCalSendRetryCountAndIndex( BOOL sendStatus, U08 maxIdx) +static SEND_RECORD_STATE_T updateSendRetryCount( BOOL sendStatus ); +static SEND_RECORD_STATE_T updateCalSendRetryCountAndIndex( BOOL sendStatus, U08 maxIdx ); static void monitorNewCalSignal( void ); @@ -417,7 +403,6 @@ void initNVMessagingDD( void ) { nvMExecSendRecordState = NVM_SEND_RECORD_STATE_IDLE; - nvmExecreceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; newRecordStartTimer = 0; isNewCalRecordAvailable = FALSE; nvPublishRecordType = NV_DD_DATA_SYSTEM_RECORD; @@ -460,31 +445,29 @@ break; } - if( nvmExecreceiveRecordState == NVM_RECEIVE_RECORD_STATE_RECEIVE ) - { - if ( ( NVM_CALIBRATION_RECORD == currentRxRecordType ) && - ( TRUE == didTimeout( calRecordReceiveStartTime, RECORD_DATA_RECEIVE_TIMEOUT_MS ) ) ) - { - updateRecordCRC(NVM_CALIBRATION_RECORD); - enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); - startNewCalRecordAvailableTimer(); - setNewCalibrationRecordAvailable( TRUE ); - PROCESS_RECORD_SPECS_T recordSpec = getProcessRecord( NVM_CALIBRATION_RECORD ); - sendNVEvent( NVM_CALIBRATION_RECORD , 0, 0 ); - nvmExecreceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; - } +// if( nvmExecreceiveRecordState == NVM_RECEIVE_RECORD_STATE_RECEIVE ) +// { +// if ( ( NVM_CALIBRATION_RECORD == currentRxRecordType ) && +// ( TRUE == didTimeout( calRecordReceiveStartTime, RECORD_DATA_RECEIVE_TIMEOUT_MS ) ) ) +// { +// updateRecordCRC(NVM_CALIBRATION_RECORD); +// enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); +// startNewCalRecordAvailableTimer(); +// setNewCalibrationRecordAvailable( TRUE ); +// sendNVEvent( NVM_CALIBRATION_RECORD , 0, 0 ); +// nvmExecreceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; +// } +// +// if ( ( NVM_INSTITUTIONAL_RECORD == currentRxRecordType ) && +// ( TRUE == didTimeout( institRecordReceiveStartTime, RECORD_DATA_RECEIVE_TIMEOUT_MS ) ) ) +// { +// updateRecordCRC(NVM_INSTITUTIONAL_RECORD); +// enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD ); +// sendNVEvent( NVM_INSTITUTIONAL_RECORD , 0, 0 ); +// nvmExecreceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; +// } +// } - if ( ( NVM_INSTITUTIONAL_RECORD == currentRxRecordType ) && - ( TRUE == didTimeout( institRecordReceiveStartTime, RECORD_DATA_RECEIVE_TIMEOUT_MS ) ) ) - { - updateRecordCRC(NVM_INSTITUTIONAL_RECORD); - enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD ); - PROCESS_RECORD_SPECS_T recordSpec = getProcessRecord( NVM_INSTITUTIONAL_RECORD ); - sendNVEvent( NVM_INSTITUTIONAL_RECORD , 0, 0 ); - nvmExecreceiveRecordState = NVM_RECEIVE_RECORD_STATE_IDLE; - } - } - // Check the calibration signal monitorNewCalSignal(); } @@ -547,7 +530,7 @@ if ( TRUE == isPublishRecordRequested[ nvPublishRecordType ] ) { - recordToPublish = ( NVM_RECORD_TYPE_T )nvPublishRecordType; + recordToPublish = nvPublishRecordType; // Set the publish flag to FALSE isPublishRecordRequested[ recordToPublish ] = FALSE; @@ -559,10 +542,10 @@ state = NVM_SEND_RECORD_STATE_SEND; } - nvPublishRecordType = ( NVM_RECORD_TYPE_T )( nvPublishRecordType + 1 ); - if( nvPublishRecordType >= NUM_OF_NVM_RECORD_TYPES ) + nvPublishRecordType = ( NV_DATA_T )( nvPublishRecordType + 1 ); + if( nvPublishRecordType >= NUM_OF_NV_DD_DATA ) { - nvPublishRecordType = NVM_SYSTEM_RECORD; + nvPublishRecordType = NV_DD_DATA_SYSTEM_RECORD; } return state; @@ -587,72 +570,72 @@ // If it is time to send data if ( ++recordSendDataIntervalCounter >= RECORD_DATA_SEND_INTERVAL_COUNT ) { - switch(recordToPublish) + switch ( recordToPublish ) { - case NVM_REC_TYPE_SYSTEM: + case NV_DD_DATA_SYSTEM_RECORD: state = handleSendDDSystemRecord(); break; - case NVM_REC_TYPE_SERVICE: + case NV_DD_DATA_SERVICE_RECORD: state = handleSendDDServiceRecord(); break; - case NVM_REC_TYPE_USAGE_INFO: - state = handleSendDDUsageInfoRecord(); - break; - - case NVM_REC_TYPE_INSTIT_BASIC: - state = handleSendDDInstitBasicRecord(); - break; - - case NVM_REC_TYPE_INSTIT_ADVANCED: - state = handleSendDDInstitAdvancedRecord(); - break; - - case NVM_REC_TYPE_INSTIT_ADDITIONAL: - state = handleSendDDInstitAdditionalRecord(); - break; - - case NVM_REC_TYPE_CAL_PRESSURE_SENSORS: + case NV_DD_DATA_CAL_PRESSURE_SENOSRS: state = handleSendPressureSensorCalRecord(); break; - case NVM_REC_TYPE_CAL_TEMPERATURE_SENSORS: + case NV_DD_DATA_CAL_TEMPERATURE_SENSORS: state = handleSendTempSensorCalRecord(); break; - case NVM_REC_TYPE_CAL_CONC_PUMPS: + case NV_DD_DATA_CAL_CONCENTRATE_PUMPS_RECORD: state = handleSendConcPumpCalRecord(); break; - case NVM_REC_TYPE_CAL_D12_PUMP: + case NV_DD_DATA_CAL_D12_PUMP_RECORD: state = handleSendD12PumpCalRecord(); break; - case NVM_REC_TYPE_CAL_D48_PUMP: + case NV_DD_DATA_CAL_D48_PUMP_RECORD: state = handleSendD48PumpCalRecord(); break; - case NVM_REC_TYPE_CAL_ACID_CONCENTREATES: + case NV_DD_DATA_CAL_ACID_CONCENTREATES: state = handleSendAcidConcCalRecord(); break; - case NVM_REC_TYPE_CAL_BICARB_CONCENTRATES: + case NV_DD_DATA_CAL_BICARB_CONCENTRATES: state = handleSendBicarbConcCalRecord(); break; - case NVM_REC_TYPE_CAL_ACCEL_SENSOR: + case NV_DD_DATA_CAL_ACCELEROMETER_SENSOR: state = handleSendAccelSensorCalRecord(); break; - case NVM_REC_TYPE_CAL_BLOOD_LEAK_SENSOR: + case NV_DD_DATA_CAL_BLOOD_LEAK_SENSOR: state = handleSendBloodLeakSensorCalRecord(); break; - case NVM_REC_TYPE_CAL_CONDUCTIVITY_SENSORS: + case NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS: state = handleSendConductivitySensorCalRecord(); break; + case NV_DD_DATA_INSTIT_BASIC_RECORD: + state = handleSendDDInstitBasicRecord(); + break; + + case NV_DD_DATA_INSTIT_ADVANCED_RECORD: + state = handleSendDDInstitAdvancedRecord(); + break; + + case NV_DD_DATA_INSTIT_ADDITIONAL_RECORD: + state = handleSendDDInstitAdditionalRecord(); + break; + + case NV_DD_DATA_USAGE_INFO_RECORD: + state = handleSendDDUsageInfoRecord(); + break; + default: break; } @@ -754,7 +737,7 @@ DD_NVM_GET_USAGE_INFO_REC_PAYLOAD_T payload; // Get the record - if ( TRUE == getNVMRecord( NV_DD_DATA_USAGE_RECORD, + if ( TRUE == getNVMRecord( NV_DD_DATA_USAGE_INFO_RECORD, (U08*)&payload.data, sizeof( DD_USAGE_INFO_RECORD_T ), 0, @@ -766,7 +749,7 @@ // Send the record sendStatus = sendMessage( MSG_ID_DD_UI_NVM_GET_USAGE_INFO_RECORD_RESPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, - (U08*)&usageInfoRecord, + (U08*)&payload, sizeof( DD_NVM_GET_USAGE_INFO_REC_PAYLOAD_T ) ); } @@ -796,7 +779,7 @@ (U08*)&payload.data, sizeof( DD_INSTIT_BASIC_RECORD_T ), 0, - ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC ) ) + ALARM_ID_DD_NVM_INVALID_INSTIT_BASIC_RECORD_CRC ) ) { payload.accepted = TRUE; payload.rejectionReason = 0; @@ -834,7 +817,7 @@ (U08*)&payload.data, sizeof( DD_INSTIT_ADVANCED_RECORD_T ), 0, - ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC ) ) + ALARM_ID_DD_NVM_INVALID_INSTIT_ADVANCED_RECORD_CRC ) ) { payload.accepted = TRUE; payload.rejectionReason = 0; @@ -872,7 +855,7 @@ (U08*)&payload.data, sizeof( DD_INSTIT_ADDITIONAL_RECORD_T ), 0, - ALARM_ID_DD_NVM_INVALID_INSTITUTIONAL_RECORD_CRC ) ) + ALARM_ID_DD_NVM_INVALID_INSTIT_ADDITIONAL_RECORD_CRC ) ) { payload.accepted = TRUE; payload.rejectionReason = 0; @@ -925,7 +908,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_PRESSURE_SENSORS ); - return sendStatus; + return state; } /*********************************************************************//** @@ -964,7 +947,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_TEMPERATURE_SENSORS ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1003,7 +986,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_CONCENTRATE_PUMPS ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1040,7 +1023,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, 0 ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1077,7 +1060,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, 0 ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1116,7 +1099,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_ACID_TYPE ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1155,7 +1138,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_BICARB_TYPE ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1173,7 +1156,7 @@ DD_NVM_GET_ACCEL_SENSOR_CAL_REC_PAYLOAD_T payload; // Get the record - if ( TRUE == getNVMRecord( NV_DD_DATA_CAL_ACCEL_SENSOR, + if ( TRUE == getNVMRecord( NV_DD_DATA_CAL_ACCELEROMETER_SENSOR, (U08*)&payload.data, sizeof( DD_ACCEL_SENSOR_CAL_RECORD_T ), 0, @@ -1192,7 +1175,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, 0 ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1229,7 +1212,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, 0 ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1248,7 +1231,7 @@ DD_CONDUCTIVITY_SENSOR_CAL_RECORD_T record; // Get the record - if ( TRUE == getNVMRecord( NV_DD_DATA_CAL_CONDUCTIVITY_SENSOR, + if ( TRUE == getNVMRecord( NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS, (U08*)&record, sizeof( DD_CONDUCTIVITY_SENSOR_CAL_RECORD_T ), NUM_OF_CONDUCTIVITY_SENSORS, @@ -1268,7 +1251,7 @@ state = updateCalSendRetryCountAndIndex( sendStatus, NUM_OF_CONDUCTIVITY_SENSORS ); - return sendStatus; + return state; } /*********************************************************************//** @@ -1312,7 +1295,7 @@ sendRetryCount = 0; // Clear the publishing flags - recordToPublish = NUM_OF_NVM_REC_ITEMS; + recordToPublish = NUM_OF_NV_DD_DATA; // Move to Send Idle State state = NVM_SEND_RECORD_STATE_IDLE; @@ -1329,7 +1312,7 @@ sendRetryCount = 0; // Clear the publishing flags - recordToPublish = NUM_OF_NVM_REC_ITEMS; + recordToPublish = NUM_OF_NV_DD_DATA; // Move to Send Idle State state = NVM_SEND_RECORD_STATE_IDLE; @@ -1348,7 +1331,7 @@ * @@param maxIdx Maximum Index value of the current calibration item being sent * @return state next state of the state machine *************************************************************************/ -static SEND_RECORD_STATE_T updateCalSendRetryCountAndIndex( BOOL sendStatus, U08 maxIdx) +static SEND_RECORD_STATE_T updateCalSendRetryCountAndIndex( BOOL sendStatus, U08 maxIdx ) { SEND_RECORD_STATE_T state = NVM_SEND_RECORD_STATE_SEND; BOOL resetState = FALSE; @@ -1385,7 +1368,7 @@ sendRetryCount = 0; // Clear the publishing flags - recordToPublish = NUM_OF_NVM_REC_ITEMS; + recordToPublish = NUM_OF_NV_DD_DATA; // Move to Send Idle State state = NVM_SEND_RECORD_STATE_IDLE; @@ -1429,7 +1412,7 @@ { if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); + memcpy( &record, message->payload, expectedPayloadLen ); setNVMMRecord( NV_DD_DATA_SYSTEM_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_SYSTEM_RECORD ); sendNVEvent( NVM_SYSTEM_RECORD, 0, 0 ); @@ -1487,7 +1470,7 @@ { if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); + memcpy( &record, message->payload, expectedPayloadLen ); setNVMMRecord( NV_DD_DATA_SERVICE_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_SERVICE_RECORD ); sendNVEvent( NVM_SERVICE_RECORD, 0, 0 ); @@ -1542,7 +1525,7 @@ if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); + memcpy( &record, message->payload, expectedPayloadLen ); setNVMMRecord( NV_DD_DATA_USAGE_INFO_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_USAGE_INFO_RECORD ); sendNVEvent( NVM_USAGE_INFO_RECORD, 0, 0 ); @@ -1592,8 +1575,8 @@ if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); - record.crc = crc16 ( (U08*)&record, sizeof( DD_INSTIT_BASIC_RECORD_T ) - sizeof( U16 ) ); + memcpy( &record, message->payload, expectedPayloadLen ); + record.crc = crc16( (U08*)&record, sizeof( DD_INSTIT_BASIC_RECORD_T ) - sizeof( U16 ) ); setNVMMRecord( NV_DD_DATA_INSTIT_BASIC_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD ); sendNVEvent( NVM_INSTITUTIONAL_RECORD, 0, 0 ); @@ -1643,8 +1626,8 @@ if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); - record.crc = crc16 ( (U08*)&record, sizeof( DD_INSTIT_ADVANCED_RECORD_T ) - sizeof( U16 ) ); + memcpy( &record, message->payload, expectedPayloadLen ); + record.crc = crc16( (U08*)&record, sizeof( DD_INSTIT_ADVANCED_RECORD_T ) - sizeof( U16 ) ); setNVMMRecord( NV_DD_DATA_INSTIT_ADVANCED_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD ); sendNVEvent( NVM_INSTITUTIONAL_RECORD, 0, 0 ); @@ -1694,8 +1677,8 @@ if ( message->hdr.payloadLen == expectedPayloadLen ) { - memcpy( record, message->payload, expectedPayloadLen ); - record.crc = crc16 ( (U08*)&record, sizeof( DD_INSTIT_ADDITIONAL_RECORD_T ) - sizeof( U16 ) ); + memcpy( &record, message->payload, expectedPayloadLen ); + record.crc = crc16( (U08*)&record, sizeof( DD_INSTIT_ADDITIONAL_RECORD_T ) - sizeof( U16 ) ); setNVMMRecord( NV_DD_DATA_INSTIT_ADDITIONAL_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_INSTITUTIONAL_RECORD ); sendNVEvent( NVM_INSTITUTIONAL_RECORD, 0, 0 ); @@ -1757,7 +1740,7 @@ if( idx < NUM_OF_PRESSURE_SENSORS ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_PRESSURE_SENOSRS, (U08*)&record, idx ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -1829,7 +1812,7 @@ if( idx < NUM_OF_TEMPERATURE_SENSORS ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_TEMPERATURE_SENSORS, (U08*)&record, idx ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -1901,7 +1884,7 @@ if( idx < NUM_OF_CONCENTRATE_PUMPS ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_CONCENTRATE_PUMPS_RECORD, (U08*)&record, idx ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -1966,7 +1949,7 @@ if ( message->hdr.payloadLen == recordSize ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_D12_PUMP_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -2027,7 +2010,7 @@ if ( message->hdr.payloadLen == recordSize ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.d48DialysatePump.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_D48_PUMP_RECORD, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -2095,7 +2078,7 @@ if( idx < NUM_OF_ACID_TYPE ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_ACID_CONCENTREATES, (U08*)&record, idx ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -2167,7 +2150,7 @@ if( idx < NUM_OF_BICARB_TYPE ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_BICARB_CONCENTRATES, (U08*)&record, idx ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -2202,7 +2185,7 @@ if ( NVM_SEND_RECORD_STATE_IDLE == nvMExecSendRecordState ) { - isPublishRecordRequested[ NV_DD_DATA_CAL_ACCEL_SENSOR] = TRUE; + isPublishRecordRequested[ NV_DD_DATA_CAL_ACCELEROMETER_SENSOR] = TRUE; result = TRUE; } else @@ -2232,8 +2215,8 @@ if ( message->hdr.payloadLen == recordSize ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); - setNVMMRecord( NV_DD_DATA_CAL_ACCEL_SENSOR, (U08*)&record, 0 ); + record.crc = crc16( (U08*)&record, recordSize ); + setNVMMRecord( NV_DD_DATA_CAL_ACCELEROMETER_SENSOR, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); response.accepted = TRUE; @@ -2293,7 +2276,7 @@ if ( message->hdr.payloadLen == recordSize ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); + record.crc = crc16( (U08*)&record, recordSize ); setNVMMRecord( NV_DD_DATA_CAL_BLOOD_LEAK_SENSOR, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); @@ -2324,7 +2307,7 @@ if ( NVM_SEND_RECORD_STATE_IDLE == nvMExecSendRecordState ) { - isPublishRecordRequested[ NV_DD_DATA_CAL_CONDUCTIVITY_SENSOR] = TRUE; + isPublishRecordRequested[ NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS ] = TRUE; result = TRUE; } else @@ -2344,18 +2327,18 @@ { BOOL result = FALSE; U08* payloadPtr = message->payload; - U08 recordSize = sizeof( DD_CONDUCTIVITY_SENSOR_T ) - sizeof( U16 ); // Data - CRC + U08 recordSize = sizeof( CONDUCTIVITY_COEFFICIENTS_T ) - sizeof( U16 ); // Data - CRC DD_NVM_SET_CONDUCTIVITY_SENSOR_CAL_REC_PAYLOAD_T response = { 0 }; - DD_CONDUCTIVITY_SENSOR_T record; + CONDUCTIVITY_COEFFICIENTS_T record; // Calibration record can be updated only in service mode if ( DD_MODE_SERV == getCurrentOperationMode() ) { if ( message->hdr.payloadLen == recordSize ) { memcpy( &record, payloadPtr, recordSize ); - record.crc = crc16 ( (U08*)&record, recordSize ); - setNVMMRecord( NV_DD_DATA_CAL_CONDUCTIVITY_SENSOR, (U08*)&record, 0 ); + record.crc = crc16( (U08*)&record, recordSize ); + setNVMMRecord( NV_DD_DATA_CAL_CONDUCTIVITY_SENSORS, (U08*)&record, 0 ); result = enqueueEraseAndWriteSector( NVM_CALIBRATION_RECORD ); sendNVEvent( NVM_CALIBRATION_RECORD, 0, 0 ); response.accepted = TRUE;