Mercurial > public > ostc4

comparison Discovery/Src/data_exchange_main.c @ 807:9e2ebfc72e8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Zusammenf?hren
author heinrichsweikamp
date Sat, 26 Aug 2023 13:37:06 +0200
parents dd7ce655db26
children da632300e7d4
comparison
equal deleted inserted replaced
806:ee3c0029ed34 807:9e2ebfc72e8c
1023 } 1023 }
1024 if(stateUsed == stateSimGetPointer()) 1024 if(stateUsed == stateSimGetPointer())
1025 { 1025 {
1026 simulation_exit(); 1026 simulation_exit();
1027 } 1027 }
1028 disableTimer();
1029
1028 // new 170508 1030 // new 170508
1029 settingsGetPointer()->bluetoothActive = 0; 1031 settingsGetPointer()->bluetoothActive = 0;
1030 MX_Bluetooth_PowerOff(); 1032 MX_Bluetooth_PowerOff();
1031 //Init dive Mode 1033 //Init dive Mode
1032 decoLock = DECO_CALC_init_as_is_start_of_dive; 1034 decoLock = DECO_CALC_init_as_is_start_of_dive;
1044 if(modeChangeFlag) 1046 if(modeChangeFlag)
1045 { 1047 {
1046 *modeChangeFlag = 1; 1048 *modeChangeFlag = 1;
1047 } 1049 }
1048 createDiveSettings(); 1050 createDiveSettings();
1051
1052 disableTimer();
1049 1053
1050 if(pStateReal->warnings.cnsHigh) 1054 if(pStateReal->warnings.cnsHigh)
1051 { 1055 {
1052 if(pStateReal->lifeData.cns >= 130) 1056 if(pStateReal->lifeData.cns >= 130)
1053 dataOut.setAccidentFlag += ACCIDENT_CNSLVL2; 1057 dataOut.setAccidentFlag += ACCIDENT_CNSLVL2;