feat: tiny improvements

 - do not reuse modbus context
 - enable RS485 mode before sending commands
 - allow 2 installations of hackdose on 1 device

Author: torfmaster

server/hackdose2.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Hackdose2
+
+[Service]
+ExecStart=/usr/bin/hackdose-server2 --config /etc/hackdose2.yaml
+Restart=on-failure
+EnvironmentFile=/etc/environment
+
+[Install]
+WantedBy=multi-user.target

server/install2.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+set -eux
+
+pushd ../app
+trunk build --release
+popd
+
+source profiles/$PROFILE_NAME/.env
+cargo build --target=$TARGET --release
+sshpass -p $PI_PASSWORD  scp -C -P$PI_SSH_PORT hackdose2.service $PI_USER@$PI_HOST:/etc/systemd/system
+sshpass -p $PI_PASSWORD ssh -p $PI_SSH_PORT $PI_USER@$PI_HOST 'systemctl enable hackdose2.service'
+sshpass -p $PI_PASSWORD ssh -p $PI_SSH_PORT $PI_USER@$PI_HOST 'systemctl stop hackdose2.service'
+sshpass -p $PI_PASSWORD  scp -C -P$PI_SSH_PORT ../target/$TARGET/release/hackdose-server $PI_USER@$PI_HOST:/usr/bin/hackdose-server2
+sshpass -p $PI_PASSWORD  scp -C -P$PI_SSH_PORT profiles/$PROFILE_NAME/hackdose.yaml $PI_USER@$PI_HOST:/etc/hackdose2.yaml
+sshpass -p $PI_PASSWORD  ssh -p $PI_SSH_PORT $PI_USER@$PI_HOST 'systemctl start hackdose2.service'

server/src/actors/marstek.rs

@@ -10,9 +10,11 @@ mod marstek_registers {
     pub(super) const STATE: u16 = 0xa41a;
     pub(super) const FORCIBLE_CHARGE_WATTS: u16 = 0xa424;
     pub(super) const FORCIBLE_DISCHARGE_WATTS: u16 = 0xa425;
+    pub(super) const RS485_CONTROL_MODE: u16 = 0xA410;
 
     pub(super) const STATE_CHARGE: u16 = 1;
     pub(super) const STATE_DISCHARGE: u16 = 2;
+    pub(super) const RS485_ENABLED: u16 = 0x55aa;
 }
 
 #[derive(Serialize, Deserialize, Clone)]
@@ -48,6 +50,12 @@ impl Regulator for MarstekCharge {
 
         task::spawn(async move {
             let mut ctx = slave.connect().await.unwrap();
+            let _ = ctx
+                .write_single_register(
+                    marstek_registers::RS485_CONTROL_MODE,
+                    marstek_registers::RS485_ENABLED,
+                )
+                .await;
             let _ = ctx
                 .write_single_register(marstek_registers::STATE, marstek_registers::STATE_CHARGE)
                 .await;

server/src/main.rs

@@ -36,6 +36,7 @@ pub(crate) struct Configuration {
     power_measurement: PowerMeasurement,
     lower_limit: isize,
     upper_limit: isize,
+    port: Option<usize>,
 }
 
 #[derive(Serialize, Deserialize, Clone)]

server/src/rest/mod.rs

@@ -7,6 +7,7 @@ use axum::{
     routing::get,
     Json, Router,
 };
+use chrono::format::format;
 use hackdose_server_shared::{DataPoint, Range};
 use hackdose_sml_parser::application::{domain::AnyValue, obis::Obis};
 use mime_guess::mime;
@@ -80,7 +81,10 @@ pub(crate) async fn serve_rest_endpoint(
     energy_data: EnergyData,
     config: &Configuration,
 ) {
-    let listener = tokio::net::TcpListener::bind("0.0.0.0:8080").await.unwrap();
+    let listener =
+        tokio::net::TcpListener::bind(format!("0.0.0.0:{}", config.port.unwrap_or(8080)))
+            .await
+            .unwrap();
     let app_state = AppState {
         energy_data: energy_data,
         smart_meter_state: SmartMeterState(mutex),

server/src/smart_meter/generic_modbus.rs

@@ -22,29 +22,31 @@ pub(crate) fn spawn_modbus_producer(
 
     tokio::spawn(async move {
         loop {
-            let mut ctx = con.modbus_slave.connect().await.unwrap();
             loop {
-                let v = timeout(
-                    Duration::from_secs(5),
-                    ctx.read_holding_registers(con.register, 1),
-                )
-                .await;
-                if let Ok(Ok(Ok(v))) = v {
-                    match v.first() {
-                        Some(v) => {
-                            let date = Utc::now();
-                            let v = (*v as i16) as i32;
-                            let data = DataPoint { date, value: v };
-                            energy_data.put(data).await;
-                            energy_data.log_data(data).await;
-                            let _ = cloned_tx.send((v, date)).await;
+                let ctx = con.modbus_slave.connect().await;
+                if let Ok(mut ctx) = ctx {
+                    let v = timeout(
+                        Duration::from_secs(5),
+                        ctx.read_holding_registers(con.register, 1),
+                    )
+                    .await;
+                    if let Ok(Ok(Ok(v))) = v {
+                        match v.first() {
+                            Some(v) => {
+                                let date = Utc::now();
+                                let v = (*v as i16) as i32;
+                                let data = DataPoint { date, value: v };
+                                energy_data.put(data).await;
+                                energy_data.log_data(data).await;
+                                let _ = cloned_tx.send((v, date)).await;
+                            }
+                            None => (),
                         }
-                        None => (),
+                    } else {
+                        break;
                     }
-                } else {
-                    break;
+                    sleep(Duration::from_millis(con.poll_intervall_millis as u64)).await;
                 }
-                sleep(Duration::from_millis(con.poll_intervall_millis as u64)).await;
             }
         }
     });