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

Compare commits

base: DashyFox:1ecc33e9c45954ddf77496bc2b13dca5314ed8fb
Branches Tags
DashyFox:main
DashyFox:STM32
DashyFox:STM32-opti-test
DashyFox:AVR-Point_Tester
DashyFox:RPI
DashyFox:dev-STM32
DashyFox:v1.0
..
compare: DashyFox:341ff3a470fc514b61fce1e9f21a2f976b544c85
Branches Tags
DashyFox:STM32
DashyFox:STM32-opti-test
DashyFox:main
DashyFox:AVR-Point_Tester
DashyFox:RPI
DashyFox:dev-STM32
DashyFox:v1.0

No commits in common. "1ecc33e9c45954ddf77496bc2b13dca5314ed8fb" and "341ff3a470fc514b61fce1e9f21a2f976b544c85" have entirely different histories.
1ecc33e9c4 ... 341ff3a470

2 changed files with 4 additions and 10 deletions
Show Stats Expand all files Collapse all files

10
IR_Encoder.cpp
View File

@ -76,11 +76,7 @@ void IR_Encoder::sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept)
sendData(addrTo, &dataByte, 1, needAccept); sendData(addrTo, &dataByte, 1, needAccept);
} }
void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept){ void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept)
sendData(id, addrTo, data, len, needAccept);
}
void IR_Encoder::sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept)
{ {
if (len > bytePerPack) if (len > bytePerPack)
{ {
@ -97,8 +93,8 @@ void IR_Encoder::sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uin
sendBuffer[0] = msgType; sendBuffer[0] = msgType;
// addr_self // addr_self
sendBuffer[1] = addrFrom >> 8 & 0xFF; sendBuffer[1] = id >> 8 & 0xFF;
sendBuffer[2] = addrFrom & 0xFF; sendBuffer[2] = id & 0xFF;
// addr_to // addr_to
sendBuffer[3] = addrTo >> 8 & 0xFF; sendBuffer[3] = addrTo >> 8 & 0xFF;

4
IR_Encoder.h
View File

@ -10,7 +10,7 @@ class IR_Encoder : public IR_FOX
public: public:
private: private:
// uint16_t id; /// @brief Адрес передатчика uint16_t id; /// @brief Адрес передатчика
public: public:
/// @brief Класс передатчика /// @brief Класс передатчика
/// @param addr Адрес передатчика /// @param addr Адрес передатчика
@ -27,8 +27,6 @@ public:
void sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept = false); void sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept = false);
void sendData(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false); void sendData(uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
void sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false);
void sendAccept(uint16_t addrTo, uint8_t customByte = 0); void sendAccept(uint16_t addrTo, uint8_t customByte = 0);
void sendRequest(uint16_t addrTo); void sendRequest(uint16_t addrTo);