Mercurial > public > ostc4

comparison Discovery/Src/tMenuEditHardware.c @ 605:1f665e31aca2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change O2_CALIB_FRACTION_O2 to 0.98 It's common sense that calibrating CCR's with O2 asumes a max. O2 content of 98%
author heinrichsweikamp
date Thu, 07 Jan 2021 09:53:04 +0100
parents 830de438e0b0
children d7c5d592076b
comparison
equal deleted inserted replaced
604:fb5bb04ad914 605:1f665e31aca2
63 uint8_t OnAction_O2_Fallback (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 63 uint8_t OnAction_O2_Fallback (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
64 uint8_t OnAction_O2_Calibrate (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 64 uint8_t OnAction_O2_Calibrate (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
65 uint8_t OnAction_O2_Source (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 65 uint8_t OnAction_O2_Source (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
66 uint8_t OnAction_Button (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 66 uint8_t OnAction_Button (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
67 uint8_t OnAction_ButtonBalance (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 67 uint8_t OnAction_ButtonBalance (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
68 // nicht notwending uint8_t OnAction_Bluetooth (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action); 68 // not required uint8_t OnAction_Bluetooth (uint32_t editId, uint8_t blockNumber, uint8_t digitNumber, uint8_t digitContent, uint8_t action);
69 69
70 /* Exported functions --------------------------------------------------------*/ 70 /* Exported functions --------------------------------------------------------*/
71 71
72 72
73 #define O2_CALIB_FRACTION_AIR (0.209F) 73 #define O2_CALIB_FRACTION_AIR (0.209F)
74 #define O2_CALIB_FRACTION_O2 (0.98F)
74 75
75 static uint8_t O2_calib_gas = 21; 76 static uint8_t O2_calib_gas = 21;
76 77
77 void openEdit_Hardware(uint8_t line) 78 void openEdit_Hardware(uint8_t line)
78 { 79 {
490 { 491 {
491 compensatedRef = O2_CALIB_FRACTION_AIR * pStateReal->lifeData.pressure_ambient_bar / 1.0; 492 compensatedRef = O2_CALIB_FRACTION_AIR * pStateReal->lifeData.pressure_ambient_bar / 1.0;
492 } 493 }
493 else 494 else
494 { 495 {
495 compensatedRef = 100.0 * pStateReal->lifeData.pressure_ambient_bar / 1.0; 496 compensatedRef = O2_CALIB_FRACTION_O2 * pStateReal->lifeData.pressure_ambient_bar / 1.0;
496 } 497 }
497 for(loop=0;loop<3;loop++) 498 for(loop=0;loop<3;loop++)
498 { 499 {
499 if((pSettings->ppo2sensors_deactivated & (0x1 << loop)) == 0) 500 if((pSettings->ppo2sensors_deactivated & (0x1 << loop)) == 0)
500 { 501 {