Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RF Control Update 

Changed arguments for add() method from int to uint8_t.   Updated pulse train figure.
This commit is contained in:
Gregg 2020-11-27 10:24:03 -06:00
parent b1b4389963
commit cefc1df399
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/images/pulseTrain.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
documents/SetupCodes.key
View File

Binary file not shown.

8
src/extras/RFControl.cpp
View File

@ -31,11 +31,11 @@ RFControl::RFControl(int pin){
/////////////////// ///////////////////
void RFControl::start(int _numCycles, int tickTime){ void RFControl::start(uint8_t _numCycles, uint8_t tickTime){
pRMT[pCount]=0; // load end-marker (zero bytes) into RMT memory pRMT[pCount]=0; // load end-marker (zero bytes) into RMT memory
REG_WRITE(GPIO_ENABLE_W1TS_REG,1<<pin); // enable output on pin REG_WRITE(GPIO_ENABLE_W1TS_REG,1<<pin); // enable output on pin
numCycles=_numCycles; // set number of cycles to repeat transmission numCycles=_numCycles; // set number of cycles to repeat transmission
REG_SET_FIELD(RMT_CH0CONF0_REG,RMT_DIV_CNT_CH0,tickTime); // set one tick = 1 microsecond * tickTime (RMT will be set to use 1 MHz REF_TICK, not 80 MHz APB_CLK) REG_SET_FIELD(RMT_CH0CONF0_REG,RMT_DIV_CNT_CH0,tickTime); // set one tick = 1 microsecond * tickTime (RMT will be set to use 1 MHz REF_TICK, not 80 MHz APB_CLK)
REG_WRITE(RMT_CH0CONF1_REG,0x0000000D); // use REF_TICK clock; reset xmit and receive memory address to start of channel; START TRANSMITTING! REG_WRITE(RMT_CH0CONF1_REG,0x0000000D); // use REF_TICK clock; reset xmit and receive memory address to start of channel; START TRANSMITTING!
while(numCycles); // wait while transmission in progress while(numCycles); // wait while transmission in progress
REG_WRITE(GPIO_ENABLE_W1TC_REG,1<<pin); // disable output on pin REG_WRITE(GPIO_ENABLE_W1TC_REG,1<<pin); // disable output on pin
@ -52,11 +52,11 @@ void RFControl::clear(){
void RFControl::add(uint16_t onTime, uint16_t offTime){ void RFControl::add(uint16_t onTime, uint16_t offTime){
if(pCount==511){ // maximum number of pulses reached (saving one space for end-marker) if(pCount==511){ // maximum number of pulses reached (saving one space for end-marker)
Serial.println("\n*** ERROR: Can't add more than 511 pulses to RF Control Module\n\n"); Serial.print("\n*** ERROR: Can't add more than 511 pulses to RF Control Module\n\n");
} else } else
if(offTime>32767 || onTime>32767){ if(offTime>32767 || onTime>32767){
Serial.println("\n*** ERROR: Request to add RF Control pulse with ON or OFF time exceeds 32767 maximum allowed number of ticks\n\n"); Serial.print("\n*** ERROR: Request to add RF Control pulse with ON or OFF time exceeds 32767 maximum allowed number of ticks\n\n");
} else { } else {
pRMT[pCount++]=(offTime<<16)+onTime+(1<<15); // load pulse information into RMT memory and increment pointer pRMT[pCount++]=(offTime<<16)+onTime+(1<<15); // load pulse information into RMT memory and increment pointer

2
src/extras/RFControl.h
View File

@ -16,7 +16,7 @@ class RFControl {
RFControl(int pin); // creates transmitter on pin RFControl(int pin); // creates transmitter on pin
static void clear(); // clears transmitter memory static void clear(); // clears transmitter memory
static void add(uint16_t onTime, uint16_t offTime); // adds pulse of onTime ticks HIGH followed by offTime ticks LOW static void add(uint16_t onTime, uint16_t offTime); // adds pulse of onTime ticks HIGH followed by offTime ticks LOW
void start(int _numCycles, int tickTime=1); // starts transmission of pulses, repeated for numCycles, where each tick in pulse is tickTime microseconds long void start(uint8_t _numCycles, uint8_t tickTime=1); // starts transmission of pulses, repeated for numCycles, where each tick in pulse is tickTime microseconds long
}; };