Skip to content
Snippets Groups Projects
Commit 6eeedc33 authored by Zoe Pfister's avatar Zoe Pfister :speech_balloon:
Browse files

minor changes to naming of string sent to server, minor name change, comment

parent 2009a643
No related branches found
No related tags found
1 merge request!39Merge Develop into Main
Pipeline #101705 passed
......@@ -357,7 +357,7 @@ String dataPackageToServerReadableString(ClientDataPackage clientDataPackage, co
serverDoc["protocolAddress"] = clientDataPackage.getMeasurementData().getChannel();
serverDoc["i2cAddress"] = clientDataPackage.getMeasurementData().getI2CAddress();
serverDoc["hardwareName"] = clientDataPackage.getSensorInformation().getHardwareNameString();
serverDoc["error"] = clientDataPackage.getMeasurementData().getErrorTypeString();
serverDoc["sensorError"] = clientDataPackage.getMeasurementData().getErrorTypeString();
// each value is a element in the readigs array
JsonArray readings = serverDoc.createNestedArray("readings");
JsonObject reading = readings.createNestedObject();
......
......@@ -5,7 +5,7 @@
#include "ErrorTypes.h"
namespace ErrorTypes {
// INFO: If you add a new error type, add it here and to the documentation at https://git.uibk.ac.at/informatik/qe/forte/sensor-system/-/wikis/Error-Types as well
std::string errorTypeToString(ErrorType errorType) {
switch (errorType) {
case ErrorType::SENSOR_NOT_FOUND:
......
......@@ -4,36 +4,36 @@
#include "HardwareNames.h"
namespace HardwareNames {
std::string hardwareNameToString(HardwareName hardwareName) {
// switch
switch (hardwareName) {
case HardwareName::RS485:
return "RS485";
case HardwareName::INA219:
return "INA219";
case HardwareName::SCD30:
return "SCD30";
case HardwareName::RAIN_GAUGE:
return "RAIN_GAUGE";
case HardwareName::SOIL_MOISTURE_SENSOR:
return "SOIL_MOISTURE_SENSOR";
case HardwareName::SOIL_TEMPERATURE_SENSOR:
return "SOIL_TEMPERATURE_SENSOR";
case HardwareName::SOLAR_RADIATION_SENSOR:
return "SOLAR_RADIATION_SENSOR";
case HardwareName::SHT85:
return "SHT85";
case HardwareName::DRS26:
return "DRS26";
case HardwareName::DR26:
return "DR26";
case HardwareName::MOCK:
return "MOCK";
case HardwareName::NONE:
return "NONE";
case HardwareName::LC709203:
break;
}
return "UNKNOWN HARDWARE NAME";
}
}
\ No newline at end of file
std::string hardwareNameToString(HardwareName hardwareName) {
// switch
switch (hardwareName) {
case HardwareName::RS485:
return "RS485";
case HardwareName::INA219:
return "INA219";
case HardwareName::SCD30:
return "SCD30";
case HardwareName::RAIN_GAUGE:
return "RAIN_GAUGE";
case HardwareName::SOIL_MOISTURE_SENSOR:
return "SOIL_MOISTURE_SENSOR";
case HardwareName::SOIL_TEMPERATURE_SENSOR:
return "SOIL_TEMPERATURE_SENSOR";
case HardwareName::SOLAR_RADIATION_SENSOR:
return "SOLAR_RADIATION_SENSOR";
case HardwareName::SHT85:
return "SHT85";
case HardwareName::DRS26:
return "DRS26";
case HardwareName::DR26:
return "DR26";
case HardwareName::MOCK:
return "MOCK";
case HardwareName::NONE:
return "NONE";
case HardwareName::LC709203:
break;
}
return "UNKNOWN_HARDWARE_NAME";
}
} // namespace HardwareNames
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment