From 01abbf4a252e85af99df24ca01b7f7ab612ee245 Mon Sep 17 00:00:00 2001
From: Edward Emelianov <eddy@sao.ru>
Date: Thu, 5 Jun 2025 11:10:57 +0300
Subject: [PATCH] added "relay type 1" for non-standard 4-relay board (based on
 STM8S003)

---
 modbus_relay/cmdlnopts.c  |   1 +
 modbus_relay/cmdlnopts.h  |   1 +
 modbus_relay/main.c       |  34 ++++++++++++++++++++++++++--------
 modbus_relay/modbus_relay | Bin 21424 -> 0 bytes
 4 files changed, 28 insertions(+), 8 deletions(-)
 delete mode 100755 modbus_relay/modbus_relay

diff --git a/modbus_relay/cmdlnopts.c b/modbus_relay/cmdlnopts.c
index 043910a..d545713 100644
--- a/modbus_relay/cmdlnopts.c
+++ b/modbus_relay/cmdlnopts.c
@@ -57,6 +57,7 @@ static sl_option_t cmdlnopts[] = {
     {"node",    NEED_ARG,   NULL,   'n',    arg_int,    APTR(&GP.nodenum),  "node number (default: 1)"},
     {"readN",   NO_ARGS,    NULL,   0,      arg_int,    APTR(&GP.readn),    "read node number"},
     {"setN",    NEED_ARG,   NULL,   0,      arg_int,    APTR(&GP.setn),     "change node number"},
+    {"type",    NEED_ARG,   NULL,   't',    arg_int,    APTR(&GP.relaytype), "type of relay: 0 - standard 2relay, 1 - non-standard 4relay"},
     end_option
 };
 
diff --git a/modbus_relay/cmdlnopts.h b/modbus_relay/cmdlnopts.h
index 8072fa4..c3810c2 100644
--- a/modbus_relay/cmdlnopts.h
+++ b/modbus_relay/cmdlnopts.h
@@ -31,6 +31,7 @@ typedef struct{
     int nodenum;        // node number (default: 1)
     int readn;          // read node number
     int setn;           // set node number
+    int relaytype;      // type of relay
     int **setrelay;     // set relay number N
     int **resetrelay;   // reset relay number N
     int **getinput;     // read Nth input
diff --git a/modbus_relay/main.c b/modbus_relay/main.c
index e45fe9f..f43ba8c 100644
--- a/modbus_relay/main.c
+++ b/modbus_relay/main.c
@@ -46,13 +46,27 @@ int main(int argc, char **argv){
     modbus_set_response_timeout(ctx, 0, 100000);
     if(modbus_set_slave(ctx, GP.nodenum)) ERRX("Can't set modbus slave");
     if(modbus_connect(ctx) < 0) ERR("Can't open device %s", GP.device);
+    if(GP.relaytype < 0 || GP.relaytype > 1) ERRX("Type should be 0 or 1");
     VMSG("OK!\n");
     uint8_t dest8[8] = {0};
+    int result = 0;
+    int ninputs = 8, noutputs = 8;
+    if(GP.relaytype == 1){ ninputs = 4; noutputs = 4;}
     if(GP.setall){
-        memset(dest8, 1, 8);
-        if(modbus_write_bits(ctx, 0, 8, dest8) < 0) WARNX("Can't set all relays");
+        if(GP.relaytype == 0){
+            memset(dest8, 1, noutputs);
+            result = modbus_write_bits(ctx, 0, noutputs, dest8);
+        }else{
+            result = modbus_write_bit(ctx, 0xff, 0xff00);
+        }
+        if(result < 0) WARNX("Can't set all relays");
     }else if(GP.resetall){
-        if(modbus_write_bits(ctx, 0, 8, dest8) < 0) WARNX("Can't clear all relays");
+        if(GP.relaytype == 0){
+            result = modbus_write_bits(ctx, 0, noutputs, dest8);
+        }else{
+            result = modbus_write_bit(ctx, 0xff, 0);
+        }
+        if(result < 0) WARNX("Can't clear all relays");
     }else{
         if(GP.resetrelay){
             int **p = GP.resetrelay;
@@ -80,24 +94,24 @@ int main(int argc, char **argv){
         }
     }
     if(GP.getinput){
-        if(modbus_read_input_bits(ctx, 0, 8, dest8) < 0) WARNX("Can't read inputs");
+        if(modbus_read_input_bits(ctx, 0, ninputs, dest8) < 0) WARNX("Can't read inputs");
         else{
             int **p = GP.getinput;
             while(*p){
                 int n = **p;
-                if(n > 7 || n < 0) WARNX("Input number should be in [0, 7]");
+                if(n > ninputs-1 || n < 0) WARNX("Input number should be in [0, %d]", ninputs-1);
                 else printf("INPUT%d=%u\n", n, dest8[n]);
                 ++p;
             }
         }
     }
     if(GP.getrelay){
-        if(modbus_read_bits(ctx, 0, 8, dest8) < 0) WARNX("Can't read relays");
+        if(modbus_read_bits(ctx, 0, noutputs, dest8) < 0) WARNX("Can't read relays");
         else{
             int **p = GP.getrelay;
             while(*p){
                 int n = **p;
-                if(n > 7 || n < 0) WARNX("Relay number should be in [0, 7]");
+                if(n > noutputs-1 || n < 0) WARNX("Relay number should be in [0, %d]", noutputs-1);
                 else printf("RELAY%d=%u\n", n, dest8[n]);
                 ++p;
             }
@@ -108,7 +122,11 @@ int main(int argc, char **argv){
     }
     if(GP.setn){
         uint16_t nodeN = (uint16_t) GP.setn;
-        modbus_write_registers(ctx, 0, 1, &nodeN);
+        if(GP.relaytype == 0){
+            modbus_write_registers(ctx, 0, 1, &nodeN);
+        }else{
+            modbus_write_register(ctx, 0x4000, nodeN);
+        }
         modbus_set_slave(ctx, nodeN);
         getN(ctx);
     }
diff --git a/modbus_relay/modbus_relay b/modbus_relay/modbus_relay
deleted file mode 100755
index 11464bbd6e9cb82cf6137e4636a93dafc8bc5370..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 21424
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