Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-01 03:04:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Update lora_e220.cpp

Browse source
This commit is contained in:
Daniël Koek 2024-01-31 18:11:44 +00:00
parent 474f03e707
commit 53e41d37e2
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
esphome/components/ebyte_lora_e220/lora_e220.cpp
View file

@ -503,7 +503,7 @@ state_naming::ResponseStructContainer LoRa_E220::receiveMessageComplete(const ui
if (rssiEnabled) { if (rssiEnabled) {
char rssi[1]; char rssi[1];
this->serialDef.stream->readBytes(rssi, 1); this->serial->read_bytes(rssi, 1);
rc.rssi = rssi[0]; rc.rssi = rssi[0];
} }
this->cleanUARTBuffer(); this->cleanUARTBuffer();
@ -522,7 +522,7 @@ ResponseStatus LoRa_E220::sendMessage(const void *message, const uint8_t size) {
ResponseStatus LoRa_E220::sendMessage(const std::string message) { ResponseStatus LoRa_E220::sendMessage(const std::string message) {
ESP_LOGD(TAG, "Send message: "); ESP_LOGD(TAG, "Send message: ");
ESP_LOGD(TAG, message); ESP_LOGD(TAG, message);
byte size = message.length(); // sizeof(message.c_str())+1; uint8_t size = message.length(); // sizeof(message.c_str())+1;
ESP_LOGD(TAG, " size: "); ESP_LOGD(TAG, " size: ");
ESP_LOGD(TAG, "%d", size); ESP_LOGD(TAG, "%d", size);
char messageFixed[size]; char messageFixed[size];
@ -538,20 +538,20 @@ ResponseStatus LoRa_E220::sendMessage(const std::string message) {
return status; return status;
} }
ResponseStatus LoRa_E220::sendFixedMessage(byte ADDH, byte ADDL, byte CHAN, const std::string message) { ResponseStatus LoRa_E220::sendFixedMessage(uint8_t ADDH, uint8_t ADDL, uint8_t CHAN, const std::string message) {
byte size = message.length(); uint8_t size = message.length();
char messageFixed[size]; char messageFixed[size];
memcpy(messageFixed, message.c_str(), size); memcpy(messageFixed, message.c_str(), size);
return this->sendFixedMessage(ADDH, ADDL, CHAN, (uint8_t *) messageFixed, size); return this->sendFixedMessage(ADDH, ADDL, CHAN, (uint8_t *) messageFixed, size);
} }
ResponseStatus LoRa_E220::sendBroadcastFixedMessage(byte CHAN, const std::string message) { ResponseStatus LoRa_E220::sendBroadcastFixedMessage(uint8_t CHAN, const std::string message) {
return this->sendFixedMessage(state_naming::BROADCAST_ADDRESS, state_naming::BROADCAST_ADDRESS, CHAN, message); return this->sendFixedMessage(state_naming::BROADCAST_ADDRESS, state_naming::BROADCAST_ADDRESS, CHAN, message);
} }
typedef struct fixedStransmission { typedef struct fixedStransmission {
byte ADDH = 0; uint8_t ADDH = 0;
byte ADDL = 0; uint8_t ADDL = 0;
byte CHAN = 0; uint8_t CHAN = 0;
unsigned char message[]; unsigned char message[];
} FixedStransmission; } FixedStransmission;
@ -560,7 +560,8 @@ FixedStransmission *init_stack(int m) {
return st; return st;
} }
ResponseStatus LoRa_E220::sendFixedMessage(byte ADDH, byte ADDL, byte CHAN, const void *message, const uint8_t size) { ResponseStatus LoRa_E220::sendFixedMessage(uint8_t ADDH, uint8_t ADDL, uint8_t CHAN, const void *message,
const uint8_t size) {
ESP_LOGD(TAG, ADDH); ESP_LOGD(TAG, ADDH);
FixedStransmission *fixedStransmission = init_stack(size); FixedStransmission *fixedStransmission = init_stack(size);
fixedStransmission->ADDH = ADDH; fixedStransmission->ADDH = ADDH;
@ -581,8 +582,8 @@ ConfigurationMessage *init_stack_conf(int m) {
return st; return st;
} }
ResponseStatus LoRa_E220::sendConfigurationMessage(byte ADDH, byte ADDL, byte CHAN, Configuration *configuration, ResponseStatus LoRa_E220::sendConfigurationMessage(uint8_t ADDH, uint8_t ADDL, uint8_t CHAN,
PROGRAM_COMMAND programCommand) { Configuration *configuration, PROGRAM_COMMAND programCommand) {
ResponseStatus rc; ResponseStatus rc;
configuration->COMMAND = programCommand; configuration->COMMAND = programCommand;
@ -602,7 +603,7 @@ ResponseStatus LoRa_E220::sendConfigurationMessage(byte ADDH, byte ADDL, byte CH
return rc; return rc;
} }
ResponseStatus LoRa_E220::sendBroadcastFixedMessage(byte CHAN, const void *message, const uint8_t size) { ResponseStatus LoRa_E220::sendBroadcastFixedMessage(uint8_t CHAN, const void *message, const uint8_t size) {
return this->sendFixedMessage(0xFF, 0xFF, CHAN, message, size); return this->sendFixedMessage(0xFF, 0xFF, CHAN, message, size);
} }