Skip to content

Commit

Permalink
update structs
Browse files Browse the repository at this point in the history
  • Loading branch information
MAnn223 committed Jul 19, 2024
1 parent ddfc10c commit a4cdb2b
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 11 deletions.
13 changes: 13 additions & 0 deletions src/ensembleTypes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,19 @@ typedef struct EnsembleHeader_
unsigned int elapsedTime_ds : 20;
}EnsembleHeader_t;

/**
* @brief Ensemble 01 - Temperature
*
*/
typedef struct Ensemble01_data_
{
/**
* @brief Temp Sensor Temp
*
*/
uint16_t rawTemp;
}Ensemble01_data_t;

/**
* @brief Ensemble 07 - Battery
*
Expand Down
22 changes: 11 additions & 11 deletions src/ensembles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,16 @@ static void SS_fwVerFunc(DeploymentSchedule_t* pDeployment);
//define ensemble structs
typedef struct Ensemble10_eventData_
{
double temperature;
int32_t water;
int32_t acc[3];
int32_t ang[3];
int32_t mag[3];
int16_t temperature;
int16_t water;
int16_t acc[3];
int16_t ang[3];
int16_t mag[3];
int32_t location[2];
uint8_t hasGPS;
uint32_t accumulateCount;
}Ensemble10_eventData_t;

typedef struct Ensemble07_eventData_
{
float battVoltage;
uint32_t accumulateCount;
}Ensemble07_eventData_t;

typedef struct Ensemble08_eventData_
{
double temperature;
Expand All @@ -57,6 +51,12 @@ typedef struct Ensemble08_eventData_
uint32_t accumulateCount;
}Ensemble08_eventData_t;

typedef struct Ensemble07_eventData_
{
uint16_t battVoltage;
uint32_t accumulateCount;
}Ensemble07_eventData_t;

typedef struct Ensemble01_eventData_
{
double temperature;
Expand Down

0 comments on commit a4cdb2b

Please sign in to comment.