From 992b62001465478d9fb285e5e5400adddeddca75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=AD=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=BE=D0=BC=D0=BE=D0=B2?= <stud180319@vyatsu.ru>
Date: Fri, 14 Jun 2024 18:13:18 +0300
Subject: [PATCH] =?UTF-8?q?14.06=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BD=D0=B0=20=D0=B4=D1=80=D1=83=D0=B3=D0=BE?=
 =?UTF-8?q?=D0=BC=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/arduino.json |  2 +-
 main.py              | 77 +++++++++++++++++++++++++-------------------
 project/project.ino  | 38 +++++++++++++---------
 3 files changed, 67 insertions(+), 50 deletions(-)

diff --git a/.vscode/arduino.json b/.vscode/arduino.json
index 5095d0a..6490a26 100644
--- a/.vscode/arduino.json
+++ b/.vscode/arduino.json
@@ -2,5 +2,5 @@
     "sketch": "project\\project.ino",
     "output": "build",
     "board": "arduino:avr:uno",
-    "port": "COM4"
+    "port": "COM6"
 }
\ No newline at end of file
diff --git a/main.py b/main.py
index a682a59..7be9fa6 100644
--- a/main.py
+++ b/main.py
@@ -1,37 +1,46 @@
-from fastapi import FastAPI
-from pymodbus.client import ModbusSerialClient as ModbusClient
-import uvicorn
-import threading
-import time
+from fastapi import FastAPI 
+from pymodbus.client import ModbusSerialClient
+import threading 
+import time 
+import logging
 
-app = FastAPI()
+serial_port = "COM6"   
+baud_rate = 9600 
+modbus_client = ModbusSerialClient(serial_port, baudrate=baud_rate) 
+modbus_data = "0" 
 
-# Create a Modbus client instance
-client = ModbusClient(method='rtu', port='COM4', baudrate=9600, timeout=1)
-client.connect()
+logging.basicConfig()
+log = logging.getLogger()
+log.setLevel(logging.DEBUG)
 
-# Shared variable to store the Modbus register value
-line = '0'
-
-def read_modbus_value():
-    global line
-    while True:
-        # Read holding register (adjust the register address as needed)
-        result = client.read_holding_registers(address=1, count=1, unit=1)
-        if not result.isError():
-            line = str(result.registers[0])
-        time.sleep(1)  # Poll every 1 second
-
-# Start the Modbus reading in a separate thread
-threading.Thread(target=read_modbus_value, daemon=True).start()
-
-@app.get("/stat")
-async def get_stat():
-    return {'state': line}
-
-@app.get("/")
-async def root():
-    return {'message': 'hello world'}
-
-if __name__ == "__main__":
-    uvicorn.run(app, host="0.0.0.0", port=12346)
+def poll_modbus(): 
+    global modbus_data 
+    modbus_client.connect()   
+    while True: 
+        try:        
+            response = modbus_client.read_discrete_inputs(10001, 1, slave=1)   
+            #print(response)
+ 
+            if not response.isError():     
+                modbus_data = response.registers[0] 
+            print(modbus_data)             
+        except: 
+             pass 
+           
+ 
+ 
+threading.Thread(target=poll_modbus, daemon=True).start() 
+ 
+app = FastAPI() 
+ 
+@app.get("/modbus_data") 
+async def get_modbus_data(): 
+        return {"modbus_data": modbus_data} 
+ 
+@app.get("/") 
+async def root(): 
+    return {"message": "Welcome to FastAPI with Modbus"} 
+ 
+if __name__ == "__main__": 
+    import uvicorn 
+    uvicorn.run(app, host="0.0.0.0", port=12345)
\ No newline at end of file
diff --git a/project/project.ino b/project/project.ino
index e183bb0..e927247 100644
--- a/project/project.ino
+++ b/project/project.ino
@@ -1,20 +1,28 @@
-#include <ModbusSerial.h>
+#include <ModbusSerial.h> 
+const int GPIOCoil = 0; 
 
-// Define pins
-#define PIN_INPUT 3
-#define PIN_LED 13
-
-// Create Modbus object
-ModbusSerial mb(Serial, 1); // Assuming slave ID is 1
+#define MySerial Serial // define serial port used, Serial most of the time, or Serial1, Serial2 ... if available
+ 
+bool coils[10]; 
+int pinToRead = 2;  
+ 
+ModbusSerial mb (MySerial, 1);
 
 void setup() {
-  Serial.begin(9600);
-  pinMode(PIN_INPUT, INPUT);
-  pinMode(PIN_LED, OUTPUT);
-}
 
-void loop() {
-  int sensorVal = digitalRead(PIN_INPUT);
-  mb.task(); // Update Modbus communication
-  delay(500);
+  MySerial.begin (9600, MB_PARITY_NONE); // prefer this line in accordance with the modbus standard.
+  while (! MySerial)
+    ;
+
+  mb.config (9600);
 }
+ 
+void loop() { 
+  // mb.setIsts(0, digitalRead(pinToRead)); 
+  // mb.task();   
+  int r = Serial.read();
+  if (r >= 0){
+     Serial.write(r);
+     Serial.write(r);
+  }
+}
\ No newline at end of file