🔥 Remove json from sensor implementations
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <list>
|
||||
#include <SPI.h>
|
||||
#include <Wire.h>
|
||||
#include <ArduinoJson.h>
|
||||
#include <utils/math_utils.h>
|
||||
|
||||
#include <Adafruit_BMP085_U.h>
|
||||
@@ -11,29 +9,11 @@
|
||||
|
||||
#include <peripherals/sensor.hpp>
|
||||
|
||||
struct BarometerMsg : public SensorMessageBase {
|
||||
struct BarometerMsg {
|
||||
float pressure {-1};
|
||||
float altitude {-1};
|
||||
float temperature {-1};
|
||||
bool success {false};
|
||||
|
||||
void toJson(JsonVariant v) const override {
|
||||
JsonArray arr = v.to<JsonArray>();
|
||||
arr.add(pressure);
|
||||
arr.add(altitude);
|
||||
arr.add(temperature);
|
||||
arr.add(success);
|
||||
}
|
||||
|
||||
void fromJson(JsonVariantConst v) override {
|
||||
JsonArrayConst arr = v.as<JsonArrayConst>();
|
||||
pressure = arr[0] | -1.0f;
|
||||
altitude = arr[1] | -1.0f;
|
||||
temperature = arr[2] | -1.0f;
|
||||
success = arr[3] | false;
|
||||
}
|
||||
|
||||
friend void toJson(JsonVariant v, BarometerMsg const& a) { a.toJson(v); }
|
||||
};
|
||||
|
||||
class Barometer : public SensorBase<BarometerMsg> {
|
||||
|
||||
Reference in New Issue
Block a user