Mercurial > public > ostc4

comparison Discovery/Src/base.c @ 149:e1d66bc78f9a FlipDisplay

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Eliminate warnings
author Ideenmodellierer
date Sat, 02 Mar 2019 17:42:06 +0100
parents cc9c18075e00
children bc7795161549
comparison
equal deleted inserted replaced
148:ee744c7160ce 149:e1d66bc78f9a
1628 { 1628 {
1629 CALC_VPM, 1629 CALC_VPM,
1630 CALC_VPM_FUTURE, 1630 CALC_VPM_FUTURE,
1631 CALC_BUEHLMANN, 1631 CALC_BUEHLMANN,
1632 CALC_BUEHLMANN_FUTURE, 1632 CALC_BUEHLMANN_FUTURE,
1633 CALC_INVALID
1633 } CALC_WHAT; 1634 } CALC_WHAT;
1634 1635
1635 static int what = -1; 1636 static CALC_WHAT what = CALC_INVALID;
1636 int counter = 0; 1637 int counter = 0;
1637 if((stateUsed->mode != MODE_DIVE) || (stateUsed->diveSettings.diveMode == DIVEMODE_Apnea) || (decoLock != DECO_CALC_ready )) 1638 if((stateUsed->mode != MODE_DIVE) || (stateUsed->diveSettings.diveMode == DIVEMODE_Apnea) || (decoLock != DECO_CALC_ready ))
1638 return; 1639 return;
1639 1640
1640 decoLock = DECO_CALC_running; 1641 decoLock = DECO_CALC_running;
1675 1676
1676 decom_CreateGasChangeList(&stateDeco.diveSettings, &stateDeco.lifeData); 1677 decom_CreateGasChangeList(&stateDeco.diveSettings, &stateDeco.lifeData);
1677 1678
1678 switch(what) 1679 switch(what)
1679 { 1680 {
1680 case CALC_VPM: 1681 case CALC_VPM:
1681 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistVPM, DECOSTOPS); 1682 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistVPM, DECOSTOPS);
1682 decoLock = DECO_CALC_FINSHED_vpm; 1683 decoLock = DECO_CALC_FINSHED_vpm;
1683 return; 1684 return;
1684 case CALC_VPM_FUTURE: 1685 case CALC_VPM_FUTURE:
1685 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); 1686 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData);
1686 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistFutureVPM, FUTURESTOPS); 1687 vpm_calc(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.vpm,&stateDeco.decolistFutureVPM, FUTURESTOPS);
1687 decoLock = DECO_CALC_FINSHED_Futurevpm; 1688 decoLock = DECO_CALC_FINSHED_Futurevpm;
1688 return; 1689 return;
1689 case CALC_BUEHLMANN: 1690 case CALC_BUEHLMANN:
1690 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1691 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1691 buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1692 buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1692 buehlmann_relative_gradient_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1693 buehlmann_relative_gradient_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1693 decoLock = DECO_CALC_FINSHED_Buehlmann; 1694 decoLock = DECO_CALC_FINSHED_Buehlmann;
1694 return; 1695 return;
1695 case CALC_BUEHLMANN_FUTURE: 1696 case CALC_BUEHLMANN_FUTURE:
1696 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData); 1697 decom_tissues_exposure(stateDeco.diveSettings.future_TTS_minutes * 60,&stateDeco.lifeData);
1697 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann); 1698 buehlmann_calc_deco(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistFutureBuehlmann);
1698 //buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann); 1699 //buehlmann_ceiling_calculator(&stateDeco.lifeData,&stateDeco.diveSettings,&stateDeco.decolistBuehlmann);
1699 decoLock = DECO_CALC_FINSHED_FutureBuehlmann; 1700 decoLock = DECO_CALC_FINSHED_FutureBuehlmann;
1700 return; 1701 return;
1702 default: break;
1701 } 1703 }
1702 counter++; 1704 counter++;
1703 } 1705 }
1704 1706
1705 void resetToFirmwareUpdate(void) 1707 void resetToFirmwareUpdate(void)