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

refactor

Browse Source
This commit is contained in:
DashyFox
2024-02-20 15:00:00 +03:00
parent e4aa7b47c5
commit 27dd448cb0
4 changed files with 192 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

182
IR_Output.h
View File

@ -4,130 +4,126 @@ class IR_Decoder;
class IDataPack : protected IR_FOX {
friend IR_Decoder;
protected:
inline static uint8_t data[dataByteSizeMax]{0};
bool isAvaliable = false;
void* msgPtr = nullptr;
void* addrFromPtr = nullptr;
void* addrToPtr = nullptr;
void* dataPtr = nullptr;
void* crcPtr = nullptr;
uint8_t msgByte = 0;
uint8_t packRawSize = 0; // полная длина пакета
ErrorsStruct err;
uint16_t bitPeriod = 0;
uint16_t crcPackVal = 0;
uint16_t crcCalcVal = 0;
///////////// смещения ////////////////
uint8_t crcOffset;
//переопределяемые дочерними классами//
uint8_t msgOffset;
uint8_t addrFromOffset;
uint8_t addrToOffset;
uint8_t dataOffset;
//////////////////////////////////////
void set(uint8_t* ptr, uint8_t len, uint16_t crc, ErrorsStruct err, uint16_t rTime) {
memset(IDataPack::data, 0, dataByteSizeMax);
memcpy(data, ptr, min(len, dataByteSizeMax));
packRawSize = len;
bitPeriod = rTime;
err = err;
crcCalcVal = crc;
crcOffset = packRawSize - crcBytes;
msgByte = *(uint8_t*)msgPtr;
isAvaliable = true;
msgPtr = (data + msgOffset);
addrFromPtr = (data + addrFromOffset);
addrToPtr = (data + addrToOffset);
dataPtr = (data + dataOffset);
crcPtr = (data + crcOffset);
}
public:
IDataPack(uint16_t id) : id(id) {};
public:
bool avaliable() { return isAvaliable; };
uint8_t getMsgInfo() { return msgByte & IR_MASK_MSG_INFO; };
uint8_t getMsgType() { return (msgByte >> 5) & IR_MASK_MSG_TYPE; };
uint8_t getMsgRAW() { return msgByte; };
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) { return true; };
void set(PackOutInfo packInfo) {
if (checkAddress(&packInfo)) {
onPackAddressCorrect(&packInfo);
} else {
onPackAddressIncorrect(&packInfo);
}
}
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:
Data() {
msgOffset = 0;
addrFromOffset = 1;
addrToOffset = 3;
dataOffset = 5;
}
public:
uint16_t getAddrFrom() { return *(uint16_t*)addrFromPtr; };
uint16_t getAddrTo() { return *(uint16_t*)addrToPtr; };
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 (uint8_t*)dataPtr; };
uint8_t* getDataPrt() { return dataPtr; };
uint8_t getDataRawSize() { return packRawSize; };
uint8_t* getDataRawPtr() { return data; };
uint16_t getCrcIN() { return *(uint16_t*)crcPtr; };
uint16_t getCrcCALC() { return crcCalcVal; };
bool isNeedAccept() { return ((msgByte >> 5) & IR_MASK_MSG_TYPE) == IR_MSG_DATA_ACCEPT; };
~Data() {};
bool isNeedAccept() { return ((msgPtr[0] >> 5) & IR_MASK_MSG_TYPE) == IR_MSG_DATA_ACCEPT; };
private:
bool checkAddress(PackOutInfo* packInfo) override {
bool ret;
uint8_t addrOffset = packInfo->offsets.addrToOffset;
uint16_t address = (packInfo->ptr[addrOffset] << 8) | (packInfo->ptr[addrOffset + 1]);
checkaddressRuleApply(address, id, ret);
return ret;
}
};
// class RawData : public Data {
// };
class Accept : public IDataPack {
using IDataPack::IDataPack;
public:
Accept() {
msgOffset = 0;
addrFromOffset = 1;
}
uint16_t getAddrFrom() { return *(uint16_t*)addrFromPtr; };
uint16_t getCrcIN() { return *(uint16_t*)crcPtr; };
uint16_t getCrcCALC() { return crcCalcVal; };
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
};
class Request : public IDataPack {
using IDataPack::IDataPack;
public:
Request() {
msgOffset = 0;
addrFromOffset = 1;
addrToOffset = 3;
}
uint16_t getAddrFrom() { return *(uint16_t*)addrFromPtr; };
uint16_t getAddrTo() { return *(uint16_t*)addrToPtr; };
uint16_t getCrcIN() { return *(uint16_t*)crcPtr; };
uint16_t getCrcCALC() { return crcCalcVal; };
uint16_t getAddrFrom() { return addrFromPtr[0] << 8 | addrFromPtr[1]; };
uint16_t getAddrTo() { return addrToPtr[0] << 8 | addrToPtr[1]; };
};
class RawTune : public IDataPack {
class RawTune {
friend IR_Decoder;
public:
RawTune() {
msgOffset = 0;
}
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;
}
};