diff --git a/.vscode/arduino.json b/.vscode/arduino.json index d4b6514..d14354b 100644 --- a/.vscode/arduino.json +++ b/.vscode/arduino.json @@ -3,5 +3,5 @@ "port": "COM17", "prebuild": "if exist bin rd /s /q bin", "sketch": "IR-protocol.ino", - "configuration": "clock=25MHz,pnum=MAKET_F401RETX,upload_method=swdMethod,xserial=generic,usb=CDCgen,xusb=FS,opt=osstd,dbg=none,rtlib=nano" + "configuration": "clock=25MHz,pnum=MAKET_F401RETX,upload_method=dfuMethod,xserial=generic,usb=CDCgen,xusb=FS,opt=osstd,dbg=none,rtlib=nano" } \ No newline at end of file diff --git a/IR_Encoder.cpp b/IR_Encoder.cpp index 57d8f37..3dda9fb 100644 --- a/IR_Encoder.cpp +++ b/IR_Encoder.cpp @@ -77,10 +77,10 @@ void IR_Encoder::sendData(uint16_t addrTo, uint8_t dataByte, bool needAccept) } void IR_Encoder::sendData(uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept){ - sendData(id, addrTo, data, len, needAccept); + sendDataFULL(id, addrTo, data, len, needAccept); } -void IR_Encoder::sendData(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept) +void IR_Encoder::sendDataFULL(uint16_t addrFrom, uint16_t addrTo, uint8_t *data, uint8_t len, bool needAccept) { if (len > bytePerPack) { diff --git a/IR_Encoder.h b/IR_Encoder.h index 9145f68..0aaec2c 100644 --- a/IR_Encoder.h +++ b/IR_Encoder.h @@ -27,7 +27,7 @@ public: 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 addrFrom, uint16_t addrTo, uint8_t *data = nullptr, uint8_t len = 0, bool needAccept = false); + void sendDataFULL(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);