refactor working

This commit is contained in:
2024-02-26 11:38:35 +03:00
parent e35bf7ae23
commit 1dc702f05d
5 changed files with 128 additions and 121 deletions

View File

@ -230,58 +230,56 @@ void status(IR_Decoder& dec) {
// 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";
if (dec.gotData.available()) {
String str;
if (/* dec.gotData.getDataPrt()[1] */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;
// }
uint8_t msg = dec.gotData.getMsgRAW();
str += (" MSG: ");
for (size_t i = 0; i < 8; i++) {
if (i == 3) str += " ";
str += (msg >> (7 - i)) & 1U;
}
// str += "\n";
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";
str += (" DATA SIZE: "); str += (dec.gotData.getDataSize()); str += "\n";
str += (" ADDRESS FROM: "); str += (dec.gotData.getAddrFrom()); str += "\n";
str += (" ADDRESS TO: "); str += (dec.gotData.getAddrTo()); str += "\n";
// str += (" CRC PACK: "); str += (dec.gotData.getCrcIN()); str += "\n";
// str += (" CRC CALC: "); str += (dec.gotData.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;
for (size_t i = 0; i < min(10, dec.gotData.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";
// }
default:
str += (" Data["); str += (i); str += ("]: ");
break;
}
str += (dec.gotData.getDataPrt()[i]); str += "\n";
}
// str += ("\n*******ErrAll: "); str += (obj->getErrorCount()); str += "\n";
// str += ("**ErrDistance: "); str += ((int)(obj->getErrorHighSignal() - obj->getErrorLowSignal())); str += "\n";
str += ("\n*******ErrAll: "); str += (dec.gotData.getErrorCount()); str += "\n";
str += ("**ErrDistance: "); str += ((int)(dec.gotData.getErrorHighSignal() - dec.gotData.getErrorLowSignal())); str += "\n";
// str += "\n";
// } else {
// str += ("SELF"); str += "\n";
// str += "\n";
// }
// obj->resetAvailable();
// Serial.write(str.c_str());
// }
// }
str += "\n";
} else {
str += ("SELF"); str += "\n";
str += "\n";
}
// obj->resetAvailable();
Serial.write(str.c_str());
}
}