DashyFox/IR-protocol
1
0
Fork 0
mirror of https://github.com/Show-maket/IR-protocol.git synced 2025-05-03 23:00:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6 from Show-maket/STM32-opti-test

Browse Source 
Stm32 opti test
This commit is contained in:
DashyFox 2025-03-06 17:07:13 +03:00 committed by GitHub
commit d0c3138c52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 78 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
IR_Encoder.cpp
View File

@ -5,11 +5,8 @@
#define ISR_Out 10
#define TestOut 13
std::list<IR_Encoder *> &IR_Encoder::get_enc_list() // определение функции
{
static std::list<IR_Encoder *> dec_list; // статическая локальная переменная
return dec_list; // возвращается ссылка на переменную
}
IR_Encoder *IR_Encoder::head = nullptr;
IR_Encoder *IR_Encoder::last = nullptr;
IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool autoHandle)
{
@ -32,45 +29,88 @@ IR_Encoder::IR_Encoder(uint8_t pin, uint16_t addr, IR_DecoderRaw *decPair, bool
if (autoHandle)
{
get_enc_list().push_back(this);
if (IR_Encoder::head == nullptr)
{
IR_Encoder::head = this;
}
if (last != nullptr)
{
last->next = this;
}
last = this;
}
};
HardwareTimer* IR_Encoder::IR_Timer = nullptr;
HardwareTimer IR_Encoder::IR_Timer;
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 Encoder_ISR(){
// IR_Encoder::isr();
// }
void IR_Encoder::begin(HardwareTimer timer, uint8_t channel, IRQn_Type IRQn){
//TODO: check std::bind isr func
// IR_Timer = timer;
// IR_Timer.setOverflow(carrierFrec * 2, HERTZ_FORMAT);
// IR_Timer.attachInterrupt(channel, Encoder_ISR);
// NVIC_SetPriority(IRQn, 0);
// IR_Timer.resume();
void IR_Encoder::begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)()){
IR_Timer = timer;
if(IR_Timer == nullptr) return;
IR_Timer->setOverflow(carrierFrec * 2, HERTZ_FORMAT);
IR_Timer->attachInterrupt(channel, (isrCallback == nullptr ? IR_Encoder::isr : isrCallback));
NVIC_SetPriority(IRQn, priority);
IR_Timer->resume();
}
void IR_Encoder::enable()
{
auto &enc_list = get_enc_list();
if (std::find(enc_list.begin(), enc_list.end(), this) == enc_list.end())
bool exist = false;
IR_Encoder *current = IR_Encoder::head;
while (current != nullptr)
{
enc_list.push_back(this);
exist = (current == this);
if (exist) break;
current = current->next;
}
if (!exist)
{
if (IR_Encoder::head == nullptr)
{
IR_Encoder::head = this;
last = this;
}
else
{
last->next = this;
last = this;
}
this->next = nullptr; // Указываем, что следующий за этим элементом — nullptr
}
pinMode(pin, OUTPUT);
}
void IR_Encoder::disable()
{
auto &enc_list = get_enc_list();
auto it = std::find(enc_list.begin(), enc_list.end(), this);
if (it != enc_list.end())
IR_Encoder *current = IR_Encoder::head;
IR_Encoder *prev = nullptr;
while (current != nullptr)
{
enc_list.erase(it);
if (current == this) break;
prev = current;
current = current->next;
}
if (current != nullptr) // Элемент найден в списке
{
if (prev != nullptr)
{
prev->next = current->next; // Убираем текущий элемент из списка
}
else
{
IR_Encoder::head = current->next; // Удаляемый элемент был первым
}
if (current == last)
{
last = prev; // Если удаляется последний элемент, обновляем last
}
}
pinMode(pin, INPUT);
}
@ -84,10 +124,7 @@ void IR_Encoder::setBlindDecoders(IR_DecoderRaw *decoders[], uint8_t count)
blindDecoders = decoders;
}
IR_Encoder::~IR_Encoder()
{
get_enc_list().remove(this);
};
IR_Encoder::~IR_Encoder(){};
void IR_Encoder::sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept)
{
@ -287,10 +324,11 @@ void IR_Encoder::rawSend(uint8_t *ptr, uint8_t len)
void IR_Encoder::isr()
{
// Serial.println(get_enc_list().size());
for (const auto &element : get_enc_list())
IR_Encoder *current = IR_Encoder::head;
while (current != nullptr)
{
element->_isr();
current->_isr();
current = current->next;
}
}

13
IR_Encoder.h
View File

@ -7,9 +7,11 @@ class IR_DecoderRaw;
class IR_Encoder : public IR_FOX
{
friend IR_DecoderRaw;
static IR_Encoder *head;
static IR_Encoder *last;
IR_Encoder *next;
public:
static HardwareTimer IR_Timer;
static HardwareTimer* IR_Timer;
private:
// uint16_t id; /// @brief Адрес передатчика
public:
@ -19,7 +21,7 @@ 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 void begin(HardwareTimer* timer, uint8_t channel, IRQn_Type IRQn, uint8_t priority, void(*isrCallback)() = nullptr);
static HardwareTimer* get_IR_Timer();
void enable();
@ -44,10 +46,9 @@ public:
~IR_Encoder();
volatile bool ir_out_virtual;
private:
static std::list<IR_Encoder*>& get_enc_list();
void _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len);
void _isr();
private:
void _sendBack(bool isAdressed, uint16_t addrTo, uint8_t *data, uint8_t len);
void setDecoder_isSending();
void sendByte(uint8_t byte, bool *prev, bool LOW_FIRST);