Mercurial > public > ostc4

comparison Discovery/Src/data_central.c @ 873:e373e90a48db Evo_2_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge new screen stuff
author heinrichsweikamp
date Wed, 14 Aug 2024 16:44:46 +0200
parents db92692c014f fa431d42b5fb
children a7f4451ba69e
comparison
equal deleted inserted replaced
872:5e027b0f7475 873:e373e90a48db
561 nitrogen = 100; 561 nitrogen = 100;
562 nitrogen -= oxygen; 562 nitrogen -= oxygen;
563 nitrogen -= helium; 563 nitrogen -= helium;
564 564
565 565
566 if((lifeData->actualGas.nitrogen_percentage != nitrogen) || (lifeData->actualGas.helium_percentage != helium) || (lifeData->actualGas.AppliedDiveMode != DIVEMODE_OC)) 566 if ((lifeData->actualGas.nitrogen_percentage != nitrogen) || (lifeData->actualGas.helium_percentage != helium) || lifeData->actualGas.AppliedDiveMode != DIVEMODE_OC)
567 { 567 {
568 stateUsedWrite->events.manualGasSet = 1; 568 if (stateUsed->diveSettings.ccrOption) {
569 stateUsedWrite->events.info_manualGasSetHe = helium; 569 stateUsedWrite->events.bailout = 1;
570 stateUsedWrite->events.info_manualGasSetO2 = oxygen; 570 stateUsedWrite->events.info_bailoutHe = helium;
571 stateUsedWrite->events.info_bailoutO2 = oxygen;
572 } else {
573 stateUsedWrite->events.manualGasSet = 1;
574 stateUsedWrite->events.info_manualGasSetHe = helium;
575 stateUsedWrite->events.info_manualGasSetO2 = oxygen;
576 }
571 } 577 }
578
572 if( lifeData->actualGas.setPoint_cbar != setpoint_cbar) 579 if( lifeData->actualGas.setPoint_cbar != setpoint_cbar)
573 { 580 {
574 stateUsedWrite->events.setpointChange = 1; 581 stateUsedWrite->events.setpointChange = 1;
575 stateUsedWrite->events.info_SetpointChange = setpoint_cbar; 582 stateUsedWrite->events.info_SetpointChange = setpoint_cbar;
576 } 583 }