Mercurial > public > ostc4
diff Discovery/Inc/logbook.h @ 461:b3f684cea9c0
Merged in Ideenmodellierer/ostc4/minor_improvments (pull request #41)
Minor improvments
author | heinrichsweikamp <bitbucket@heinrichsweikamp.com> |
---|---|
date | Mon, 30 Mar 2020 13:16:11 +0000 |
parents | 5dd996ed8611 |
children | 73da921869d9 |
line wrap: on
line diff
--- a/Discovery/Inc/logbook.h Sun Mar 01 10:06:45 2020 +0100 +++ b/Discovery/Inc/logbook.h Mon Mar 30 13:16:11 2020 +0000 @@ -30,6 +30,8 @@ #include "data_central.h" #include "settings.h" +#define NUM_GAS (5) /* number of selectable gases */ + typedef struct { uint8_t setpoint_cbar; @@ -65,7 +67,7 @@ int16_t minTemp; uint16_t surfacePressure_mbar; uint16_t desaturationTime; - SGasListLog gasordil[5]; + SGasListLog gasordil[NUM_GAS]; uint8_t firmwareVersionLow; uint8_t firmwareVersionHigh; uint16_t batteryVoltage; @@ -73,7 +75,7 @@ uint8_t gfAtBeginning; uint8_t gfAtEnd; uint16_t personalDiveCount; - SSetpointLog setpoint[5]; + SSetpointLog setpoint[NUM_GAS]; uint16_t maxCNS; uint16_t averageDepth_mbar; uint16_t total_diveTime_seconds; @@ -114,7 +116,7 @@ uint8_t minTemp[2]; uint8_t surfacePressure_mbar[2]; uint8_t desaturationTime[2]; - uint8_t gasordil[5*4]; + uint8_t gasordil[NUM_GAS*4]; uint8_t firmwareVersionLow; uint8_t firmwareVersionHigh; uint8_t batteryVoltage[2]; @@ -209,11 +211,15 @@ uint8_t logbook_getNumberOfHeaders(void); uint8_t logbook_getHeader(uint8_t StepBackwards,SLogbookHeader* pLogbookHeader); -uint16_t logbook_readSampleData(uint8_t StepBackwards, uint16_t length,uint16_t* depth, uint8_t* gasid, int16_t* temperature, uint16_t* ppo2, uint16_t* setpoint, uint16_t* sensor1, uint16_t* sensor2, uint16_t* sensor3, uint16_t* cns, uint8_t* bailout, uint16_t* decostopDepth); +uint16_t logbook_readSampleData(uint8_t StepBackwards, uint16_t length,uint16_t* depth, uint8_t* gasid, int16_t* temperature, uint16_t* ppo2, + uint16_t* setpoint, uint16_t* sensor1, uint16_t* sensor2, uint16_t* sensor3, uint16_t* cns, uint8_t* bailout, + uint16_t* decostopDepth, uint16_t* tank); void logbook_test(void); void logbook_InitAndWrite(const SDiveState* pStateReal); void logbook_recover_brokenlog(uint8_t headerId); uint16_t logbook_lastDive_diveNumber(void); +uint16_t logbook_fillDummySampleBuffer(SLogbookHeader* pHeader); +void logbook_readDummySamples(uint8_t* pTarget, uint16_t length); #endif /* LOGBOOK_H */