From b72a8d9e65e303e1497c60d9afdf1956d15fc5f7 Mon Sep 17 00:00:00 2001 From: Evgeny Zinoviev Date: Sun, 16 May 2021 17:06:27 +0300 Subject: turn some bools in GS response into enums --- CMakeLists.txt | 2 +- src/p18/defines.cc | 16 ++++++++++++++++ src/p18/response.cc | 12 ++++++------ src/p18/response.h | 22 +++++++++++----------- src/p18/types.h | 12 ++++++++++++ 5 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e80f861..1966711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.0) set(CMAKE_CXX_STANDARD 17) add_compile_options(-Wno-psabi) -project(inverter-tools VERSION 1.0.3) +project(inverter-tools VERSION 1.1.0) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_INSTALL_PREFIX /usr/local/bin) diff --git a/src/p18/defines.cc b/src/p18/defines.cc index 4207bde..999f81a 100644 --- a/src/p18/defines.cc +++ b/src/p18/defines.cc @@ -243,4 +243,20 @@ ENUM_STR(ParallelConnectionStatus) { ENUM_STR_DEFAULT; } +ENUM_STR(LoadConnectionStatus) { + switch (val) { + case LoadConnectionStatus::Disconnected: return os << "Disconnected"; + case LoadConnectionStatus::Connected: return os << "Connected"; + } + ENUM_STR_DEFAULT; +} + +ENUM_STR(ConfigurationStatus) { + switch (val) { + case ConfigurationStatus::Default: return os << "Default"; + case ConfigurationStatus::Changed: return os << "Changed"; + } + ENUM_STR_DEFAULT; +} + } \ No newline at end of file diff --git a/src/p18/response.cc b/src/p18/response.cc index 742ce9d..6faf5b7 100644 --- a/src/p18/response.cc +++ b/src/p18/response.cc @@ -372,10 +372,10 @@ void GeneralStatus::unpack() { pv2_input_power = stou(list[17]); pv1_input_voltage = stou(list[18]); pv2_input_voltage = stou(list[19]); - settings_values_changed = list[20] == "1"; + configuration_status = static_cast(stou(list[20])); mppt1_charger_status = static_cast(stou(list[21])); mppt2_charger_status = static_cast(stou(list[22])); - load_connected = list[23] == "1"; + load_connected = static_cast(stou(list[23])); battery_power_direction = static_cast(stou(list[24])); dc_ac_power_direction = static_cast(stou(list[25])); line_power_direction = static_cast(stou(list[26])); @@ -404,10 +404,10 @@ formattable_ptr GeneralStatus::format(formatter::Format format) { LINE("pv2_input_power", "PV2 input power", pv2_input_power, Unit::Wh), LINE("pv1_input_voltage", "PV1 input voltage", pv1_input_voltage / 10.0, Unit::V), LINE("pv2_input_voltage", "PV2 input voltage", pv2_input_voltage / 10.0, Unit::V), - LINE("settings_values_changed", "Configuration state", std::string(settings_values_changed ? "Default" : "Custom")), + LINE("configuration_status", "Configuration state", configuration_status), LINE("mppt1_charger_status", "MPPT1 charger status", mppt1_charger_status), LINE("mppt2_charger_status", "MPPT2 charger status", mppt2_charger_status), - LINE("load_connected", "Load connection", std::string(load_connected ? "Connected" : "Disconnected")), + LINE("load_connected", "Load connection", load_connected), LINE("battery_power_direction", "Battery power direction", battery_power_direction), LINE("dc_ac_power_direction", "DC/AC power direction", dc_ac_power_direction), LINE("line_power_direction", "LINE power direction", line_power_direction), @@ -714,7 +714,7 @@ void ParallelGeneralStatus::unpack() { pv2_input_voltage = stou(list[21]); mppt1_charger_status = static_cast(stou(list[22])); mppt2_charger_status = static_cast(stou(list[23])); - load_connected = stou(list[24]); + load_connected = static_cast(stou(list[24])); battery_power_direction = static_cast(stou(list[25])); dc_ac_power_direction = static_cast(stou(list[26])); line_power_direction = static_cast(stou(list[27])); @@ -745,7 +745,7 @@ formattable_ptr ParallelGeneralStatus::format(formatter::Format format) { LINE("pv2_input_voltage", "PV2 Input voltage", pv2_input_voltage / 10.0, Unit::V), LINE("mppt1_charger_status", "MPPT1 charger status", mppt1_charger_status), LINE("mppt2_charger_status", "MPPT2 charger status", mppt2_charger_status), - LINE("load_connected", "Load connection", std::string(load_connected ? "Connected" : "Disconnected")), + LINE("load_connected", "Load connection", load_connected), LINE("battery_power_direction", "Battery power direction", battery_power_direction), LINE("dc_ac_power_direction", "DC/AC power direction", dc_ac_power_direction), LINE("line_power_direction", "Line power direction", line_power_direction), diff --git a/src/p18/response.h b/src/p18/response.h index e10b72f..be6eece 100644 --- a/src/p18/response.h +++ b/src/p18/response.h @@ -43,7 +43,9 @@ typedef std::variant< p18::OutputModelSetting, p18::ParallelConnectionStatus, p18::SolarPowerPriority, - p18::WorkingMode + p18::WorkingMode, + p18::LoadConnectionStatus, + p18::ConfigurationStatus > Variant; class VariantHolder { @@ -72,6 +74,8 @@ public: VariantHolder(p18::ParallelConnectionStatus v) : v_(v) {} VariantHolder(p18::SolarPowerPriority v) : v_(v) {} VariantHolder(p18::WorkingMode v) : v_(v) {} + VariantHolder(p18::LoadConnectionStatus v) : v_(v) {} + VariantHolder(p18::ConfigurationStatus v) : v_(v) {} friend std::ostream &operator<<(std::ostream &os, VariantHolder const& ref) { std::visit([&os](const auto& elem) { @@ -96,7 +100,9 @@ public: std::holds_alternative(v_) || std::holds_alternative(v_) || std::holds_alternative(v_) || - std::holds_alternative(v_); + std::holds_alternative(v_) || + std::holds_alternative(v_) || + std::holds_alternative(v_); std::visit([&j, &isEnum](const auto& elem) { if (isEnum) @@ -302,14 +308,10 @@ public: unsigned pv2_input_power; /* unit: W */ unsigned pv1_input_voltage; /* unit: 0.1V */ unsigned pv2_input_voltage; /* unit: 0.1V */ - bool settings_values_changed; /* inverter returns: - 0: nothing changed - 1: something changed */ + p18::ConfigurationStatus configuration_status; p18::MPPTChargerStatus mppt1_charger_status; p18::MPPTChargerStatus mppt2_charger_status; - bool load_connected; /* inverter returns: - 0: disconnected - 1: connected */ + p18::LoadConnectionStatus load_connected; p18::BatteryPowerDirection battery_power_direction; p18::DC_AC_PowerDirection dc_ac_power_direction; p18::LinePowerDirection line_power_direction; @@ -458,9 +460,7 @@ public: unsigned pv2_input_voltage; /* unit: 0.1V */ p18::MPPTChargerStatus mppt1_charger_status; p18::MPPTChargerStatus mppt2_charger_status; - bool load_connected; /* inverter returns: - 0: disconnected - 1: connected */ + p18::LoadConnectionStatus load_connected; p18::BatteryPowerDirection battery_power_direction; p18::DC_AC_PowerDirection dc_ac_power_direction; p18::LinePowerDirection line_power_direction; diff --git a/src/p18/types.h b/src/p18/types.h index 69e95e5..bcabd7c 100644 --- a/src/p18/types.h +++ b/src/p18/types.h @@ -151,6 +151,18 @@ enum class ParallelConnectionStatus { }; ENUM_STR(ParallelConnectionStatus); +enum class LoadConnectionStatus { + Disconnected = 0, + Connected = 1, +}; +ENUM_STR(LoadConnectionStatus); + +enum class ConfigurationStatus { + Default = 0, + Changed = 1, +}; +ENUM_STR(ConfigurationStatus); + struct Flag { std::string flag; char letter; -- cgit v1.2.3