You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

25 lines
805 B

  1. From 91a1d74f76c64e7b35bfb10114e1a4a6ff351656 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?St=C3=A9phane=20Raimbault?= <stephane.raimbault@gmail.com>
  3. Date: Thu, 26 Oct 2017 11:10:31 +0200
  4. Subject: [PATCH 2/2] Oops fix OR on RS485 settings (1c5d969)
  5. ---
  6. src/modbus-rtu.c | 2 +-
  7. 1 file changed, 1 insertion(+), 1 deletion(-)
  8. diff --git a/src/modbus-rtu.c b/src/modbus-rtu.c
  9. index f2911d6..190298e 100644
  10. --- a/src/modbus-rtu.c
  11. +++ b/src/modbus-rtu.c
  12. @@ -916,7 +916,7 @@ int modbus_rtu_set_serial_mode(modbus_t *ctx, int mode)
  13. return -1;
  14. }
  15. // Set
  16. - rs485conf.flags = SER_RS485_ENABLED;
  17. + rs485conf.flags |= SER_RS485_ENABLED;
  18. if (ioctl(ctx->s, TIOCSRS485, &rs485conf) < 0) {
  19. return -1;
  20. }
  21. --
  22. 2.21.0