amikhalev/uas-ugv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix issues with error interpretation

Browse Source
This commit is contained in:
Alex Mikhalev 2019-01-23 19:26:27 -08:00
parent 0e537a39d1
commit a36caa53f1
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
main/e32_driver.cc
View File

@ -251,38 +251,31 @@ esp_err_t E32_Driver::WriteParams(const Params& params) {
return ESP_OK; return ESP_OK;
} }
esp_err_t E32_Driver::Write(Address address, Channel channel, int E32_Driver::Write(Address address, Channel channel,
const uint8_t* data, size_t data_size) { const uint8_t* data, size_t data_size) {
esp_err_t ret; int written;
if (params_.tx_mode == TxFixed) { if (params_.tx_mode == TxFixed) {
uint8_t header[3]; uint8_t header[3];
header[0] = address >> 8; header[0] = address >> 8;
header[1] = address & 0xFF; header[1] = address & 0xFF;
header[2] = channel; header[2] = channel;
ret = uart_write_bytes(config_.uart_port, (char*)header, sizeof(header)); written = uart_write_bytes(config_.uart_port, (char*)header, sizeof(header));
if (ret != ESP_OK) { if (written < 0) {
goto error; return written;
} }
} }
ret = uart_write_bytes(config_.uart_port, (char*)data, data_size); written = uart_write_bytes(config_.uart_port, (char*)data, data_size);
if (ret != ESP_OK) { return written;
goto error;
}
return ESP_OK;
error:
ESP_LOGE(TAG, "Write error %d", ret);
return ret;
} }
esp_err_t E32_Driver::Write(const uint8_t* data, size_t data_size) { int E32_Driver::Write(const uint8_t* data, size_t data_size) {
return Write(params_.address, params_.comm_channel, data, data_size); return Write(params_.address, params_.comm_channel, data, data_size);
} }
esp_err_t E32_Driver::Write(Address address, Channel channel, int E32_Driver::Write(Address address, Channel channel,
const std::string& data) { const std::string& data) {
return Write(address, channel, (uint8_t*)data.c_str(), data.size()); return Write(address, channel, (uint8_t*)data.c_str(), data.size());
} }
esp_err_t E32_Driver::Write(const std::string& data) { int E32_Driver::Write(const std::string& data) {
return Write((uint8_t*)data.c_str(), data.size()); return Write((uint8_t*)data.c_str(), data.size());
} }

8
main/e32_driver.hh
View File

@ -61,11 +61,11 @@ class E32_Driver {
esp_err_t ReadParams(Params& params); esp_err_t ReadParams(Params& params);
esp_err_t WriteParams(const Params& params); esp_err_t WriteParams(const Params& params);
esp_err_t Write(Address address, Channel channel, const uint8_t* data, int Write(Address address, Channel channel, const uint8_t* data,
size_t data_size); size_t data_size);
esp_err_t Write(const uint8_t* data, size_t data_size); int Write(const uint8_t* data, size_t data_size);
esp_err_t Write(Address address, Channel channel, const std::string& data); int Write(Address address, Channel channel, const std::string& data);
esp_err_t Write(const std::string& data); int Write(const std::string& data);
int Read(uint8_t* data, int max_len, int Read(uint8_t* data, int max_len,
TickType_t ticks_to_wait = portMAX_DELAY); TickType_t ticks_to_wait = portMAX_DELAY);

3
main/ugv_comms.cc
View File

@ -260,7 +260,8 @@ esp_err_t CommsClass::SendPacket(const char *data, size_t size) {
} }
uint8_t sz = size; uint8_t sz = size;
lora.Write(&sz, sizeof(sz)); lora.Write(&sz, sizeof(sz));
return lora.Write((uint8_t *)data, size); lora.Write((uint8_t *)data, size);
return ESP_OK;
#endif #endif
} }