Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-25 00:18:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Update lora_e220.cpp

Browse source
This commit is contained in:
Daniël Koek 2024-01-31 17:53:47 +00:00
parent d107d23439
commit 21e9d9bafc
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,22 +11,22 @@ LoRa_E220::LoRa_E220(esphome::uart::UARTDevice *serial, GPIOPin *auxPin, GPIOPin
} }
bool LoRa_E220::begin() { bool LoRa_E220::begin() {
ESP_LOGD(TAG, "AUX ---> "); ESP_LOGD(TAG, "AUX ---> ");
ESP_LOGD(TAG, this->auxPin); LOG_PIN(TAG, this->auxPin);
ESP_LOGD(TAG, "M0 ---> "); ESP_LOGD(TAG, "M0 ---> ");
ESP_LOGD(TAG, this->m0Pin); LOG_PIN(TAG, this->m0Pin);
ESP_LOGD(TAG, "M1 ---> "); ESP_LOGD(TAG, "M1 ---> ");
ESP_LOGD(TAG, this->m1Pin); LOG_PIN(TAG, this->m1Pin);
if (this->auxPin != -1) { if (this->auxPin != nullptr) {
this->m0Pin->pin_mode(gpio::FLAG_INPUT); this->m0Pin->pin_mode(gpio::FLAG_INPUT);
ESP_LOGD(TAG, "Init AUX pin!"); ESP_LOGD(TAG, "Init AUX pin!");
} }
if (this->m0Pin != -1) { if (this->m0Pin != nullptr) {
this->m0Pin->pin_mode(gpio::FLAG_OUTPUT); this->m0Pin->pin_mode(gpio::FLAG_OUTPUT);
ESP_LOGD(TAG, "Init M0 pin!"); ESP_LOGD(TAG, "Init M0 pin!");
this->m0Pin->digital_write(true); this->m0Pin->digital_write(true);
} }
if (this->m1Pin != -1) { if (this->m1Pin != nullptr) {
this->m0Pin->pin_mode(gpio::FLAG_OUTPUT); this->m0Pin->pin_mode(gpio::FLAG_OUTPUT);
ESP_LOGD(TAG, "Init M1 pin!"); ESP_LOGD(TAG, "Init M1 pin!");
this->m1Pin->digital_write(true); this->m1Pin->digital_write(true);
@ -45,7 +45,7 @@ a timeout is provided to avoid an infinite loop
*/ */
Status LoRa_E220::waitCompleteResponse(unsigned long timeout, unsigned int waitNoAux) { state_naming::Status LoRa_E220::waitCompleteResponse(unsigned long timeout, unsigned int waitNoAux) {
state_naming::Status result = state_naming::E220_SUCCESS; state_naming::Status result = state_naming::E220_SUCCESS;
unsigned long t = millis(); unsigned long t = millis();
@ -127,7 +127,7 @@ types each handle ints floats differently
*/ */
Status LoRa_E220::sendStruct(void *structureManaged, uint16_t size_) { state_naming::Status LoRa_E220::sendStruct(void *structureManaged, uint16_t size_) {
if (size_ > MAX_SIZE_TX_PACKET + 2) { if (size_ > MAX_SIZE_TX_PACKET + 2) {
return ERR_E220_PACKET_TOO_BIG; return ERR_E220_PACKET_TOO_BIG;
} }
@ -173,7 +173,7 @@ types each handle ints floats differently
*/ */
Status LoRa_E220::receiveStruct(void *structureManaged, uint16_t size_) { state_naming::Status LoRa_E220::receiveStruct(void *structureManaged, uint16_t size_) {
Status result = E220_SUCCESS; Status result = E220_SUCCESS;
uint8_t len = this->serialDef.stream->readBytes((uint8_t *) structureManaged, size_); uint8_t len = this->serialDef.stream->readBytes((uint8_t *) structureManaged, size_);
@ -206,7 +206,7 @@ method to set the mode (program, normal, etc.)
*/ */
Status LoRa_E220::setMode(MODE_TYPE mode) { state_naming::Status LoRa_E220::setMode(MODE_TYPE mode) {
// data sheet claims module needs some extra time after mode setting (2ms) // data sheet claims module needs some extra time after mode setting (2ms)
// most of my projects uses 10 ms, but 40ms is safer // most of my projects uses 10 ms, but 40ms is safer
@ -314,7 +314,7 @@ ResponseStructContainer LoRa_E220::getConfiguration() {
return rc; return rc;
} }
RESPONSE_STATUS LoRa_E220::checkUARTConfiguration(MODE_TYPE mode) { state_naming::RESPONSE_STATUS LoRa_E220::checkUARTConfiguration(MODE_TYPE mode) {
if (mode == MODE_3_PROGRAM) { if (mode == MODE_3_PROGRAM) {
return ERR_E220_WRONG_UART_CONFIG; return ERR_E220_WRONG_UART_CONFIG;
} }
@ -434,10 +434,10 @@ ResponseStatus LoRa_E220::resetModule() {
return status; return status;
} }
ResponseContainer LoRa_E220::receiveMessage() { return LoRa_E220::receiveMessageComplete(false); } state_naming::ResponseContainer LoRa_E220::receiveMessage() { return LoRa_E220::receiveMessageComplete(false); }
ResponseContainer LoRa_E220::receiveMessageRSSI() { return LoRa_E220::receiveMessageComplete(true); } state_naming::ResponseContainer LoRa_E220::receiveMessageRSSI() { return LoRa_E220::receiveMessageComplete(true); }
ResponseContainer LoRa_E220::receiveMessageComplete(bool rssiEnabled) { state_naming::ResponseContainer LoRa_E220::receiveMessageComplete(bool rssiEnabled) {
ResponseContainer rc; ResponseContainer rc;
rc.status.code = E220_SUCCESS; rc.status.code = E220_SUCCESS;
std::string buffer; std::string buffer;
@ -465,7 +465,7 @@ ResponseContainer LoRa_E220::receiveMessageComplete(bool rssiEnabled) {
return rc; return rc;
} }
ResponseContainer LoRa_E220::receiveInitialMessage(uint8_t size) { state_naming::ResponseContainer LoRa_E220::receiveInitialMessage(uint8_t size) {
ResponseContainer rc; ResponseContainer rc;
rc.status.code = E220_SUCCESS; rc.status.code = E220_SUCCESS;
char buff[size]; char buff[size];
@ -484,14 +484,14 @@ ResponseContainer LoRa_E220::receiveInitialMessage(uint8_t size) {
return rc; return rc;
} }
ResponseStructContainer LoRa_E220::receiveMessage(const uint8_t size) { state_naming::ResponseStructContainer LoRa_E220::receiveMessage(const uint8_t size) {
return LoRa_E220::receiveMessageComplete(size, false); return LoRa_E220::receiveMessageComplete(size, false);
} }
ResponseStructContainer LoRa_E220::receiveMessageRSSI(const uint8_t size) { state_naming::ResponseStructContainer LoRa_E220::receiveMessageRSSI(const uint8_t size) {
return LoRa_E220::receiveMessageComplete(size, true); return LoRa_E220::receiveMessageComplete(size, true);
} }
ResponseStructContainer LoRa_E220::receiveMessageComplete(const uint8_t size, bool rssiEnabled) { state_naming::ResponseStructContainer LoRa_E220::receiveMessageComplete(const uint8_t size, bool rssiEnabled) {
ResponseStructContainer rc; ResponseStructContainer rc;
rc.data = malloc(size); rc.data = malloc(size);