Mercurial > public > ostc4

comparison Discovery/Src/data_exchange_main.c @ 734:190e5814b2f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed interface selection from sensor menu: By implementing the automatic sensor detection the need for the manual selection has become obsulete. By removing the selection button space became available to insert the sensor information button which shows detailed data of DigO2 sensor.
author Ideenmodellierer
date Sun, 15 Jan 2023 21:51:54 +0100
parents 5143e927219f
children df0d43da1614
comparison
equal deleted inserted replaced
733:7b0e020513e3 734:190e5814b2f5
978 { 978 {
979 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] * pSettings->ppo2sensors_calibCoeff[idx]; 979 pStateReal->lifeData.ppO2Sensor_bar[idx] = pStateReal->lifeData.sensorVoltage_mV[idx] * pSettings->ppo2sensors_calibCoeff[idx];
980 } 980 }
981 } 981 }
982 } 982 }
983 pStateReal->lifeData.extIf_sensor_Id = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].externalInterface_SensorID;
984 if(pStateReal->lifeData.extIf_sensor_Id != 0)
985 {
986 memcpy(pStateReal->lifeData.extIf_sensor_data, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32);
987 }
988 memcpy(pStateReal->lifeData.extIf_sensor_map, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map, EXT_INTERFACE_SENSOR_CNT);
989 } 983 }
990 } 984 }
991 985
992 if(pStateReal->data_old__lost_connection_to_slave == 0) 986 if(pStateReal->data_old__lost_connection_to_slave == 0)
993 { 987 {
988
989 pStateReal->lifeData.extIf_sensor_Id = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].externalInterface_SensorID;
990 if(pStateReal->lifeData.extIf_sensor_Id != 0)
991 {
992 memcpy(pStateReal->lifeData.extIf_sensor_data, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32);
993 }
994 memcpy(pStateReal->lifeData.extIf_sensor_map, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map, EXT_INTERFACE_SENSOR_CNT);
995
996
994 meter = getSampleDepth(&dataIn, pStateReal); 997 meter = getSampleDepth(&dataIn, pStateReal);
995 998
996 pStateReal->pressure_uTick_old = pStateReal->pressure_uTick_new; 999 pStateReal->pressure_uTick_old = pStateReal->pressure_uTick_new;
997 pStateReal->pressure_uTick_new = dataIn.data[dataIn.boolPressureData].pressure_uTick; 1000 pStateReal->pressure_uTick_new = dataIn.data[dataIn.boolPressureData].pressure_uTick;
998 pStateReal->pressure_uTick_local_new = HAL_GetTick(); 1001 pStateReal->pressure_uTick_local_new = HAL_GetTick();