Mercurial > public > ostc4

comparison Discovery/Src/tInfoSensor.c @ 732:e33d661d1743

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compiler switch: Only computate the normalized ppo2 in case the compile switch is activated (ENABLE_EXTERNAL_PRESSURE)
author Ideenmodellierer
date Sun, 15 Jan 2023 21:45:14 +0100
parents f285424f04d9
children c31237d20491
comparison
equal deleted inserted replaced
731:2a801cfe23ab 732:e33d661d1743
115 tInfo_write_content_simple( 30, 340, ME_Y_LINE3, &FontT48, text, CLUT_Font020); 115 tInfo_write_content_simple( 30, 340, ME_Y_LINE3, &FontT48, text, CLUT_Font020);
116 snprintf(text,32,"Feuchtigkeit: %02.1f", (float)pDiveO2Data->humidity / 1000.0); 116 snprintf(text,32,"Feuchtigkeit: %02.1f", (float)pDiveO2Data->humidity / 1000.0);
117 tInfo_write_content_simple( 30, 340, ME_Y_LINE4, &FontT48, text, CLUT_Font020); 117 tInfo_write_content_simple( 30, 340, ME_Y_LINE4, &FontT48, text, CLUT_Font020);
118 snprintf(text,32,"Status: 0x%lx", pDiveO2Data->status); 118 snprintf(text,32,"Status: 0x%lx", pDiveO2Data->status);
119 tInfo_write_content_simple( 30, 340, ME_Y_LINE5, &FontT48, text, CLUT_Font020); 119 tInfo_write_content_simple( 30, 340, ME_Y_LINE5, &FontT48, text, CLUT_Font020);
120 #ifdef ENABLE_EXTERNAL_PRESSURE
120 snprintf(text,32,"Norm ppO2: %02.3f (%02.1f)", (float)(stateRealGetPointer()->lifeData.ppO2Sensor_bar[0] / (pressure / 1000.0)),(float)(stateRealGetPointer()->lifeData.ppO2Sensor_bar[0])); 121 snprintf(text,32,"Norm ppO2: %02.3f (%02.1f)", (float)(stateRealGetPointer()->lifeData.ppO2Sensor_bar[0] / (pressure / 1000.0)),(float)(stateRealGetPointer()->lifeData.ppO2Sensor_bar[0]));
121 tInfo_write_content_simple( 30, 340, ME_Y_LINE6, &FontT48, text, CLUT_Font020); 122 tInfo_write_content_simple( 30, 340, ME_Y_LINE6, &FontT48, text, CLUT_Font020);
123 #endif
122 } 124 }
123 125
124 void sendActionToInfoSensor(uint8_t sendAction) 126 void sendActionToInfoSensor(uint8_t sendAction)
125 { 127 {
126 128