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

refactor

Browse Source
This commit is contained in:
DashyFox
2024-02-22 14:01:27 +03:00
parent 462c69ce96
commit 6f5bbac83c
9 changed files with 470 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
IR-Protocol.ino
View File

@ -1,4 +1,4 @@
#include "IR_Decoder.h"
#include "IR_DecoderRaw.h"
#include "IR_Encoder.h"
#include "TimerStatic.h"
#include "MemoryCheck.h"
@ -19,14 +19,12 @@
//////////////// Var /////////////////
IR_Decoder decForward(2, 555);
IR_Decoder decBackward(3, 777);
IR_DecoderRaw decForward(2, 555);
IR_DecoderRaw decBackward(3, 777);
IR_Decoder* blindFromForward [] { &decBackward };
IR_Encoder encForward(42, encForward_PIN, &decForward);
IR_Encoder encBackward(321, encBackward_PIN);
IR_Encoder encTree(325, A2);
IR_Encoder encForward(42, encForward_PIN, &decBackward);
// IR_Encoder encBackward(321, encBackward_PIN);
// IR_Encoder encTree(325, A2);
//////////////////////// Функции прерываний ////////////////////////
@ -41,13 +39,13 @@ void decBackwardISR() {
static uint8_t* portOut;
ISR(TIMER2_COMPA_vect) {
encForward.isr();
encBackward.isr();
// encBackward.isr();
// encTree.isr();
//TODO: Сделать выбор порта
*portOut = (*portOut & 0b11001111) |
(
encForward.ir_out_virtual << 5U
| encBackward.ir_out_virtual << 6U
// | encBackward.ir_out_virtual << 6U
// | encTree.ir_out_virtual << 2U
);
}
@ -179,7 +177,8 @@ void setup() {
encForward.setBlindDecoders(blindFromForward, sizeof(blindFromForward) / sizeof(IR_Decoder*));
IR_DecoderRaw* blindFromForward [] { &decForward, &decBackward };
encForward.setBlindDecoders(blindFromForward, sizeof(blindFromForward) / sizeof(IR_DecoderRaw*));
attachInterrupt(0, decForwardISR, CHANGE); // D2
@ -227,69 +226,64 @@ void loop() {
//test
void status(IR_Decoder& dec) {
// if (dec.gotTune.avaliable()) {
// Serial.print(" Tune "); Serial.print(&dec == &decForward ? "decForward" : (&dec == &decBackward ? "decBackward" : "??")); Serial.print(": ");
// Serial.println(dec.gotTune.getTune());
// Serial.println();
// dec.gotTune.resetAvaliable();
// }
IR_Decoder::AnyData* infoArr [] = { &dec.gotData, &dec.gotBackData };
for (auto&& obj : infoArr) {
if (obj->avaliable()) {
String str;
if (obj->getDataPrt()[1]) {
str += ("Data on pin "); str += (dec.isrPin); str += "\n";
uint8_t msg = obj->getMsgRAW();
str += (" MSG: ");
for (size_t i = 0; i < 8; i++) {
if (i == 3) str += " ";
str += (msg >> (7 - i)) & 1U;
}
str += "\n";
str += (" DATA SIZE: "); str += (obj->getDataSize()); str += "\n";
str += (" ADDRESS FROM: "); str += (obj->getAddrFrom()); str += "\n";
str += (" ADDRESS TO: "); str += (obj->getAddrTo()); str += "\n";
// str += (" CRC PACK: "); str += (obj->getCrcIN()); str += "\n";
// str += (" CRC CALC: "); str += (obj->getCrcCALC()); str += "\n";
str += "\n";
for (size_t i = 0; i < obj->getDataSize(); i++) {
switch (i) {
// case 0:
// str += (" ADDR: ");
// break;
// case 1:
// str += (" CMD: ");
// break;
default:
str += (" Data["); str += (i); str += ("]: ");
break;
}
str += (obj->getDataPrt()[i]); str += "\n";
}
str += ("\n*******ErrAll: "); str += (obj->getErrorCount()); str += "\n";
str += ("**ErrDistance: "); str += ((int)(obj->getErrorHighSignal() - obj->getErrorLowSignal())); str += "\n";
str += "\n";
} else {
str += ("SELF"); str += "\n";
str += "\n";
}
obj->resetAvaliable();
Serial.write(str.c_str());
}
void status(IR_DecoderRaw& dec) {
if (dec.available()) {
Serial.println("LOOP RAW DATA");
}
// IR_DecoderRaw::AnyData* infoArr [] = { &dec.gotData, &dec.gotBackData };
// for (auto&& obj : infoArr) {
// if (obj->available()) {
// String str;
// if (obj->getDataPrt()[1]) {
// str += ("Data on pin "); str += (dec.isrPin); str += "\n";
// uint8_t msg = obj->getMsgRAW();
// str += (" MSG: ");
// for (size_t i = 0; i < 8; i++) {
// if (i == 3) str += " ";
// str += (msg >> (7 - i)) & 1U;
// }
// str += "\n";
// str += (" DATA SIZE: "); str += (obj->getDataSize()); str += "\n";
// str += (" ADDRESS FROM: "); str += (obj->getAddrFrom()); str += "\n";
// str += (" ADDRESS TO: "); str += (obj->getAddrTo()); str += "\n";
// // str += (" CRC PACK: "); str += (obj->getCrcIN()); str += "\n";
// // str += (" CRC CALC: "); str += (obj->getCrcCALC()); str += "\n";
// str += "\n";
// for (size_t i = 0; i < obj->getDataSize(); i++) {
// switch (i) {
// // case 0:
// // str += (" ADDR: ");
// // break;
// // case 1:
// // str += (" CMD: ");
// // break;
// default:
// str += (" Data["); str += (i); str += ("]: ");
// break;
// }
// str += (obj->getDataPrt()[i]); str += "\n";
// }
// str += ("\n*******ErrAll: "); str += (obj->getErrorCount()); str += "\n";
// str += ("**ErrDistance: "); str += ((int)(obj->getErrorHighSignal() - obj->getErrorLowSignal())); str += "\n";
// str += "\n";
// } else {
// str += ("SELF"); str += "\n";
// str += "\n";
// }
// obj->resetAvailable();
// Serial.write(str.c_str());
// }
// }
}