diff --git a/Distr/nrf24batch/Kitchen Vent Dimmer.txt b/Distr/nrf24batch/Kitchen Vent Dimmer.txt index 84fc9f38311..16a9021af28 100644 --- a/Distr/nrf24batch/Kitchen Vent Dimmer.txt +++ b/Distr/nrf24batch/Kitchen Vent Dimmer.txt @@ -57,9 +57,9 @@ R: OutSpeedMax=18 W: OutSpeedMax=,18 R: ZeroCrossLag,us*2=27,,ROM2 -W: ZeroCrossLag,us=,27,WROM2 +W: ZeroCrossLag,us*2=,27,WROM2 R: SSR_PulseWidth,us*2=29,,ROM2 -W: SSR_PulseWidth,us=,29,WROM2 +W: SSR_PulseWidth,us*2=,29,WROM2 R: PauseSetByCO2,min=31 W: PauseSetByCO2,min=,31 @@ -100,26 +100,29 @@ W: _OutSpeedMax=,0x87,WRAM R: _LED_Warning=0x6B,,RAM W: _LED_Warning=,0x6B,WRAM R: _ZeroCrossDelay*2=0x8E,,RAM2 -W: _ZeroCrossDelay*2=,0x8E,WRAM2 +W: _ZeroCrossDelay=,0x8E,WRAM2 R: _PulseDelayAfterZero*2=0x9A,,RAM2 -W: _PulseDelayAfterZero*2=,0x9A,WRAM2 +W: _PulseDelayAfterZero=,0x9A,WRAM2 R: _PulseWidth*2=0x8C,,RAM -W: _PulseWidth*2=,0x8C,WRAM2 +W: _PulseWidth=,0x8C,WRAM2 W: Reset=0xEEEE,14,SET S: Lamp=,0,SET S: Fan=,1,SET -S: FanSpdUp=,2,SET -S: FanSpdDn=,3,SET -S: FanSpdSave=,4,SET -S: SetupIR=,5,SET +S: FanAdd=,2,SET +S: FanSpdUp=,3,SET +S: FanSpdDn=,4,SET +S: FanSpdSave=,5,SET +S: SetupIR=,6,SET SBatch: Fan Cooker Max: Fan=6 SBatch: Fan Cooker Min: Fan=4 SBatch: Fan Max: Fan=3 SBatch: Fan Min: Fan=1 SBatch: Fan Off: Fan=0 +SBatch: Fan +: FanAdd=1 +SBatch: Fan -: FanAdd=-1 SBatch: Lamp On: Lamp=1 SBatch: Lamp Off: Lamp=0 SBatch: Fan Up: FanSpdUp=0 @@ -131,13 +134,13 @@ RBatch: Work: ID;CO2 level;FanCookSpeed;FanCookOnTime;FanCookOffTime;FanCookSlee RBatch: Hardware: ID;RxAddr;Ch;SpeedInitIdx;Flags;OutSpeedMax;IRRemotes;ZeroCrossLag,us;SSR_PulseWidth,us;OSCCAL_EMEM RBatch: All: ID;CO2 level;FanCookSpeed;FanCookOnTime;FanCookOffTime;FanCookSleep;FanSpeed;FanOnTime;FanOffTime;FanSleep;RxAddr;Ch;SpeedInitIdx;Flags;OutSpeedMax;IRRemotes;IRRemotesHash -WBatch: Init(Cook2spd,Lamp-F2.2): RxAddr=0xC1;Ch=122;CO2 level={870,930,1000};Fan speeds=3;FanSpeed={14,15,16};FanCook speeds=3;FanCookSpeed={15,16,32};FanSleep=20;FanCookSleep=6;FanOnTime=150;FanCookOnTime=0;FanOffTime=100;FanCookOffTime=0;SpeedInitIdx=0;SpeedKeyIdx=6;Flags=0x0D;OutSpeedMax=16;ZeroCrossLag,us=200;SSR_PulseWidth,us=9999 +WBatch: Init(Cook2spd,Lamp-F2.2): RxAddr=0xC1;Ch=122;CO2 level={870,930,1000};Fan speeds=3;FanSpeed={10,12,16};FanCook speeds=3;FanCookSpeed={12,16,32};FanSleep=20;FanCookSleep=6;FanOnTime=150;FanCookOnTime=0;FanOffTime=100;FanCookOffTime=0;SpeedInitIdx=0;SpeedKeyIdx=6;Flags=0x0D;OutSpeedMax=16;ZeroCrossLag,us=30;SSR_PulseWidth,us=9990 WBatch: IRRemotes clear: IRRemotes=0 WBatch: IRRemotes 1 kitchen: IRRemotes=1;IRRemotesHash={0x6DA5,0xFCA5,0x7CA5,0xB425,0x3425,0x1625,0x8525} -WBatch: Fans Speeds: Fan speeds=3;FanSpeed={14,15,16};FanCook speeds=3;FanCookSpeed={14,16,32} +WBatch: Fans Speeds: Fan speeds=3;FanSpeed={10,12,16};FanCook speeds=3;FanCookSpeed={12,16,32} WBatch: LED Warning: _LED Warning=0x10 WBatch: OSCCAL: _OSCCAL=146 WBatch: CO2 Level: CO2 level={750,850,1000} -WBatch: Zero cross EEPROM: ZeroCrossLag,us=200;SSR_PulseWidth,us=200 +WBatch: Zero cross EEPROM: ZeroCrossLag,us=30;SSR_PulseWidth,us=200;Reset WBatch: Zero cross RAM: _ZeroCrossDelay=1225;_PulseDelayAfterZero=0001;_PulseWidth=1249 WBatch: Reset: Reset diff --git a/nrf24batch.c b/nrf24batch.c index 76655ca9e61..6da3657c7f9 100644 --- a/nrf24batch.c +++ b/nrf24batch.c @@ -14,7 +14,7 @@ #include #define TAG "nrf24batch" -#define VERSION "1.8" +#define VERSION "1.9" #define SCAN_APP_PATH_FOLDER "/ext/nrf24batch" #define LOG_FILEEXT ".txt" @@ -765,6 +765,7 @@ bool Run_WriteBatch_cmd() if(*(delim_col - 2) == '*') { if(len != delim_col - w - 2) continue; size = *(delim_col - 1) - '0'; + new = new & (size == 1 ? 0xFF : size == 2 ? 0xFFFF : size == 3 ? 0xFFFFFF : 0xFFFFFFFF); } else if(len != delim_col - w) continue; if(strncmp(p, w, len) != 0) continue; delim_col++;