Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Skyward Boardcore
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Avionics
Software Development
Skyward Boardcore
Commits
1c4f1de8
Commit
1c4f1de8
authored
11 months ago
by
Niccolò Betto
Browse files
Options
Downloads
Patches
Plain Diff
[Logger] Add missing log types and order alphabetically
parent
0680e395
No related branches found
No related tags found
1 merge request
!290
[Logger] Add missing log types and order alphabetically
Pipeline
#9347
passed
11 months ago
Stage: lint
Stage: build
Stage: test
Stage: documentation
Stage: deploy
Changes
2
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/shared/logger/LogTypes.h
+58
-44
58 additions, 44 deletions
src/shared/logger/LogTypes.h
src/shared/sensors/SensorData.h
+19
-0
19 additions, 0 deletions
src/shared/sensors/SensorData.h
with
77 additions
and
44 deletions
src/shared/logger/LogTypes.h
+
58
−
44
View file @
1c4f1de8
...
@@ -56,6 +56,7 @@
...
@@ -56,6 +56,7 @@
#include
<sensors/MBLoadCell/MBLoadCellData.h>
#include
<sensors/MBLoadCell/MBLoadCellData.h>
#include
<sensors/MPU9250/MPU9250Data.h>
#include
<sensors/MPU9250/MPU9250Data.h>
#include
<sensors/MS5803/MS5803Data.h>
#include
<sensors/MS5803/MS5803Data.h>
#include
<sensors/RotatedIMU/IMUData.h>
#include
<sensors/SensorData.h>
#include
<sensors/SensorData.h>
#include
<sensors/UBXGPS/UBXGPSData.h>
#include
<sensors/UBXGPS/UBXGPSData.h>
#include
<sensors/VN100/VN100Data.h>
#include
<sensors/VN100/VN100Data.h>
...
@@ -90,70 +91,83 @@ namespace LogTypes
...
@@ -90,70 +91,83 @@ namespace LogTypes
void
registerTypes
(
Deserializer
&
ds
)
void
registerTypes
(
Deserializer
&
ds
)
{
{
ds
.
registerType
<
StepperData
>
();
ds
.
registerType
<
AccelerometerData
>
();
ds
.
registerType
<
ServoData
>
();
ds
.
registerType
<
ADAState
>
();
ds
.
registerType
<
ADAState
>
();
ds
.
registerType
<
NASState
>
();
ds
.
registerType
<
ADCData
>
();
ds
.
registerType
<
CpuMeterData
>
();
ds
.
registerType
<
StackData
>
();
ds
.
registerType
<
LoggingString
>
();
ds
.
registerType
<
InternalADCData
>
();
ds
.
registerType
<
EventData
>
();
ds
.
registerType
<
LoggerStats
>
();
ds
.
registerType
<
MavlinkStatus
>
();
ds
.
registerType
<
Xbee
::
XbeeStatus
>
();
ds
.
registerType
<
TaskStatsResult
>
();
ds
.
registerType
<
ADS1118Data
>
();
ds
.
registerType
<
ADS1118Data
>
();
ds
.
registerType
<
ADS131M04Data
>
();
ds
.
registerType
<
ADS131M04Data
>
();
ds
.
registerType
<
ADS131M08Data
>
();
ds
.
registerType
<
AnalogLoadCellData
>
();
ds
.
registerType
<
BatteryVoltageSensorData
>
();
ds
.
registerType
<
BME280Data
>
();
ds
.
registerType
<
BME280Data
>
();
ds
.
registerType
<
BMP280Data
>
();
ds
.
registerType
<
BMP280Data
>
();
ds
.
registerType
<
BMX160Data
>
();
ds
.
registerType
<
BMX160Data
>
();
ds
.
registerType
<
BMX160Temperature
>
();
ds
.
registerType
<
BMX160FifoStats
>
();
ds
.
registerType
<
BMX160FifoStats
>
();
ds
.
registerType
<
BMX160Temperature
>
();
ds
.
registerType
<
BMX160WithCorrectionData
>
();
ds
.
registerType
<
BMX160WithCorrectionData
>
();
ds
.
registerType
<
CanBatteryVoltageSensorData
>
();
ds
.
registerType
<
CanCurrentData
>
();
ds
.
registerType
<
CanDeviceStatus
>
();
ds
.
registerType
<
CanPitotData
>
();
ds
.
registerType
<
CanPressureData
>
();
ds
.
registerType
<
CanServoCommand
>
();
ds
.
registerType
<
CanServoData
>
();
ds
.
registerType
<
CanServoFeedback
>
();
ds
.
registerType
<
CanTemperatureData
>
();
ds
.
registerType
<
CanVoltageData
>
();
ds
.
registerType
<
CpuMeterData
>
();
ds
.
registerType
<
CurrentData
>
();
ds
.
registerType
<
CurrentData
>
();
ds
.
registerType
<
DeviceStatus
>
();
ds
.
registerType
<
EventData
>
();
ds
.
registerType
<
GPSData
>
();
ds
.
registerType
<
GyroscopeData
>
();
ds
.
registerType
<
H3LIS331DLData
>
();
ds
.
registerType
<
HSCMAND015PAData
>
();
ds
.
registerType
<
HSCMRNN015PAData
>
();
ds
.
registerType
<
HSCMRNN030PAData
>
();
ds
.
registerType
<
HSCMRNN160KAData
>
();
ds
.
registerType
<
HumidityData
>
();
ds
.
registerType
<
HX711Data
>
();
ds
.
registerType
<
HX711Data
>
();
ds
.
registerType
<
IMUData
>
();
ds
.
registerType
<
InternalADCData
>
();
ds
.
registerType
<
L3GD20Data
>
();
ds
.
registerType
<
L3GD20Data
>
();
ds
.
registerType
<
LIS2MDLData
>
();
ds
.
registerType
<
LIS3DSHData
>
();
ds
.
registerType
<
LIS3DSHData
>
();
ds
.
registerType
<
LIS3MDLData
>
();
ds
.
registerType
<
LIS3MDLData
>
();
ds
.
registerType
<
MBLoadCellData
>
();
ds
.
registerType
<
LoadCellData
>
();
ds
.
registerType
<
MPU9250Data
>
();
ds
.
registerType
<
LoggerStats
>
();
ds
.
registerType
<
MS5803Data
>
();
ds
.
registerType
<
LoggingString
>
();
ds
.
registerType
<
TemperatureData
>
();
ds
.
registerType
<
UBXGPSData
>
();
ds
.
registerType
<
LIS2MDLData
>
();
ds
.
registerType
<
H3LIS331DLData
>
();
ds
.
registerType
<
LPS22DFData
>
();
ds
.
registerType
<
LPS22DFData
>
();
ds
.
registerType
<
LSM6DSRXData
>
();
ds
.
registerType
<
LPS28DFWData
>
();
ds
.
registerType
<
LPS28DFWData
>
();
ds
.
registerType
<
ADS131M08Data
>
();
ds
.
registerType
<
LSM6DSRXData
>
();
ds
.
registerType
<
VN100Data
>
();
ds
.
registerType
<
MagnetometerData
>
();
ds
.
registerType
<
AnalogLoadCellData
>
();
ds
.
registerType
<
MavlinkStatus
>
();
ds
.
registerType
<
BatteryVoltageSensorData
>
();
ds
.
registerType
<
MBLoadCellData
>
();
ds
.
registerType
<
CurrentData
>
();
ds
.
registerType
<
MPU9250Data
>
();
ds
.
registerType
<
HSCMAND015PAData
>
();
ds
.
registerType
<
HSCMRNN030PAData
>
();
ds
.
registerType
<
HSCMRNN160KAData
>
();
ds
.
registerType
<
SSCDANN030PAAData
>
();
ds
.
registerType
<
SSCDRRN015PDAData
>
();
ds
.
registerType
<
MPXH6115AData
>
();
ds
.
registerType
<
MPXH6115AData
>
();
ds
.
registerType
<
MPXH6400AData
>
();
ds
.
registerType
<
MPXH6400AData
>
();
ds
.
registerType
<
MPXHZ6130AData
>
();
ds
.
registerType
<
MPXHZ6130AData
>
();
ds
.
registerType
<
HSCMRNN015PA
Data
>
();
ds
.
registerType
<
MS5803
Data
>
();
ds
.
registerType
<
SSCMRNN030PAData
>
();
ds
.
registerType
<
NASState
>
();
ds
.
registerType
<
PitotData
>
();
ds
.
registerType
<
PitotData
>
();
ds
.
registerType
<
DeviceStatus
>
();
ds
.
registerType
<
PressureData
>
();
ds
.
registerType
<
QuaternionData
>
();
ds
.
registerType
<
ServoCommand
>
();
ds
.
registerType
<
ServoCommand
>
();
ds
.
registerType
<
ServoData
>
();
ds
.
registerType
<
ServoFeedback
>
();
ds
.
registerType
<
ServoFeedback
>
();
ds
.
registerType
<
CanPitotData
>
();
ds
.
registerType
<
SSCDANN030PAAData
>
();
ds
.
registerType
<
CanPressureData
>
();
ds
.
registerType
<
SSCDRRN015PDAData
>
();
ds
.
registerType
<
CanTemperatureData
>
();
ds
.
registerType
<
SSCMRNN030PAData
>
();
ds
.
registerType
<
CanCurrentData
>
();
ds
.
registerType
<
StackData
>
();
ds
.
registerType
<
CanServoData
>
();
ds
.
registerType
<
StepperData
>
();
ds
.
registerType
<
CanBatteryVoltageSensorData
>
();
ds
.
registerType
<
TaskStatsResult
>
();
ds
.
registerType
<
CanVoltageData
>
();
ds
.
registerType
<
TemperatureData
>
();
ds
.
registerType
<
CanDeviceStatus
>
();
ds
.
registerType
<
TimestampData
>
();
ds
.
registerType
<
CanServoCommand
>
();
ds
.
registerType
<
UBXGPSData
>
();
ds
.
registerType
<
CanServoFeedback
>
();
ds
.
registerType
<
VN100Data
>
();
ds
.
registerType
<
VoltageData
>
();
ds
.
registerType
<
Xbee
::
XbeeStatus
>
();
}
}
}
// namespace LogTypes
}
// namespace LogTypes
...
...
This diff is collapsed.
Click to expand it.
src/shared/sensors/SensorData.h
+
19
−
0
View file @
1c4f1de8
...
@@ -53,6 +53,10 @@ enum SensorErrors : uint8_t
...
@@ -53,6 +53,10 @@ enum SensorErrors : uint8_t
struct
TimestampData
struct
TimestampData
{
{
uint64_t
timestamp
;
uint64_t
timestamp
;
static
std
::
string
header
()
{
return
"timestamp
\n
"
;
}
void
print
(
std
::
ostream
&
os
)
const
{
os
<<
timestamp
<<
"
\n
"
;
}
};
};
struct
LoadCellData
struct
LoadCellData
...
@@ -101,6 +105,13 @@ struct HumidityData
...
@@ -101,6 +105,13 @@ struct HumidityData
{
{
uint64_t
humidityTimestamp
=
0
;
uint64_t
humidityTimestamp
=
0
;
float
humidity
=
0
;
float
humidity
=
0
;
static
std
::
string
header
()
{
return
"timestamp,humidity
\n
"
;
}
void
print
(
std
::
ostream
&
os
)
const
{
os
<<
humidityTimestamp
<<
","
<<
humidity
<<
"
\n
"
;
}
};
};
/**
/**
...
@@ -314,6 +325,14 @@ struct ADCData
...
@@ -314,6 +325,14 @@ struct ADCData
uint64_t
voltageTimestamp
=
0
;
uint64_t
voltageTimestamp
=
0
;
uint8_t
channelId
=
0
;
uint8_t
channelId
=
0
;
float
voltage
=
0
;
float
voltage
=
0
;
static
std
::
string
header
()
{
return
"timestamp,channelId,voltage
\n
"
;
}
void
print
(
std
::
ostream
&
os
)
const
{
os
<<
voltageTimestamp
<<
","
<<
(
int
)
channelId
<<
","
<<
voltage
<<
"
\n
"
;
}
};
};
/**
/**
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment