Skip to content

Commit dd7fcfc

Browse files
committed
upd
1 parent ad74ab2 commit dd7fcfc

File tree

3 files changed

+21
-2
lines changed

3 files changed

+21
-2
lines changed

Distr/nrf24batch/CO2_mini.txt

+5
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ W: Flags=,20
5252

5353
W: Reset=,RESET,0xC1
5454

55+
S: LED=,0,0x40
56+
57+
SBatch: LED On: LED=1
58+
SBatch: LED Off: LED=0
59+
5560
RBatch: Settings: ID;RxAddr;Ch;Send period;CO2 threshold;CO2 correct;FanLSB;nRF RETR;Send pause;Flags
5661

5762
WBatch: Default: RxAddr=0xCF;Ch=122;Send period=30;CO2 threshold=1000;CO2 correct=0;FanLSB={0xC1,0,0,0,0,0,0,0};nRF RETR=0x3;Send pause=1;Flags=0;Reset

Distr/nrf24batch/Kitchen Vent.txt

+14
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,20 @@ R: OSCCAL_EMEM=0
8888

8989
W: Reset=,RESET,0xC1
9090

91+
S: Lamp=,0,0x40
92+
S: Fan=,1,0x40
93+
S: FanSpdUp=,2,0x40
94+
S: FanSpdDn=,3,0x40
95+
S: SetupIR=,4,0x40
96+
97+
SBatch: Fan Off: Fan=0
98+
SBatch: Fan On: Fan=3
99+
SBatch: Fan Cooker On: Fan=6
100+
SBatch: Fan Up: FanSpdUp=0
101+
SBatch: Fan Down: FanSpdDn=0
102+
SBatch: Lamp On: Lamp=1
103+
SBatch: Lamp Off: Lamp=0
104+
91105
RBatch: Work: ID;CO2 level 1;CO2 level 2;CO2 level 3;FanCookSpeed_1;FanCookSpeed_2;FanCookSpeed_3;FanCookStartupTime;FanCookOffTime;FanCookSleep;FanSpeed_1;FanSpeed_2;FanSpeed_3;FanStartupTime;FanOffTime;FanSleep
92106
RBatch: Hardware: ID;RxAddr;Ch;FanSpeedInitIdx;Flags;OutPeriod;IRRemotes;OSCCAL_EMEM
93107
RBatch: All: ID;CO2 level 1;CO2 level 2;CO2 level 3;FanCookSpeed_1;FanCookSpeed_2;FanCookSpeed_3;FanCookStartupTime;FanCookOffTime;FanCookSleep;FanSpeed_1;FanSpeed_2;FanSpeed_3;FanStartupTime;FanOffTime;FanSleep;RxAddr;Ch;FanSpeedInitIdx;Flags;OutPeriod;IRRemotes;IRRemotesHash

nrf24batch.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <u8g2.h>
1515

1616
#define TAG "nrf24batch"
17-
#define VERSION "1.6"
17+
#define VERSION "1.7"
1818

1919
#define SCAN_APP_PATH_FOLDER "/ext/nrf24batch"
2020
#define LOG_FILEEXT ".txt"
@@ -1342,7 +1342,7 @@ void next_view_cmd(int8_t add)
13421342
uint16_t max = (rw_type == rwt_read_batch ? ReadBatch_cmd_Total :
13431343
rw_type == rwt_read_cmd ? Read_cmd_Total :
13441344
rw_type == rwt_set_batch ? SetBatch_cmd_Total : WriteBatch_cmd_Total);
1345-
if((view_cmd[rw_type] += add) > max) view_cmd[rw_type] = add > 0 ? 0 : max;
1345+
if((view_cmd[rw_type] += add) >= max) view_cmd[rw_type] = add > 0 ? 0 : max - 1;
13461346
}
13471347

13481348
int32_t nrf24batch_app(void* p) {

0 commit comments

Comments
 (0)