Mercurial > public > ostc4

changeset 194:f23b9055436f div-fixes-cleanup-1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleanup: more trivial cleanup (logbook.c/h) Kick out unused code, commented code. Corrected some comments, and most relevant: make things static where we can. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Tue, 19 Mar 2019 11:42:00 +0100
parents 255326edf00b
children 05df3b395615
files Discovery/Inc/logbook.h Discovery/Src/logbook.c
diffstat 2 files changed, 25 insertions(+), 67 deletions(-) [+]
line wrap: on
line diff
--- a/Discovery/Inc/logbook.h	Sat Mar 16 21:52:06 2019 +0100
+++ b/Discovery/Inc/logbook.h	Tue Mar 19 11:42:00 2019 +0100
@@ -200,7 +200,6 @@
 } SManualGas;
 
 void logbook_writeSample(SDiveState state);
-//void logbook_writeSampleFinalBytes(void);
 void logbook_initNewdiveProfile(const SDiveState* pInfo, SSettings* pSettings);
 void logbook_EndDive(void);
 
--- a/Discovery/Src/logbook.c	Sat Mar 16 21:52:06 2019 +0100
+++ b/Discovery/Src/logbook.c	Tue Mar 19 11:42:00 2019 +0100
@@ -78,27 +78,25 @@
 /* Exported variables --------------------------------------------------------*/
 
 /* Private variables ---------------------------------------------------------*/
-uint8_t data_store[10000];
-SLogbookHeader  header;
-SLogbookHeaderOSTC3	headerOSTC3;
-SLogbookHeaderOSTC3compact headerOSTC3compact;
-SSmallHeader smallHeader;
-SDivisor divisor;
-SDivisor divisorBackup;
+static  SLogbookHeader  header;
+static SLogbookHeaderOSTC3	headerOSTC3;
+static SLogbookHeaderOSTC3compact headerOSTC3compact;
+static SSmallHeader smallHeader;
+static SDivisor divisor;
+static SDivisor divisorBackup;
 
 /* Private function prototypes -----------------------------------------------*/
-void clear_divisor(void);
-void logbook_SetAverageDepth(float average_depth_meter);
-void logbook_SetMinTemperature(float min_temperature_celsius);
-void logbook_SetMaxCNS(float max_cns_percentage);
-void logbook_SetCompartmentDesaturation(void);
-void logbook_SetLastStop(float last_stop_depth_bar);
-void logbook_writedata(void * data, int length_byte);
-void logbook_UpdateHeader(void);
+static void clear_divisor(void);
+static void logbook_SetAverageDepth(float average_depth_meter);
+static void logbook_SetMinTemperature(float min_temperature_celsius);
+static void logbook_SetMaxCNS(float max_cns_percentage);
+static void logbook_SetCompartmentDesaturation(void);
+static void logbook_SetLastStop(float last_stop_depth_bar);
+static void logbook_writedata(void * data, int length_byte);
+static void logbook_UpdateHeader(void);
 
 /* Exported functions --------------------------------------------------------*/
 
-/** used by test_vpm.c at the moment */
 void logbook_EndDive(void)
 {
 	ext_flash_close_new_dive_log((uint8_t*) &header);
@@ -143,31 +141,6 @@
 
 /**
   ******************************************************************************
-  * @brief   logbook_getHeaderOSTC3. /
-  * @author  heinrichs weikamp gmbh
-  * @version V0.0.1
-  * @date    26-Nov-2014
-  ******************************************************************************
-	*
-    * @param  StepBackwards : 0 Last lokbook entry, 1 second to last entry, etc.
-     * @param  SSLogbookHeader* pLogbookHeader:  Output found LogbookHeader
-    * @return  uint8_t : 1 = success
-*/
-/*
-SLogbookHeaderOSTC3 * logbook_getHeaderOSTC3(uint8_t StepBackwards)
-{
-    if(!logbook_getHeader(StepBackwards, &header))
-        return 0;
-    else
-		{
-			logbook_build_ostc3header();
-			return &headerOSTC3;
-		}
-}
-*/
-
-/**
-  ******************************************************************************
   * @brief   logbook_getNumberOfHeaders. /
   * @author  heinrichs weikamp gmbh
   * @version V0.0.1
@@ -350,7 +323,7 @@
   ******************************************************************************
 	*
 */
-void clear_divisor(void)
+static void clear_divisor(void)
 {
 	divisor.cns = smallHeader.cnsDivisor - 1;
 	divisor.decoplan = smallHeader.decoplanDivisor - 1;
@@ -373,12 +346,12 @@
     * @param  uint8_t *pos: Output 8 bit array
     * @param  uint16_t var:  16 bit variable
 */
-void addU16(uint8_t *pos, uint16_t var)
+static void addU16(uint8_t *pos, uint16_t var)
 {
        *((uint16_t*)pos) = var;
 }
 
-void addS16(uint8_t *pos, int16_t var)
+static void addS16(uint8_t *pos, int16_t var)
 {
        *((int16_t*)pos) = var;
 }
@@ -655,14 +628,6 @@
 
 }
 
-
-
-uint16_t actual_depth1;
-uint16_t actual_depth2;
-uint16_t actual_length1;
-uint16_t actual_length2;
-uint16_t actual_inum;
-
 /**
   ******************************************************************************
   * @brief   readSample. /  Reads data of one logbook sample
@@ -678,7 +643,7 @@
   * @param  int32_t* cns: output Value
   * @return bytes read / 0 = reading Error
   */
-uint16_t readSample(int32_t* depth, int16_t * gasid, int16_t* setpoint_cbar, int32_t* temperature, int32_t* sensor1, int32_t* sensor2, int32_t* sensor3, int32_t* cns, SManualGas* manualGas, int16_t* bailout, int16_t* decostopDepth)
+static uint16_t readSample(int32_t* depth, int16_t * gasid, int16_t* setpoint_cbar, int32_t* temperature, int32_t* sensor1, int32_t* sensor2, int32_t* sensor3, int32_t* cns, SManualGas* manualGas, int16_t* bailout, int16_t* decostopDepth)
 {
 	int length = 0;
 	_Bool bEvent = 0;
@@ -1254,7 +1219,7 @@
   * @version V0.0.1
   * @date    27-Nov-2014
 *********************************************************************************/
-void logbook_UpdateHeader(void)
+static void logbook_UpdateHeader(void)
 {
 	const SDiveState * pStateReal = stateRealGetPointer();
 
@@ -1354,19 +1319,19 @@
 }
 
 
-void logbook_SetAverageDepth(float average_depth_meter)
+static void logbook_SetAverageDepth(float average_depth_meter)
 {
 		header.averageDepth_mbar = (uint16_t)(average_depth_meter * 100);
 }
 
 
-void logbook_SetMinTemperature(float min_temperature_celsius)
+static void logbook_SetMinTemperature(float min_temperature_celsius)
 {
 		header.minTemp = (int16_t)((min_temperature_celsius * 10.0f) + 0.5f);
 }
 
 
-void logbook_SetMaxCNS(float max_cns_percentage)
+static void logbook_SetMaxCNS(float max_cns_percentage)
 {
 	if(max_cns_percentage < 9999)
 		header.maxCNS = (uint16_t)(max_cns_percentage);
@@ -1375,13 +1340,7 @@
 }
 
 
-void logbook_SetDesaturationTime(void)
-{
-		header.desaturationTime = 48 * 60;
-}
-
-
-void logbook_SetCompartmentDesaturation(void)
+static void logbook_SetCompartmentDesaturation(void)
 {
 	const SDiveState * pStateReal = stateRealGetPointer();
 
@@ -1399,12 +1358,12 @@
 	}
 }
 
-void logbook_SetLastStop(float last_stop_depth_bar)
+static void logbook_SetLastStop(float last_stop_depth_bar)
 {
 	header.lastDecostop_m = (uint8_t)(last_stop_depth_bar / 10.0f);
 }
 
-void logbook_writedata(void * data, int length_byte)
+static void logbook_writedata(void * data, int length_byte)
 {
     ext_flash_write_sample(data, length_byte);
 }