Mercurial > public > ostc4

diff Discovery/Src/check_warning.c @ 273:5fe136480a47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged in janlmulder/ostc4/write-from-sim (pull request #20) Cleanup and debug capabilty to write logbook from simulator
author heinrichsweikamp <bitbucket@heinrichsweikamp.com>
date Sun, 28 Apr 2019 07:05:23 +0000
parents 74a8296a2318
children 58200d756365
line wrap: on
line diff
--- a/Discovery/Src/check_warning.c	Fri Apr 26 10:36:11 2019 +0000
+++ b/Discovery/Src/check_warning.c	Sun Apr 28 07:05:23 2019 +0000
@@ -38,37 +38,30 @@
 #include "decom.h"
 #include "tCCR.h"
 
-/* Private variables wit access ----------------------------------------------*/
-uint8_t betterGasId = 0;
-uint8_t betterSetpointId = 0;
-int8_t fallback = 0;
+/* Private variables with access ----------------------------------------------*/
+static uint8_t betterGasId = 0;
+static uint8_t betterSetpointId = 0;
+static int8_t fallback = 0;
 
 /* Private function prototypes -----------------------------------------------*/
-int8_t check_fallback(SDiveState * pDiveState);
-int8_t check_ppO2(SDiveState * pDiveState);
-int8_t check_O2_sensors(SDiveState * pDiveState);
-int8_t check_CNS(SDiveState * pDiveState);
-int8_t check_Deco(SDiveState * pDiveState);
-int8_t check_AscentRate(SDiveState * pDiveState);
-int8_t check_aGF(SDiveState * pDiveState);
-int8_t check_BetterGas(SDiveState * pDiveState);
-int8_t check_BetterSetpoint(SDiveState * pDiveState);
-int8_t check_Battery(SDiveState * pDiveState);
+static int8_t check_fallback(SDiveState * pDiveState);
+static int8_t check_ppO2(SDiveState * pDiveState);
+static int8_t check_O2_sensors(SDiveState * pDiveState);
+static int8_t check_CNS(SDiveState * pDiveState);
+static int8_t check_Deco(SDiveState * pDiveState);
+static int8_t check_AscentRate(SDiveState * pDiveState);
+static int8_t check_aGF(SDiveState * pDiveState);
+static int8_t check_BetterGas(SDiveState * pDiveState);
+static int8_t check_BetterSetpoint(SDiveState * pDiveState);
+static int8_t check_Battery(SDiveState * pDiveState);
 
-int8_t check_helper_same_oxygen_and_helium_content(SGasLine * gas1, SGasLine * gas2);
+static int8_t check_helper_same_oxygen_and_helium_content(SGasLine * gas1, SGasLine * gas2);
 
 /* Exported functions --------------------------------------------------------*/
 
 void check_warning(void)
 {
-	SDiveState * pDiveState;
-
-	if(stateUsed == stateRealGetPointer())
-		pDiveState = stateRealGetPointerWrite();
-	else
-		pDiveState = stateSimGetPointerWrite();
-
-  check_warning2(pDiveState);
+  check_warning2(stateUsedWrite);
 }
 
 
@@ -123,7 +116,7 @@
 
 
 /* Private functions ---------------------------------------------------------*/
-int8_t check_fallback(SDiveState * pDiveState)
+static int8_t check_fallback(SDiveState * pDiveState)
 {
 	if(fallback && ((pDiveState->mode != MODE_DIVE) || (pDiveState->diveSettings.diveMode != DIVEMODE_CCR)))
 		fallback = 0;
@@ -133,7 +126,7 @@
 }
 
 
-int8_t check_ppO2(SDiveState * pDiveState)
+static int8_t check_ppO2(SDiveState * pDiveState)
 {
 	if(pDiveState->mode != MODE_DIVE)
 	{
@@ -171,7 +164,7 @@
 }
 
 
-int8_t check_O2_sensors(SDiveState * pDiveState)
+static int8_t check_O2_sensors(SDiveState * pDiveState)
 {
 	pDiveState->warnings.sensorLinkLost = 0;
 	pDiveState->warnings.sensorOutOfBounds[0] = 0;
@@ -193,7 +186,7 @@
 }
 
 
-int8_t check_BetterGas(SDiveState * pDiveState)
+static int8_t check_BetterGas(SDiveState * pDiveState)
 {
 	if(stateUsed->mode != MODE_DIVE)
 	{
@@ -276,7 +269,7 @@
 
 /* check for better travel!!! setpoint hw 151210
  */ 
-int8_t check_BetterSetpoint(SDiveState * pDiveState)
+static int8_t check_BetterSetpoint(SDiveState * pDiveState)
 {
 	pDiveState->warnings.betterSetpoint = 0;
 	betterSetpointId = 0;
@@ -315,7 +308,7 @@
 
 /* hw 151030
  */
-int8_t check_helper_same_oxygen_and_helium_content(SGasLine * gas1, SGasLine * gas2) 
+static int8_t check_helper_same_oxygen_and_helium_content(SGasLine * gas1, SGasLine * gas2)
 {
 	if(gas1->helium_percentage != gas2->helium_percentage)
 		return 0;
@@ -327,7 +320,7 @@
 }
 
 
-int8_t check_CNS(SDiveState * pDiveState)
+static int8_t check_CNS(SDiveState * pDiveState)
 {
 	if(stateUsed->mode != MODE_DIVE)
 	{
@@ -343,7 +336,7 @@
 }
 
 
-int8_t check_Battery(SDiveState * pDiveState)
+static int8_t check_Battery(SDiveState * pDiveState)
 {
 	if(pDiveState->lifeData.battery_charge < 10)
 		pDiveState->warnings.lowBattery = 1;
@@ -354,7 +347,7 @@
 }
 
 
-int8_t check_Deco(SDiveState * pDiveState)
+static int8_t check_Deco(SDiveState * pDiveState)
 {
 	if(stateUsed->mode != MODE_DIVE)
 	{
@@ -376,7 +369,7 @@
 }
 
 
-int8_t check_AscentRate(SDiveState * pDiveState)
+static int8_t check_AscentRate(SDiveState * pDiveState)
 {
 	if(stateUsed->mode != MODE_DIVE)
 	{
@@ -396,7 +389,7 @@
 }
 
 
-int8_t check_aGF(SDiveState * pDiveState)
+static int8_t check_aGF(SDiveState * pDiveState)
 {
 	if(stateUsed->mode != MODE_DIVE)
 	{