]> mj.ucw.cz Git - home-hw.git/commitdiff
Aircon: Max sensor ID cannot be in public API
authorMartin Mares <mj@ucw.cz>
Tue, 16 Jul 2019 19:28:50 +0000 (21:28 +0200)
committerMartin Mares <mj@ucw.cz>
Tue, 16 Jul 2019 19:28:50 +0000 (21:28 +0200)
aircon/firmware/main.c
aircon/firmware/registers.h

index 824ee7a999c7805c3b330eea8a6742b9c3326177..2e8881b93471f3b6e8729900694a25bab4694ef0 100644 (file)
@@ -271,9 +271,11 @@ void modbus_set_coil(u16 addr, bool value)
        }
 }
 
+#define AIRCON_IREG_DS_ID_MAX (AIRCON_IREG_DS_ID_BASE + 3*DS_NUM_SENSORS)
+
 bool modbus_check_input_register(u16 addr)
 {
-       return (addr < AIRCON_IREG_MAX || addr >= AIRCON_IREG_DS_ID_BASE && addr < AIRCON_IREG_DS_ID_MAX);
+       return (addr < AIRCON_IREG_MAX || addr >= AIRCON_IREG_DS_ID_BASE && addr < AIRCON_IREG_DS_ID_BASE);
 }
 
 static const byte temp_sensor_addrs[][8] = {
index bf444cfcc148ef5d9647a87e8e86281f65225675..d89d12ff1d728e7d57394174317aa675a85d17f5 100644 (file)
@@ -20,7 +20,6 @@ enum aircon_input_registers {
        AIRCON_IREG_TEMP_MIXED,
        AIRCON_IREG_MAX,
        AIRCON_IREG_DS_ID_BASE = 0x1000,
-       AIRCON_IREG_DS_ID_MAX = AIRCON_IREG_DS_ID_BASE + 3*DS_NUM_SENSORS,
 };
 
 enum aircon_holding_registers {