Merge branch 'hoylabs:development' into development

hoylabs · Dec 17, 2024 · bfaf21e · bfaf21e
2 parents 3faf7ed + e30f83e
commit bfaf21e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/PowerMeterSerialSdm.cpp b/src/PowerMeterSerialSdm.cpp
@@ -39,16 +39,15 @@ bool PowerMeterSerialSdm::init()
 
     _upSdmSerial = std::make_unique<SoftwareSerial>();
 
-    if (pin.powermeter_rxen > -1 && pin.powermeter_txen > -1){
+    if (pin.powermeter_rxen > -1 && pin.powermeter_txen > -1) {
         _upSdm = std::make_unique<SDM>(*_upSdmSerial, 9600, pin.powermeter_rxen, pin.powermeter_txen,
             SWSERIAL_8N1, pin.powermeter_rx, pin.powermeter_tx);
     }
-    else
-    {
+    else {
         _upSdm = std::make_unique<SDM>(*_upSdmSerial, 9600, pin.powermeter_dere,
             SWSERIAL_8N1, pin.powermeter_rx, pin.powermeter_tx);
     }
-    
+
     _upSdm->begin();
 
     return true;

diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json
@@ -120,7 +120,7 @@
         "10002": "Authentifizierung erfolgreich!",
         "11001": "@:apiresponse.2001",
         "11002": "@:apiresponse:5004",
-        "12001": "Profil muss zwischen 1 und {max} Zeichen lang sein!"
+        "12001": "Profilname muss zwischen 1 und {max} Zeichen lang sein!"
     },
     "home": {
         "LiveData": "Live-Daten",

diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json
@@ -120,7 +120,7 @@
         "10002": "Authentication successful!",
         "11001": "@:apiresponse.2001",
         "11002": "@:apiresponse:5004",
-        "12001": "Profil must between 1 and {max} characters long!"
+        "12001": "Profile name must between 1 and {max} characters long!"
     },
     "home": {
         "LiveData": "Live Data",

diff --git a/webapp/src/types/PinMapping.ts b/webapp/src/types/PinMapping.ts
@@ -49,6 +49,23 @@ export interface Battery {
     tx: number;
 }
 
+export interface Huawei {
+    miso: number;
+    mosi: number;
+    clk: number;
+    cs: number;
+    irq: number;
+    power: number;
+}
+
+export interface PowerMeter {
+    rx: number;
+    tx: number;
+    dere: number;
+    rxen: number;
+    txen: number;
+}
+
 export interface Device {
     name: string;
     links: Array<Links>;
@@ -58,6 +75,8 @@ export interface Device {
     display: Display;
     victron: Victron;
     battery: Battery;
+    huawei: Huawei;
+    powermeter: PowerMeter;
 }
 
 export type PinMapping = Array<Device>;