From cb4cfa68f0633ed7b92c1589b042340780d32636 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 16 Jul 2019 21:28:50 +0200 Subject: [PATCH] Aircon: Max sensor ID cannot be in public API --- aircon/firmware/main.c | 4 +++- aircon/firmware/registers.h | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/aircon/firmware/main.c b/aircon/firmware/main.c index 824ee7a..2e8881b 100644 --- a/aircon/firmware/main.c +++ b/aircon/firmware/main.c @@ -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] = { diff --git a/aircon/firmware/registers.h b/aircon/firmware/registers.h index bf444cf..d89d12f 100644 --- a/aircon/firmware/registers.h +++ b/aircon/firmware/registers.h @@ -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 { -- 2.39.2