Mercurial > public > ostc4

comparison Discovery/Inc/logbook.h @ 524:b33a8c1c72e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Minor: Removed duplicated definition of number of available gases
author Ideenmodellierer
date Sun, 13 Sep 2020 20:44:50 +0200
parents 3db9eba89e3c
children ae7f8333c900
comparison
equal deleted inserted replaced
523:0a407cd48912 524:b33a8c1c72e5
27 #ifndef LOGBOOK_H 27 #ifndef LOGBOOK_H
28 #define LOGBOOK_H 28 #define LOGBOOK_H
29 29
30 #include "data_central.h" 30 #include "data_central.h"
31 #include "settings.h" 31 #include "settings.h"
32
33 #define NUM_GAS (5) /* number of selectable gases */
34 32
35 typedef struct 33 typedef struct
36 { 34 {
37 uint8_t setpoint_cbar; 35 uint8_t setpoint_cbar;
38 uint8_t depth_meter; 36 uint8_t depth_meter;
65 uint8_t diveTimeSeconds; 63 uint8_t diveTimeSeconds;
66 uint8_t samplingRate; 64 uint8_t samplingRate;
67 int16_t minTemp; 65 int16_t minTemp;
68 uint16_t surfacePressure_mbar; 66 uint16_t surfacePressure_mbar;
69 uint16_t desaturationTime; 67 uint16_t desaturationTime;
70 SGasListLog gasordil[NUM_GAS]; 68 SGasListLog gasordil[NUM_GASES];
71 uint8_t firmwareVersionLow; 69 uint8_t firmwareVersionLow;
72 uint8_t firmwareVersionHigh; 70 uint8_t firmwareVersionHigh;
73 uint16_t batteryVoltage; 71 uint16_t batteryVoltage;
74 uint16_t cnsAtBeginning; 72 uint16_t cnsAtBeginning;
75 uint8_t gfAtBeginning; 73 uint8_t gfAtBeginning;
76 uint8_t gfAtEnd; 74 uint8_t gfAtEnd;
77 uint16_t personalDiveCount; 75 uint16_t personalDiveCount;
78 SSetpointLog setpoint[NUM_GAS]; 76 SSetpointLog setpoint[NUM_GASES];
79 uint16_t maxCNS; 77 uint16_t maxCNS;
80 uint16_t averageDepth_mbar; 78 uint16_t averageDepth_mbar;
81 uint16_t total_diveTime_seconds; 79 uint16_t total_diveTime_seconds;
82 uint8_t salinity; 80 uint8_t salinity;
83 uint8_t gfLow_or_Vpm_conservatism; 81 uint8_t gfLow_or_Vpm_conservatism;
115 uint8_t diveTimeMinutes[2]; 113 uint8_t diveTimeMinutes[2];
116 uint8_t diveTimeSeconds; 114 uint8_t diveTimeSeconds;
117 uint8_t minTemp[2]; 115 uint8_t minTemp[2];
118 uint8_t surfacePressure_mbar[2]; 116 uint8_t surfacePressure_mbar[2];
119 uint8_t desaturationTime[2]; 117 uint8_t desaturationTime[2];
120 uint8_t gasordil[NUM_GAS*4]; 118 uint8_t gasordil[NUM_GASES*4];
121 uint8_t firmwareVersionLow; 119 uint8_t firmwareVersionLow;
122 uint8_t firmwareVersionHigh; 120 uint8_t firmwareVersionHigh;
123 uint8_t batteryVoltage[2]; 121 uint8_t batteryVoltage[2];
124 uint8_t samplingRate; 122 uint8_t samplingRate;
125 uint8_t cnsAtBeginning[2]; 123 uint8_t cnsAtBeginning[2];