diff --git a/include/Configuration.h b/include/Configuration.h index 2894b3e0..6c62598e 100644 --- a/include/Configuration.h +++ b/include/Configuration.h @@ -128,7 +128,7 @@ struct CONFIG_T { POWERMETER_HTTP_PHASE_CONFIG_T Powermeter_Http_Phase[POWERMETER_MAX_PHASES]; bool PowerLimiter_Enabled; - bool PowerLimiter_SolarPassTroughEnabled; + bool PowerLimiter_SolarPassThroughEnabled; uint8_t PowerLimiter_BatteryDrainStategy; uint32_t PowerLimiter_Interval; bool PowerLimiter_IsInverterBehindPowerMeter; diff --git a/lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp b/lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp index 2b0c8cac..676b265d 100644 --- a/lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp +++ b/lib/VeDirectFrameHandler/VeDirectFrameHandler.cpp @@ -391,7 +391,7 @@ String VeDirectFrameHandler::getPidAsString(uint16_t pid) strPID = "SmartSolar MPPT 100|50"; break; case 0XA058: - strPID = "SmartSolar MPPT 100|35"; + strPID = "SmartSolar MPPT 150|35"; break; case 0XA059: strPID = "SmartSolar MPPT 150|10 rev2"; diff --git a/src/Configuration.cpp b/src/Configuration.cpp index 7b6be171..e18ae12a 100644 --- a/src/Configuration.cpp +++ b/src/Configuration.cpp @@ -140,7 +140,7 @@ bool ConfigurationClass::write() JsonObject powerlimiter = doc.createNestedObject("powerlimiter"); powerlimiter["enabled"] = config.PowerLimiter_Enabled; - powerlimiter["solar_passtrough_enabled"] = config.PowerLimiter_SolarPassTroughEnabled; + powerlimiter["solar_passtrough_enabled"] = config.PowerLimiter_SolarPassThroughEnabled; powerlimiter["battery_drain_strategy"] = config.PowerLimiter_BatteryDrainStategy; powerlimiter["interval"] = config.PowerLimiter_Interval; powerlimiter["is_inverter_behind_powermeter"] = config.PowerLimiter_IsInverterBehindPowerMeter; @@ -329,7 +329,7 @@ bool ConfigurationClass::read() JsonObject powerlimiter = doc["powerlimiter"]; config.PowerLimiter_Enabled = powerlimiter["enabled"] | POWERLIMITER_ENABLED; - config.PowerLimiter_SolarPassTroughEnabled = powerlimiter["solar_passtrough_enabled"] | POWERLIMITER_SOLAR_PASSTROUGH_ENABLED; + config.PowerLimiter_SolarPassThroughEnabled = powerlimiter["solar_passtrough_enabled"] | POWERLIMITER_SOLAR_PASSTROUGH_ENABLED; config.PowerLimiter_BatteryDrainStategy = powerlimiter["battery_drain_strategy"] | POWERLIMITER_BATTERY_DRAIN_STRATEGY; config.PowerLimiter_Interval = POWERLIMITER_INTERVAL; config.PowerLimiter_IsInverterBehindPowerMeter = powerlimiter["is_inverter_behind_powermeter"] | POWERLIMITER_IS_INVERTER_BEHIND_POWER_METER; diff --git a/src/PowerLimiter.cpp b/src/PowerLimiter.cpp index 6cde83dd..af5ef294 100644 --- a/src/PowerLimiter.cpp +++ b/src/PowerLimiter.cpp @@ -154,7 +154,7 @@ bool PowerLimiterClass::canUseDirectSolarPower() { CONFIG_T& config = Configuration.get(); - if (!config.PowerLimiter_SolarPassTroughEnabled + if (!config.PowerLimiter_SolarPassThroughEnabled || !config.Vedirect_Enabled) { return false; } diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp index c1015240..56fb0cf6 100644 --- a/src/WebApi_powerlimiter.cpp +++ b/src/WebApi_powerlimiter.cpp @@ -38,7 +38,7 @@ void WebApiPowerLimiterClass::onStatus(AsyncWebServerRequest* request) const CONFIG_T& config = Configuration.get(); root[F("enabled")] = config.PowerLimiter_Enabled; - root[F("solar_passtrough_enabled")] = config.PowerLimiter_SolarPassTroughEnabled; + root[F("solar_passtrough_enabled")] = config.PowerLimiter_SolarPassThroughEnabled; root[F("battery_drain_strategy")] = config.PowerLimiter_BatteryDrainStategy; root[F("is_inverter_behind_powermeter")] = config.PowerLimiter_IsInverterBehindPowerMeter; root[F("inverter_id")] = config.PowerLimiter_InverterId; @@ -119,7 +119,7 @@ void WebApiPowerLimiterClass::onAdminPost(AsyncWebServerRequest* request) CONFIG_T& config = Configuration.get(); config.PowerLimiter_Enabled = root[F("enabled")].as(); - config.PowerLimiter_SolarPassTroughEnabled = root[F("solar_passtrough_enabled")].as(); + config.PowerLimiter_SolarPassThroughEnabled = root[F("solar_passtrough_enabled")].as(); config.PowerLimiter_BatteryDrainStategy= root[F("battery_drain_strategy")].as(); config.PowerLimiter_IsInverterBehindPowerMeter = root[F("is_inverter_behind_powermeter")].as(); config.PowerLimiter_InverterId = root[F("inverter_id")].as(); diff --git a/webapp/src/views/PowerMeterAdminView.vue b/webapp/src/views/PowerMeterAdminView.vue index fc45009d..1e4326b3 100644 --- a/webapp/src/views/PowerMeterAdminView.vue +++ b/webapp/src/views/PowerMeterAdminView.vue @@ -101,6 +101,7 @@ @@ -188,7 +189,6 @@ import BootstrapAlert from "@/components/BootstrapAlert.vue"; import CardElement from '@/components/CardElement.vue'; import InputElement from '@/components/InputElement.vue'; import { handleResponse, authHeader } from '@/utils/authentication'; -import { BIconInfoCircle } from 'bootstrap-icons-vue'; import type { PowerMeterHttpPhaseConfig, PowerMeterConfig } from "@/types/PowerMeterConfig"; export default defineComponent({ @@ -196,21 +196,9 @@ export default defineComponent({ BasePage, BootstrapAlert, CardElement, - InputElement, - BIconInfoCircle, + InputElement }, data() { - const people: { name: string; age: number; }[] = [ - { - age: 27, - name: 'Tim' - }, - { - age: 28, - name: 'Bob' - } -]; - return { dataLoading: true, powerMeterConfigList: {} as PowerMeterConfig, @@ -224,7 +212,7 @@ export default defineComponent({ alertMessage: "", alertType: "info", showAlert: false, - testHttpRequestAlert: <{ message: string; type: string; show: boolean; }[]> [ ], + testHttpRequestAlert: [{message: "", type: "", show: false}] as { message: string; type: string; show: boolean; }[] }; }, created() { @@ -239,15 +227,6 @@ export default defineComponent({ this.powerMeterConfigList = data; this.dataLoading = false; - type MyType = { - id: number; - name: string; - } - - type MyGroupType = { - [key:string]: MyType; - } - for (var i = 0; i < this.powerMeterConfigList.http_phases.length; i++) { this.testHttpRequestAlert.push({ message: "",