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

Class Out back to Decoder.h

Browse Source
This commit is contained in:
DashyFox 2024-02-21 12:41:11 +03:00
parent 024888e841
commit f007e2cf6e
2 changed files with 152 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
IR_Decoder.h
View File

@ -1,6 +1,5 @@
#pragma once #pragma once
#include "IR_config.h" #include "IR_config.h"
#include "IR_Output.h"
//#define IRDEBUG //#define IRDEBUG
@ -26,13 +25,161 @@
class IR_Encoder; class IR_Encoder;
class IR_Decoder : private IR_FOX { class IR_Decoder : private IR_FOX {
friend IR_Encoder; friend IR_Encoder;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
class IDataPack : protected IR_FOX {
friend IR_Decoder;
public:
IDataPack(IR_Decoder* dec) : dec(dec) {};
public:
bool avaliable() { return isAvaliable; };
uint8_t getMsgInfo() { return msgPtr[0] & IR_MASK_MSG_INFO; };
uint8_t getMsgType() { return (msgPtr[0] >> 5) & IR_MASK_MSG_TYPE; };
uint8_t getMsgRAW() { return msgPtr[0]; };
uint16_t getErrorCount() { return err.all(); };
uint8_t getErrorLowSignal() { return err.lowSignal; };
uint8_t getErrorHighSignal() { return err.highSignal; };
uint8_t getErrorOther() { return err.other; };
// uint16_t getCrcIN() { return crcPtr[0] << 8 | crcPtr[1]; };
// uint16_t getCrcCALC() { return crcCalcVal; };
uint16_t getTunerTime() { return bitPeriod; };
void resetAvaliable() { isAvaliable = false; };
protected:
IR_Decoder* dec;
inline static uint8_t data[dataByteSizeMax] { 0 };
bool isAvaliable = false;
uint8_t* msgPtr = nullptr;
uint8_t* addrFromPtr = nullptr;
uint8_t* addrToPtr = nullptr;
uint8_t* dataPtr = nullptr;
uint8_t* crcPtr = nullptr;
ErrorsStruct err;
uint8_t packRawSize;
uint16_t bitPeriod;
uint16_t crcCalcVal;
virtual bool checkAddress(PackOutInfo* packInfo) {
bool ret;
uint8_t targetAddrOffset = packInfo->offsets.addrToOffset;
uint16_t address = (packInfo->ptr[targetAddrOffset] << 8) | (packInfo->ptr[targetAddrOffset + 1]);
checkaddressRuleApply(address, dec->id, ret);
return ret;
};
void set(PackOutInfo packInfo, bool isNeedAddressCheck) {
if (!isNeedAddressCheck || checkAddress(&packInfo)) {
onPackAddressCorrect(&packInfo);
#ifdef IRDEBUG_INFO
Serial.println(" OK ");
#endif
} else {
onPackAddressIncorrect(&packInfo);
#ifdef IRDEBUG_INFO
Serial.println(" NOT MY ");
#endif
}
}
virtual void onPackAddressCorrect(PackOutInfo* packInfo) {
memset(IDataPack::data, 0, dataByteSizeMax);
memcpy(data, packInfo->ptr, min(packInfo->packSize, dataByteSizeMax));
err = packInfo->err;
bitPeriod = packInfo->rTime;
crcCalcVal = packInfo->crc;
packRawSize = packInfo->packSize;
msgPtr = (data + packInfo->offsets.msgOffset);
addrFromPtr = (data + packInfo->offsets.addrFromOffset);
addrToPtr = (data + packInfo->offsets.addrToOffset);
dataPtr = (data + packInfo->offsets.dataOffset);
crcPtr = (data + packInfo->offsets.crcOffset);
isAvaliable = true;
}
virtual void onPackAddressIncorrect(PackOutInfo* packInfo) {}
};
//////////////////////////////////////////////////////////////////////////
class Data : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
uint16_t getAddrTo() { return addrToPtr[0] << 8 | addrToPtr[1]; };
uint8_t getDataSize() { return packRawSize - (msgBytes + addrBytes + addrBytes + crcBytes); };
uint8_t* getDataPrt() { return dataPtr; };
uint8_t getDataRawSize() { return packRawSize; };
uint8_t* getDataRawPtr() { return data; };
bool isNeedAccept() { return ((msgPtr[0] >> 5) & IR_MASK_MSG_TYPE) == IR_MSG_DATA_ACCEPT; };
};
// class RawData : public Data {
// };
class Accept : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
private:
bool checkAddress(PackOutInfo* packInfo) override {
bool ret;
uint8_t targetAddrOffset = packInfo->offsets.addrFromOffset;
uint16_t address = (packInfo->ptr[targetAddrOffset] << 8) | (packInfo->ptr[targetAddrOffset + 1]);
ret = address == dec->addrWaitingFrom;
return ret;
}
};
class Request : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
uint16_t getAddrTo() { return addrToPtr[0] << 8 | addrToPtr[1]; };
};
class RawTune {
friend IR_Decoder;
public:
bool avaliable() { return isAvaliable; };
uint16_t getTunerTime() { return bitPeriod; };
void resetAvaliable() { isAvaliable = false; };
protected:
bool isAvaliable;
uint16_t bitPeriod;
void set(uint16_t time) {
bitPeriod = time;
isAvaliable = true;
}
};
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
public: public:
uint16_t id; uint16_t id;
Data gotData = Data(&id); /// @brief Контейнер с данными Data gotData = Data(this); /// @brief Контейнер с данными
Data gotRawData = Data(&id); Data gotRawData = Data(this);
Accept gotAccept = Accept(&addrWaitingFrom); /// @brief Контейнер с подтверждением Accept gotAccept = Accept(this); /// @brief Контейнер с подтверждением
Request gotRequest = Request(&id); /// @brief Контейнер с запросом Request gotRequest = Request(this); /// @brief Контейнер с запросом
RawTune gotTune; /// @brief Контейнер с информацией подстройки RawTune gotTune; /// @brief Контейнер с информацией подстройки
const uint8_t isrPin; // Пин прерывания const uint8_t isrPin; // Пин прерывания

142
IR_Output.h
View File

@ -1,142 +0,0 @@
#pragma once
#include "IR_config.h"
class IR_Decoder;
class IDataPack : protected IR_FOX {
friend IR_Decoder;
public:
IDataPack(uint16_t* id) : id(id) {};
public:
bool avaliable() { return isAvaliable; };
uint8_t getMsgInfo() { return msgPtr[0] & IR_MASK_MSG_INFO; };
uint8_t getMsgType() { return (msgPtr[0] >> 5) & IR_MASK_MSG_TYPE; };
uint8_t getMsgRAW() { return msgPtr[0]; };
uint16_t getErrorCount() { return err.all(); };
uint8_t getErrorLowSignal() { return err.lowSignal; };
uint8_t getErrorHighSignal() { return err.highSignal; };
uint8_t getErrorOther() { return err.other; };
// uint16_t getCrcIN() { return crcPtr[0] << 8 | crcPtr[1]; };
// uint16_t getCrcCALC() { return crcCalcVal; };
uint16_t getTunerTime() { return bitPeriod; };
void resetAvaliable() { isAvaliable = false; };
protected:
uint16_t* id;
inline static uint8_t data[dataByteSizeMax] { 0 };
bool isAvaliable = false;
uint8_t* msgPtr = nullptr;
uint8_t* addrFromPtr = nullptr;
uint8_t* addrToPtr = nullptr;
uint8_t* dataPtr = nullptr;
uint8_t* crcPtr = nullptr;
ErrorsStruct err;
uint8_t packRawSize;
uint16_t bitPeriod;
uint16_t crcCalcVal;
virtual bool checkAddress(PackOutInfo* packInfo) {
bool ret;
uint8_t targetAddrOffset = packInfo->offsets.addrToOffset;
uint16_t address = (packInfo->ptr[targetAddrOffset] << 8) | (packInfo->ptr[targetAddrOffset + 1]);
checkaddressRuleApply(address, *id, ret);
return ret;
};
void set(PackOutInfo packInfo, bool isNeedAddressCheck) {
if (!isNeedAddressCheck || checkAddress(&packInfo)) {
onPackAddressCorrect(&packInfo);
#ifdef IRDEBUG_INFO
Serial.println(" OK ");
#endif
} else {
onPackAddressIncorrect(&packInfo);
#ifdef IRDEBUG_INFO
Serial.println(" NOT MY ");
#endif
}
}
virtual void onPackAddressCorrect(PackOutInfo* packInfo) {
memset(IDataPack::data, 0, dataByteSizeMax);
memcpy(data, packInfo->ptr, min(packInfo->packSize, dataByteSizeMax));
err = packInfo->err;
bitPeriod = packInfo->rTime;
crcCalcVal = packInfo->crc;
packRawSize = packInfo->packSize;
msgPtr = (data + packInfo->offsets.msgOffset);
addrFromPtr = (data + packInfo->offsets.addrFromOffset);
addrToPtr = (data + packInfo->offsets.addrToOffset);
dataPtr = (data + packInfo->offsets.dataOffset);
crcPtr = (data + packInfo->offsets.crcOffset);
isAvaliable = true;
}
virtual void onPackAddressIncorrect(PackOutInfo* packInfo) {}
};
//////////////////////////////////////////////////////////////////////////
class Data : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
uint16_t getAddrTo() { return addrToPtr[0] << 8 | addrToPtr[1]; };
uint8_t getDataSize() { return packRawSize - (msgBytes + addrBytes + addrBytes + crcBytes); };
uint8_t* getDataPrt() { return dataPtr; };
uint8_t getDataRawSize() { return packRawSize; };
uint8_t* getDataRawPtr() { return data; };
bool isNeedAccept() { return ((msgPtr[0] >> 5) & IR_MASK_MSG_TYPE) == IR_MSG_DATA_ACCEPT; };
};
// class RawData : public Data {
// };
class Accept : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
private:
bool checkAddress(PackOutInfo* packInfo) override {
bool ret;
uint8_t targetAddrOffset = packInfo->offsets.addrFromOffset;
uint16_t address = (packInfo->ptr[targetAddrOffset] << 8) | (packInfo->ptr[targetAddrOffset + 1]);
ret = address == *id;
return ret;
}
};
class Request : public IDataPack {
using IDataPack::IDataPack;
public:
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
uint16_t getAddrTo() { return addrToPtr[0] << 8 | addrToPtr[1]; };
};
class RawTune {
friend IR_Decoder;
public:
bool avaliable() { return isAvaliable; };
uint16_t getTunerTime() { return bitPeriod; };
void resetAvaliable() { isAvaliable = false; };
protected:
bool isAvaliable;
uint16_t bitPeriod;
void set(uint16_t time) {
bitPeriod = time;
isAvaliable = true;
}
};