DashyFox/IR-protocol
1
0
Fork 0
mirror of https://github.com/Show-maket/IR-protocol.git synced 2026-03-13 04:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

carrierPauseIfIdle/carrierResume

Browse Source
This commit is contained in:
DashyFox
2026-02-06 16:06:23 +03:00
parent d1c84ba18a
commit 8a0d7f8dba
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
IR_Encoder.cpp
View File

@ -7,6 +7,7 @@
IR_Encoder *IR_Encoder::head = nullptr; IR_Encoder *IR_Encoder::head = nullptr;
IR_Encoder *IR_Encoder::last = nullptr; IR_Encoder *IR_Encoder::last = nullptr;
volatile bool IR_Encoder::carrierStopPending = false;
IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool autoHandle) IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool autoHandle)
{ {
@ -47,13 +48,34 @@ HardwareTimer* IR_Encoder::IR_Timer = nullptr;
inline HardwareTimer* IR_Encoder::get_IR_Timer(){return IR_Encoder::IR_Timer;} inline HardwareTimer* IR_Encoder::get_IR_Timer(){return IR_Encoder::IR_Timer;}
void IR_Encoder::carrierResume() {
if (IR_Timer != nullptr)
IR_Timer->resume();
}
void IR_Encoder::carrierPauseIfIdle() {
for (IR_Encoder *p = head; p != nullptr; p = p->next)
if (p->isSending)
return;
if (IR_Timer != nullptr)
IR_Timer->pause();
}
void IR_Encoder::tick() {
if (!carrierStopPending)
return;
carrierStopPending = false;
carrierPauseIfIdle();
}
void IR_Encoder::begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)()){ void IR_Encoder::begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)()){
IR_Timer = timer; IR_Timer = timer;
if(IR_Timer == nullptr) return; if(IR_Timer == nullptr) return;
IR_Timer->pause();
IR_Timer->setOverflow(carrierFrec * 2, HERTZ_FORMAT); IR_Timer->setOverflow(carrierFrec * 2, HERTZ_FORMAT);
IR_Timer->attachInterrupt(channel, (isrCallback == nullptr ? IR_Encoder::isr : isrCallback)); IR_Timer->attachInterrupt(channel, (isrCallback == nullptr ? IR_Encoder::isr : isrCallback));
NVIC_SetPriority(IRQn, priority); NVIC_SetPriority(IRQn, priority);
IR_Timer->resume(); IR_Timer->pause();
} }
@ -338,6 +360,7 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
{ {
return; return;
} }
IR_Encoder::carrierResume();
// Serial.println("START"); // Serial.println("START");
setDecoder_isSending(); setDecoder_isSending();
@ -397,6 +420,7 @@ void IR_Encoder::_isr()
isSending = false; isSending = false;
// Serial.println("STOP"); // Serial.println("STOP");
setDecoder_isSending(); setDecoder_isSending();
carrierStopPending = true;
// Serial.println(); // Serial.println();
return; return;
break; break;

5
IR_Encoder.h
View File

@ -32,6 +32,8 @@ public:
static void isr(); static void isr();
static void begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)() = nullptr); static void begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)() = nullptr);
static HardwareTimer* get_IR_Timer(); static HardwareTimer* get_IR_Timer();
/** Call from main loop/tick: if ISR requested carrier stop, pause timer here (not in ISR). */
static void tick();
void enable(); void enable();
void disable(); void disable();
@ -69,6 +71,9 @@ public:
void _isr(); void _isr();
private: private:
static volatile bool carrierStopPending;
static void carrierResume();
static void carrierPauseIfIdle();
IR_SendResult _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len); IR_SendResult _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len);
void setDecoder_isSending(); void setDecoder_isSending();