Mercurial > public > ostc4
comparison Discovery/Src/tMenuHardware.c @ 981:c6c781a2e85b default
Merge into default
| author | heinrichsweikamp |
|---|---|
| date | Tue, 11 Feb 2025 18:12:00 +0100 |
| parents | ffb1036c27c2 |
| children | ac25c35a3c97 |
comparison
equal
deleted
inserted
replaced
| 871:f7318457df4d | 981:c6c781a2e85b |
|---|---|
| 100 { | 100 { |
| 101 text[textPointer++] = '\t'; | 101 text[textPointer++] = '\t'; |
| 102 sensorStatusColor[0] = '\020'; | 102 sensorStatusColor[0] = '\020'; |
| 103 sensorStatusColor[1] = '\020'; | 103 sensorStatusColor[1] = '\020'; |
| 104 sensorStatusColor[2] = '\020'; | 104 sensorStatusColor[2] = '\020'; |
| 105 if(stateUsed->diveSettings.ppo2sensors_deactivated) | 105 |
| 106 { | 106 if((stateUsed->diveSettings.ppo2sensors_deactivated & 1) || (data->ext_sensor_map[0] > SENSOR_DIGO2M)) |
| 107 if(stateUsed->diveSettings.ppo2sensors_deactivated & 1) | |
| 108 sensorStatusColor[0] = '\031'; | 107 sensorStatusColor[0] = '\031'; |
| 109 if(stateUsed->diveSettings.ppo2sensors_deactivated & 2) | 108 if((stateUsed->diveSettings.ppo2sensors_deactivated & 2) || (data->ext_sensor_map[1] > SENSOR_DIGO2M)) |
| 110 sensorStatusColor[1] = '\031'; | 109 sensorStatusColor[1] = '\031'; |
| 111 if(stateUsed->diveSettings.ppo2sensors_deactivated & 4) | 110 if((stateUsed->diveSettings.ppo2sensors_deactivated & 4) || (data->ext_sensor_map[1] > SENSOR_DIGO2M)) |
| 112 sensorStatusColor[2] = '\031'; | 111 sensorStatusColor[2] = '\031'; |
| 113 } | 112 |
| 114 textPointer += snprintf(&text[textPointer],20,"%c%01.1f %c%01.1f %c%01.1f\020" | 113 textPointer += snprintf(&text[textPointer],20,"%c%01.1f %c%01.1f %c%01.1f\020" |
| 115 ,sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0] | 114 ,sensorStatusColor[0], stateUsed->lifeData.ppO2Sensor_bar[0] |
| 116 ,sensorStatusColor[1], stateUsed->lifeData.ppO2Sensor_bar[1] | 115 ,sensorStatusColor[1], stateUsed->lifeData.ppO2Sensor_bar[1] |
| 117 ,sensorStatusColor[2], stateUsed->lifeData.ppO2Sensor_bar[2]); | 116 ,sensorStatusColor[2], stateUsed->lifeData.ppO2Sensor_bar[2]); |
| 118 } | 117 } |
