Skip to content
This repository has been archived by the owner on Jul 28, 2024. It is now read-only.

Commit

Permalink
upd
Browse files Browse the repository at this point in the history
  • Loading branch information
vad7 committed Mar 15, 2023
1 parent ad74ab2 commit dd7fcfc
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
5 changes: 5 additions & 0 deletions Distr/nrf24batch/CO2_mini.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ W: Flags=,20

W: Reset=,RESET,0xC1

S: LED=,0,0x40

SBatch: LED On: LED=1
SBatch: LED Off: LED=0

RBatch: Settings: ID;RxAddr;Ch;Send period;CO2 threshold;CO2 correct;FanLSB;nRF RETR;Send pause;Flags

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
Expand Down
14 changes: 14 additions & 0 deletions Distr/nrf24batch/Kitchen Vent.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,20 @@ R: OSCCAL_EMEM=0

W: Reset=,RESET,0xC1

S: Lamp=,0,0x40
S: Fan=,1,0x40
S: FanSpdUp=,2,0x40
S: FanSpdDn=,3,0x40
S: SetupIR=,4,0x40

SBatch: Fan Off: Fan=0
SBatch: Fan On: Fan=3
SBatch: Fan Cooker On: Fan=6
SBatch: Fan Up: FanSpdUp=0
SBatch: Fan Down: FanSpdDn=0
SBatch: Lamp On: Lamp=1
SBatch: Lamp Off: Lamp=0

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
RBatch: Hardware: ID;RxAddr;Ch;FanSpeedInitIdx;Flags;OutPeriod;IRRemotes;OSCCAL_EMEM
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
Expand Down
4 changes: 2 additions & 2 deletions nrf24batch.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
#include <u8g2.h>

#define TAG "nrf24batch"
#define VERSION "1.6"
#define VERSION "1.7"

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

int32_t nrf24batch_app(void* p) {
Expand Down

0 comments on commit dd7fcfc

Please sign in to comment.