patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDM power meter: remove baud rate setting

Browse Source 
this setting was not used. the baud rate for the SDM is set to 9600 in
the source code. until the baud rate being customizable is actually
required by somebody, we remove the setting altogether.
This commit is contained in:
Bernhard Kirchen 2024-05-09 14:28:14 +02:00
parent d99cfd5b31
commit 54c04aed61
8 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Configuration.h
View File

@ -203,7 +203,6 @@ struct CONFIG_T {
char MqttTopicPowerMeter1[MQTT_MAX_TOPIC_STRLEN + 1]; char MqttTopicPowerMeter1[MQTT_MAX_TOPIC_STRLEN + 1];
char MqttTopicPowerMeter2[MQTT_MAX_TOPIC_STRLEN + 1]; char MqttTopicPowerMeter2[MQTT_MAX_TOPIC_STRLEN + 1];
char MqttTopicPowerMeter3[MQTT_MAX_TOPIC_STRLEN + 1]; char MqttTopicPowerMeter3[MQTT_MAX_TOPIC_STRLEN + 1];
uint32_t SdmBaudrate;
uint32_t SdmAddress; uint32_t SdmAddress;
uint32_t HttpInterval; uint32_t HttpInterval;
bool HttpIndividualRequests; bool HttpIndividualRequests;

1
include/defaults.h
View File

@ -117,7 +117,6 @@
#define POWERMETER_ENABLED false #define POWERMETER_ENABLED false
#define POWERMETER_INTERVAL 10 #define POWERMETER_INTERVAL 10
#define POWERMETER_SOURCE 2 #define POWERMETER_SOURCE 2
#define POWERMETER_SDMBAUDRATE 9600
#define POWERMETER_SDMADDRESS 1 #define POWERMETER_SDMADDRESS 1
#define POWERLIMITER_ENABLED false #define POWERLIMITER_ENABLED false

2
src/Configuration.cpp
View File

@ -155,7 +155,6 @@ bool ConfigurationClass::write()
powermeter["mqtt_topic_powermeter_1"] = config.PowerMeter.MqttTopicPowerMeter1; powermeter["mqtt_topic_powermeter_1"] = config.PowerMeter.MqttTopicPowerMeter1;
powermeter["mqtt_topic_powermeter_2"] = config.PowerMeter.MqttTopicPowerMeter2; powermeter["mqtt_topic_powermeter_2"] = config.PowerMeter.MqttTopicPowerMeter2;
powermeter["mqtt_topic_powermeter_3"] = config.PowerMeter.MqttTopicPowerMeter3; powermeter["mqtt_topic_powermeter_3"] = config.PowerMeter.MqttTopicPowerMeter3;
powermeter["sdmbaudrate"] = config.PowerMeter.SdmBaudrate;
powermeter["sdmaddress"] = config.PowerMeter.SdmAddress; powermeter["sdmaddress"] = config.PowerMeter.SdmAddress;
powermeter["http_individual_requests"] = config.PowerMeter.HttpIndividualRequests; powermeter["http_individual_requests"] = config.PowerMeter.HttpIndividualRequests;
@ -422,7 +421,6 @@ bool ConfigurationClass::read()
strlcpy(config.PowerMeter.MqttTopicPowerMeter1, powermeter["mqtt_topic_powermeter_1"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter1)); strlcpy(config.PowerMeter.MqttTopicPowerMeter1, powermeter["mqtt_topic_powermeter_1"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter1));
strlcpy(config.PowerMeter.MqttTopicPowerMeter2, powermeter["mqtt_topic_powermeter_2"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter2)); strlcpy(config.PowerMeter.MqttTopicPowerMeter2, powermeter["mqtt_topic_powermeter_2"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter2));
strlcpy(config.PowerMeter.MqttTopicPowerMeter3, powermeter["mqtt_topic_powermeter_3"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter3)); strlcpy(config.PowerMeter.MqttTopicPowerMeter3, powermeter["mqtt_topic_powermeter_3"] | "", sizeof(config.PowerMeter.MqttTopicPowerMeter3));
config.PowerMeter.SdmBaudrate = powermeter["sdmbaudrate"] | POWERMETER_SDMBAUDRATE;
config.PowerMeter.SdmAddress = powermeter["sdmaddress"] | POWERMETER_SDMADDRESS; config.PowerMeter.SdmAddress = powermeter["sdmaddress"] | POWERMETER_SDMADDRESS;
config.PowerMeter.HttpIndividualRequests = powermeter["http_individual_requests"] | false; config.PowerMeter.HttpIndividualRequests = powermeter["http_individual_requests"] | false;

2
src/WebApi_powermeter.cpp
View File

@ -66,7 +66,6 @@ void WebApiPowerMeterClass::onStatus(AsyncWebServerRequest* request)
root["mqtt_topic_powermeter_1"] = config.PowerMeter.MqttTopicPowerMeter1; root["mqtt_topic_powermeter_1"] = config.PowerMeter.MqttTopicPowerMeter1;
root["mqtt_topic_powermeter_2"] = config.PowerMeter.MqttTopicPowerMeter2; root["mqtt_topic_powermeter_2"] = config.PowerMeter.MqttTopicPowerMeter2;
root["mqtt_topic_powermeter_3"] = config.PowerMeter.MqttTopicPowerMeter3; root["mqtt_topic_powermeter_3"] = config.PowerMeter.MqttTopicPowerMeter3;
root["sdmbaudrate"] = config.PowerMeter.SdmBaudrate;
root["sdmaddress"] = config.PowerMeter.SdmAddress; root["sdmaddress"] = config.PowerMeter.SdmAddress;
root["http_individual_requests"] = config.PowerMeter.HttpIndividualRequests; root["http_individual_requests"] = config.PowerMeter.HttpIndividualRequests;
@ -210,7 +209,6 @@ void WebApiPowerMeterClass::onAdminPost(AsyncWebServerRequest* request)
strlcpy(config.PowerMeter.MqttTopicPowerMeter1, root["mqtt_topic_powermeter_1"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter1)); strlcpy(config.PowerMeter.MqttTopicPowerMeter1, root["mqtt_topic_powermeter_1"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter1));
strlcpy(config.PowerMeter.MqttTopicPowerMeter2, root["mqtt_topic_powermeter_2"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter2)); strlcpy(config.PowerMeter.MqttTopicPowerMeter2, root["mqtt_topic_powermeter_2"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter2));
strlcpy(config.PowerMeter.MqttTopicPowerMeter3, root["mqtt_topic_powermeter_3"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter3)); strlcpy(config.PowerMeter.MqttTopicPowerMeter3, root["mqtt_topic_powermeter_3"].as<String>().c_str(), sizeof(config.PowerMeter.MqttTopicPowerMeter3));
config.PowerMeter.SdmBaudrate = root["sdmbaudrate"].as<uint32_t>();
config.PowerMeter.SdmAddress = root["sdmaddress"].as<uint8_t>(); config.PowerMeter.SdmAddress = root["sdmaddress"].as<uint8_t>();
config.PowerMeter.HttpIndividualRequests = root["http_individual_requests"].as<bool>(); config.PowerMeter.HttpIndividualRequests = root["http_individual_requests"].as<bool>();

1
webapp/src/locales/de.json
View File

@ -568,7 +568,6 @@
"MqttTopicPowerMeter2": "MQTT topic - Stromzähler #2 (Optional)", "MqttTopicPowerMeter2": "MQTT topic - Stromzähler #2 (Optional)",
"MqttTopicPowerMeter3": "MQTT topic - Stromzähler #3 (Optional)", "MqttTopicPowerMeter3": "MQTT topic - Stromzähler #3 (Optional)",
"SDM": "SDM-Stromzähler Konfiguration", "SDM": "SDM-Stromzähler Konfiguration",
"sdmbaudrate": "Baudrate",
"sdmaddress": "Modbus Adresse", "sdmaddress": "Modbus Adresse",
"HTTP": "HTTP(S) + JSON - Allgemeine Konfiguration", "HTTP": "HTTP(S) + JSON - Allgemeine Konfiguration",
"httpIndividualRequests": "Individuelle HTTP requests pro Phase", "httpIndividualRequests": "Individuelle HTTP requests pro Phase",

1
webapp/src/locales/en.json
View File

@ -570,7 +570,6 @@
"MqttTopicPowerMeter2": "MQTT topic - Power meter #2", "MqttTopicPowerMeter2": "MQTT topic - Power meter #2",
"MqttTopicPowerMeter3": "MQTT topic - Power meter #3", "MqttTopicPowerMeter3": "MQTT topic - Power meter #3",
"SDM": "SDM-Power Meter Parameter", "SDM": "SDM-Power Meter Parameter",
"sdmbaudrate": "Baudrate",
"sdmaddress": "Modbus Address", "sdmaddress": "Modbus Address",
"HTTP": "HTTP(S) + Json - General configuration", "HTTP": "HTTP(S) + Json - General configuration",
"httpIndividualRequests": "Individual HTTP requests per phase", "httpIndividualRequests": "Individual HTTP requests per phase",

1
webapp/src/types/PowerMeterConfig.ts
View File

@ -28,7 +28,6 @@ export interface PowerMeterConfig {
mqtt_topic_powermeter_1: string; mqtt_topic_powermeter_1: string;
mqtt_topic_powermeter_2: string; mqtt_topic_powermeter_2: string;
mqtt_topic_powermeter_3: string; mqtt_topic_powermeter_3: string;
sdmbaudrate: number;
sdmaddress: number; sdmaddress: number;
http_individual_requests: boolean; http_individual_requests: boolean;
http_phases: Array<PowerMeterHttpPhaseConfig>; http_phases: Array<PowerMeterHttpPhaseConfig>;

10
webapp/src/views/PowerMeterAdminView.vue
View File

@ -74,16 +74,6 @@
:text="$t('powermeteradmin.SDM')" :text="$t('powermeteradmin.SDM')"
textVariant="text-bg-primary" textVariant="text-bg-primary"
add-space> add-space>
<div class="row mb-3">
<label for="sdmbaudrate" class="col-sm-2 col-form-label">{{ $t('powermeteradmin.sdmbaudrate') }}:</label>
<div class="col-sm-10">
<div class="input-group">
<input type="text" class="form-control" id="sdmbaudrate"
placeholder="9600" v-model="powerMeterConfigList.sdmbaudrate" />
</div>
</div>
</div>
<div class="row mb-3"> <div class="row mb-3">
<label for="sdmaddress" class="col-sm-2 col-form-label">{{ $t('powermeteradmin.sdmaddress') }}:</label> <label for="sdmaddress" class="col-sm-2 col-form-label">{{ $t('powermeteradmin.sdmaddress') }}:</label>
<div class="col-sm-10"> <div class="col-sm-10">