diff --git a/Distr/nrf24batch/CO2_mini.txt b/Distr/nrf24batch/CO2_mini.txt index 9aaa05db059..1fb281b4148 100644 --- a/Distr/nrf24batch/CO2_mini.txt +++ b/Distr/nrf24batch/CO2_mini.txt @@ -10,22 +10,22 @@ Delay_ms: 30 ReadCmd repeat: 3 Payload struct: 2,1,1 -EEPROM=0; RAM=1; PROGMEM=2; ID=3; RESET=4; WRAM=0x89 +ROM=0x41;ROM2=0x42;WROM=0x81;WROM2=0x82;RAM=0x51;RAM2=0x52;WRAM=0x91;WRAM2=0x92;PGM=0x61;SET=0xC0 -R default: ,EEPROM,0xC1 -W default: n,,0x81 -Write start: 0,0,0x8F +R default: ,,ROM +W default: n,,WROM +Write start: 0,0,0x2F Listen: C8C8C1=CO2,Alarm,- -R: ID*=,ID +R: ID*=,0,0x65 -R: _CO2*2=0x6C,RAM,0xC2 -R: _PORTA=0x39,RAM +R: _CO2*2=0x6C,,RAM2 +R: _PORTA=0x39,,RAM W: _PORTA=,0x3B,WRAM -R: _PORTB=0x36,RAM +R: _PORTB=0x36,,RAM W: _PORTB=,0x38,WRAM -R: _OSCCAL=0x51,RAM +R: _OSCCAL=0x51,,RAM W: _OSCCAL=,0x51,WRAM R: OSCCAL_EMEM=0 @@ -41,11 +41,11 @@ W: nRF RETR=,3 R: Send period=4 W: Send period=,4 -R: CO2 threshold*2=5,,0xC2 -W: CO2 threshold=,5,0x82 +R: CO2 threshold*2=5,,ROM2 +W: CO2 threshold=,5,WROM2 -R: CO2 correct*2=7,,0xC2 -W: CO2 correct*2=,7,0x82 +R: CO2 correct*2=7,,ROM2 +W: CO2 correct*2=,7,WROM2 R: FanLSB[10]=i:9# W: FanLSB=,i:9 @@ -56,12 +56,12 @@ W: Transmit pause=,19 R: Flags=20# W: Flags=,20 -W: Reset=,RESET,0xC1 +W: Reset=0xEEEE,14,SET -R: _LED Warning=0x74,RAM +R: _LED Warning=0x74,,RAM W: _LED Warning=,0x74,WRAM -S: LED=,0,0x40 +S: LED=,0,SET SBatch: LED On: LED=1 SBatch: LED Off: LED=0 @@ -69,7 +69,7 @@ SBatch: LED Off: LED=0 RBatch: Settings: ID;RxAddr;Ch;Send period;CO2 threshold;CO2 correct;FanLSB;nRF RETR;Transmit 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;Transmit pause=1;Flags=0;Reset -WBatch: CO2: CO2 threshold=1000;CO2 correct=0 +WBatch: CO2: Send period=60;CO2 threshold=1000;CO2 correct=0 WBatch: Fan: FanLSB={0xC1,0,0,0,0,0,0,0,0,0};Reset WBatch: RETR: nRF RETR=0x2F;Reset WBatch: Transmit pause: Transmit pause=30 diff --git a/Distr/nrf24batch/Kitchen Vent Dimmer.txt b/Distr/nrf24batch/Kitchen Vent Dimmer.txt index 97f189ea5c5..84fc9f38311 100644 --- a/Distr/nrf24batch/Kitchen Vent Dimmer.txt +++ b/Distr/nrf24batch/Kitchen Vent Dimmer.txt @@ -9,16 +9,16 @@ Resend: 3 Delay_ms: 30 Payload struct: 2,1,1 -EEPROM=0; RAM=1; PROGMEM=2; ID=3; RESET=4; WRAM=0x89; R1=0xC1; R2=0xC2; W1=0x81; W2=0x82 +ROM=0x41;ROM2=0x42;WROM=0x81;WROM2=0x82;RAM=0x51;RAM2=0x52;WRAM=0x91;WRAM2=0x92;PGM=0x61;SET=0xC0 -R default: ,EEPROM,R1 -W default: n,,W1 -Write start: 0,0,0x8F +R default: ,,ROM +W default: n,,WROM +Write start: 0,0,0x2F -R: ID*=,ID +R: ID*=,0,0x65 -R: CO2 level*2[3]=i:4,,R2 -W: CO2 level*2=,i:4,W2 +R: CO2 level*2[3]=i:4,,ROM2 +W: CO2 level*2=,i:4,WROM2 R: Fan speeds=25 W: Fan speeds=,25 @@ -56,10 +56,10 @@ W: SpeedKeyIdx=,17 R: OutSpeedMax=18 W: OutSpeedMax=,18 -R: ZeroCrossLag,us*2=27,,R2 -W: ZeroCrossLag,us=,27,W2 -R: SSR_PulseWidth,us*2=29,,R2 -W: SSR_PulseWidth,us=,29,W2 +R: ZeroCrossLag,us*2=27,,ROM2 +W: ZeroCrossLag,us=,27,WROM2 +R: SSR_PulseWidth,us*2=29,,ROM2 +W: SSR_PulseWidth,us=,29,WROM2 R: PauseSetByCO2,min=31 W: PauseSetByCO2,min=,31 @@ -67,8 +67,8 @@ W: PauseSetByCO2,min=,31 R: IRRemotes=32 W: IRRemotes=,32 -R: IRRemotesHash*2[70]=i:33,,R2# -W: IRRemotesHash*2=,i:33,W2 +R: IRRemotesHash*2[70]=i:33,,ROM2# +W: IRRemotesHash*2=,i:33,WROM2 R: Flags=1# W: Flags=,1 @@ -80,40 +80,40 @@ R: Ch=3 W: Ch=,3 R: OSCCAL_EMEM=0 -R: _OSCCAL=0x51,RAM -W: _OSCCAL=,0x51,WRAM -R: _PORTA=0x39,RAM -W: _PORTA=,0x3B,WRAM -R: _PORTB=0x36,RAM +R: _OSCCAL=0x51,,RAM +W: _OSCCAL=,0x51,,WRAM +R: _PORTA=0x39,,RAM +W: _PORTA=,0x3B,,WRAM +R: _PORTB=0x36,,RAM W: _PORTB=,0x38,WRAM -R: _Fanspeed=0x75,RAM -R: _FanOn=0x76,RAM -R: _FanOnNext=0x74,RAM -R: _FanOnNextCnt=0x72,RAM -R: _FanOnLast=0x73,RAM -R: _IRHashLast*2=0x7C,RAM,R2# -R: _SleepTimer=0x84,RAM +R: _Fanspeed=0x75,,RAM +R: _FanOn=0x76,,RAM +R: _FanOnNext=0x74,,RAM +R: _FanOnNextCnt=0x72,,RAM +R: _FanOnLast=0x73,,RAM +R: _IRHashLast*2=0x7C,,RAM2# +R: _SleepTimer=0x84,,RAM -R: _OutSpeedMax=0x87,RAM +R: _OutSpeedMax=0x87,,RAM W: _OutSpeedMax=,0x87,WRAM -R: _LED_Warning=0x6B,RAM +R: _LED_Warning=0x6B,,RAM W: _LED_Warning=,0x6B,WRAM -R: _ZeroCrossDelay*2=0x8E,RAM,R2 -W: _ZeroCrossDelay*2=,0x8E,WRAM,W2 -R: _PulseDelayAfterZero*2=0x9A,RAM,R2 -W: _PulseDelayAfterZero=,0x9A,WRAM,W2 -R: _PulseWidth*2=0x8C,RAM,R2 -W: _PulseWidth*2=,0x8C,WRAM,W2 - -W: Reset=,RESET,0xC1 - -S: Lamp=,0,0x40 -S: Fan=,1,0x40 -S: FanSpdUp=,2,0x40 -S: FanSpdDn=,3,0x40 -S: FanSpdSave=,4,0x40 -S: SetupIR=,5,0x40 +R: _ZeroCrossDelay*2=0x8E,,RAM2 +W: _ZeroCrossDelay*2=,0x8E,WRAM2 +R: _PulseDelayAfterZero*2=0x9A,,RAM2 +W: _PulseDelayAfterZero*2=,0x9A,WRAM2 +R: _PulseWidth*2=0x8C,,RAM +W: _PulseWidth*2=,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 SBatch: Fan Cooker Max: Fan=6 SBatch: Fan Cooker Min: Fan=4 diff --git a/Distr/nrf24batch/Kitchen Vent.txt b/Distr/nrf24batch/Kitchen Vent.txt index 0021f35d1e3..48533810544 100644 --- a/Distr/nrf24batch/Kitchen Vent.txt +++ b/Distr/nrf24batch/Kitchen Vent.txt @@ -9,16 +9,16 @@ Resend: 3 Delay_ms: 30 Payload struct: 2,1,1 -EEPROM=0; RAM=1; PROGMEM=2; ID=3; RESET=4; WRAM=0x89; R1=0xC1; R2=0xC2; W1=0x81; W2=0x82 +ROM=0x41;ROM2=0x42;WROM=0x81;WROM2=0x82;RAM=0x51;RAM2=0x52;WRAM=0x91;WRAM2=0x92;PGM=0x61;SET=0xC0 -R default: ,EEPROM,R1 -W default: n,,W1 -Write start: 0,0,0x8F +R default: ,,ROM +W default: n,,WROM +Write start: 0,0,0x2F -R: ID*=,ID +R: ID*=,0,0x65 -R: CO2 level*2[3]=i:4,,R2 -W: CO2 level*2=,i:4,W2 +R: CO2 level*2[3]=i:4,,ROM2 +W: CO2 level*2=,i:4,WROM2 R: Fan speeds=25 W: Fan speeds=,25 @@ -56,8 +56,8 @@ W: SpeedKeyIdx=,17 R: IRRemotes=32 W: IRRemotes=,32 -R: IRRemotesHash*2[70]=i:33,,R2# -W: IRRemotesHash*2=,i:33,W2 +R: IRRemotesHash*2[70]=i:33,,ROM2# +W: IRRemotesHash*2=,i:33,WROM2 R: OutPeriod=18 W: OutPeriod=,18 @@ -72,35 +72,35 @@ R: Ch=3 W: Ch=,3 R: OSCCAL_EMEM=0 -R: _OSCCAL=0x51,RAM +R: _OSCCAL=0x51,,RAM W: _OSCCAL=,0x51,WRAM -R: _PORTA=0x39,RAM +R: _PORTA=0x39,,RAM W: _PORTA=,0x3B,WRAM -R: _PORTB=0x36,RAM +R: _PORTB=0x36,,RAM W: _PORTB=,0x38,WRAM -R: _OutPeriod=0x8B,RAM +R: _OutPeriod=0x8B,,RAM W: _OutPeriod=,0x8B,WRAM -R: _Fanspeed=0x74,RAM -R: _FanOn=0x75,RAM -R: _FanOnNext=0x73,RAM -R: _FanOnNextCnt=0x71,RAM -R: _FanOnLast=0x72,RAM -R: _IRHashLast*2=0x79,RAM,R2# +R: _Fanspeed=0x74,,RAM +R: _FanOn=0x75,,RAM +R: _FanOnNext=0x73,,RAM +R: _FanOnNextCnt=0x71,,RAM +R: _FanOnLast=0x72,,RAM +R: _IRHashLast*2=0x79,,RAM2# -R: _LED Warning=0x6B,RAM +R: _LED Warning=0x6B,,RAM W: _LED Warning=,0x6B,WRAM -W: Reset=,RESET,0xC1 +W: Reset=0xEEEE,14,SET -S: Lamp=,0,0x40 -S: Fan=,1,0x40 -S: FanSpdUp=,2,0x40 -S: FanSpdDn=,3,0x40 -S: FanSpdSave=,4,0x40 -S: SetupIR=,5,0x40 +S: Lamp=,0,SET +S: Fan=,1,SET +S: FanSpdUp=,2,SET +S: FanSpdDn=,3,SET +S: FanSpdSave=,4,SET +S: SetupIR=,5,SET SBatch: Fan Cooker On: Fan=6 SBatch: Fan On: Fan=3