Well actually return coil values when reading them.. + Minor touch-ups

Author: Simontaga

src-tauri/src/main.rs

@@ -35,9 +35,8 @@ struct ModbusState {
 
 #[tauri::command]
 fn update_coil(app_handle: AppHandle, switch_id: u16, state: bool) -> Result<bool, String> {
-    println!("Updating coil: {} to {}", switch_id, state);
+    // TODO: Handle errors.
     let modbus_state = app_handle.state::<ModbusState>();
-
     let mut coils = modbus_state.coils.lock().unwrap();
     coils.insert(switch_id, state);
     let value = coils.get(&switch_id).unwrap();
@@ -68,6 +67,9 @@ async fn main() {
 
 
 fn setup(app_handle: AppHandle, fan_ids: Vec<u8>, server: ModbusServer) {
+    /* 
+        TODO: Grab state from the app handle instead.
+     */
     let fan_ids_shared = Arc::new(Mutex::new(fan_ids));
 
     let evt_clone = fan_ids_shared.clone();

src-tauri/src/modbus/server.rs

@@ -33,7 +33,7 @@ impl tokio_modbus::server::Service for ModbusServer {
             }
             Request::ReadCoils(addr, cnt) => {
                 match coil_read(&self.coils.lock().unwrap(), addr, cnt) {
-                    Ok(values) => future::ready(Ok(Response::ReadCoils(Vec::new()))),
+                    Ok(values) => future::ready(Ok(Response::ReadCoils(values))),
                     Err(err) => future::ready(Err(err)),
                 }
             }
@@ -128,6 +128,22 @@ impl ModbusServer {
         let mut input_registers = HashMap::new();
         let mut holding_registers = HashMap::new();
         let mut coils = HashMap::new();
+
+        // Initialize coils
+        for i in 0..1000 {
+            coils.insert(i, false);
+        }
+
+        // Initialize holding registers
+        for i in 0..1000 {
+            holding_registers.insert(i, 0);
+        }
+
+        // Initialize input registers
+        for i in 0..1000 {
+            input_registers.insert(i, 0);
+        }
+
         Self {
             input_registers: Arc::new(Mutex::new(input_registers)),
             holding_registers: Arc::new(Mutex::new(holding_registers)),

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "modbus-sim",
-    "version": "0.0.0"
+    "version": "0.0.1"
   },
   "tauri": {
     "allowlist": {

src/App.vue

@@ -5,12 +5,15 @@ import Coil from "./components/Coil.vue";
 
 <template>
   <div class="container">
-    <SimulatedFan id="1" />
-    <SimulatedFan id="2" />
+    <div class="simulation-container">
+      <div v-for="x in 3">
+        <SimulatedFan :id="x-1" />
+      </div>
+    </div>
 
     <div class="simulation-container">
       <div v-for="x in 10">
-        <Coil :id="x" />
+        <Coil :id="x-1" />
       </div>
     </div>
 

src/styles.css

@@ -12,6 +12,9 @@
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -webkit-text-size-adjust: 100%;
+  /* no-select */
+  user-select: none;
+  -webkit-user-select: none;
 }
 
 .container {
@@ -74,6 +77,7 @@ button {
 button:hover {
   border-color: #396cd8;
 }
+
 button:active {
   border-color: #396cd8;
   background-color: #e8e8e8;
@@ -103,6 +107,7 @@ button {
     color: #ffffff;
     background-color: #0f0f0f98;
   }
+
   button:active {
     background-color: #0f0f0f69;
   }
@@ -112,6 +117,7 @@ button {
   0% {
     transform: rotate(0deg);
   }
+
   100% {
     transform: rotate(360deg);
   }
@@ -129,10 +135,9 @@ button {
   flex-direction: column;
   justify-content: center;
   align-items: start;
-
-  background-color: #184fb5;
+  background-color: #494d55;
   border-width: 0.25rem;
-  
+
   padding: 0.5rem;
   box-shadow: 0 0 0.1rem 0.05rem #2f2f2f;
 }
@@ -153,7 +158,7 @@ button {
   width: fit-content;
   height: fit-content;
   overflow: hidden;
-  background-color: #1b51b6;
+  background-color: #494d55;
   margin: 0.25rem;
 }
 
@@ -176,7 +181,7 @@ button {
   justify-content: center;
   align-items: start;
 
-  background-color: #184fb5;
+  background-color: #494d55;
   border-width: 0.25rem;
   border-radius: 0.25rem;
   padding: 0.5rem;
@@ -192,13 +197,15 @@ button {
   width: 15px;
   height: 15px;
   border-radius: 50%;
+  border: 2px solid #000000;
   background-color: #fa0303;
   margin: 0.25rem;
   display: inline-block;
 }
 
 .coil-state {
   display: flex;
+  align-items: center;
 }
 
 .coil_active {