Mercurial > public > ostc4
diff Discovery/Src/data_exchange_main.c @ 786:19ab6f3ed52a
Cleanup sensor data interface:
In a very early implementation of the multiplexer the address of the mux was 0 followed by the sensors. As a resul the ID of the channels was shifted by one. To avoid confusion and because the mux address is meanwhile changed to the last address, it makes sense to return to the indexing where only the three visible sensor slots are used as reference (0,1,2).
| author | Ideenmodellierer |
|---|---|
| date | Sun, 04 Jun 2023 21:54:24 +0200 |
| parents | e40790a67165 |
| children | 75ace7af8212 |
line wrap: on
line diff
--- a/Discovery/Src/data_exchange_main.c Wed May 31 08:44:07 2023 +0200 +++ b/Discovery/Src/data_exchange_main.c Sun Jun 04 21:54:24 2023 +0200 @@ -994,10 +994,10 @@ { pStateReal->lifeData.extIf_sensor_Id = dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].externalInterface_SensorID; - if((pStateReal->lifeData.extIf_sensor_Id != 0) && (pStateReal->lifeData.extIf_sensor_Id <= 3)) + if(pStateReal->lifeData.extIf_sensor_Id < 3) { - memcpy(pStateReal->lifeData.extIf_sensor_data[pStateReal->lifeData.extIf_sensor_Id-1], dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32); + memcpy(pStateReal->lifeData.extIf_sensor_data[pStateReal->lifeData.extIf_sensor_Id], dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_data, 32); } memcpy(pStateReal->lifeData.extIf_sensor_map, dataIn.data[(dataIn.boolADCO2Data && DATA_BUFFER_ADC)].sensor_map, EXT_INTERFACE_SENSOR_CNT);