diff --git a/IR_Decoder.cpp b/IR_Decoder.cpp index 63d4d7a..a8d5035 100644 --- a/IR_Decoder.cpp +++ b/IR_Decoder.cpp @@ -23,12 +23,14 @@ void IR_Decoder::enable() { dec_list.push_back(this); } + pinMode(pin, INPUT_PULLUP); attachInterrupt(pin, (*this)(), CHANGE); } void IR_Decoder::disable() { detachInterrupt(pin); + pinMode(pin, INPUT); auto &dec_list = get_dec_list(); auto it = std::find(dec_list.begin(), dec_list.end(), this); if (it != dec_list.end()) diff --git a/IR_Encoder.cpp b/IR_Encoder.cpp index 3dda9fb..11af94e 100644 --- a/IR_Encoder.cpp +++ b/IR_Encoder.cpp @@ -29,7 +29,6 @@ IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool { decPair->encoder = this; } - pinMode(pin, OUTPUT); if (autoHandle) { @@ -37,6 +36,19 @@ IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool } }; +HardwareTimer IR_Encoder::IR_Timer; + +inline HardwareTimer* IR_Encoder::get_IR_Timer(){return &IR_Encoder::IR_Timer;} + +void IR_Encoder::begin(HardwareTimer timer, uint8_t channel, IRQn_Type IRQn){ + IR_Timer = timer; + IR_Timer.setOverflow(carrierFrec * 2, HERTZ_FORMAT); + IR_Timer.attachInterrupt(channel, IR_Encoder::isr); + NVIC_SetPriority(IRQn, 0); + IR_Timer.resume(); +} + + void IR_Encoder::enable() { auto &enc_list = get_enc_list(); @@ -44,6 +56,8 @@ void IR_Encoder::enable() { enc_list.push_back(this); } + pinMode(pin, OUTPUT); + } void IR_Encoder::disable() @@ -54,6 +68,7 @@ void IR_Encoder::disable() { enc_list.erase(it); } + pinMode(pin, INPUT); } void IR_Encoder::setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count) diff --git a/IR_Encoder.h b/IR_Encoder.h index 0aaec2c..0540fae 100644 --- a/IR_Encoder.h +++ b/IR_Encoder.h @@ -9,6 +9,7 @@ class IR_Encoder : public IR_FOX friend IR_DecoderRaw; public: + static HardwareTimer IR_Timer; private: // uint16_t id; /// @brief Адрес передатчика public: @@ -18,6 +19,8 @@ public: /// @param decPair Приёмник, для которого отключается приём в момент передачи передатчиком IR_Encoder(uint8_t pin, uint16_t addr = 0, IR_DecoderRaw *decPair = nullptr, bool autoHandle = true); static void isr(); + static void begin(HardwareTimer IR_Timer, uint8_t channel, IRQn_Type IRQn); + static HardwareTimer* get_IR_Timer(); void enable(); void disable(); diff --git a/IR_config.cpp b/IR_config.cpp index 7acf1bc..9ddae25 100644 --- a/IR_config.cpp +++ b/IR_config.cpp @@ -4,7 +4,6 @@ void IR_FOX::setPin(uint8_t pin){ this->pin = pin; port = digitalPinToPort(pin); mask = digitalPinToBitMask(pin); - pinMode(pin, INPUT_PULLUP); } void IR_FOX::checkAddressRuleApply(uint16_t address, uint16_t id, bool &flag)