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

Run clang-format again

Browse Source
This commit is contained in:
Alex Mikhalev 2018-12-29 21:39:21 -07:00
parent 594c16ed41
commit 1c5fbd725a
5 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/sx127x_driver/sx127x_driver.h
View File

@ -1,7 +1,7 @@
#pragma once #pragma once
#include <driver/spi_master.h>
#include <driver/gpio.h> #include <driver/gpio.h>
#include <driver/spi_master.h>
#include <stdint.h> #include <stdint.h>
#define SX127X_MAX_TRANSFER (256) #define SX127X_MAX_TRANSFER (256)

4
main/u8g2_esp32_hal.c
View File

@ -242,9 +242,7 @@ uint8_t u8g2_esp32_gpio_and_delay_cb(u8x8_t *u8x8, uint8_t msg, uint8_t arg_int,
break; break;
// Delay for the number of milliseconds passed in through arg_int. // Delay for the number of milliseconds passed in through arg_int.
case U8X8_MSG_DELAY_MILLI: case U8X8_MSG_DELAY_MILLI: vTaskDelay(arg_int / portTICK_PERIOD_MS); break;
vTaskDelay(arg_int / portTICK_PERIOD_MS);
break;
} }
return 0; return 0;
} // u8g2_esp32_gpio_and_delay_cb } // u8g2_esp32_gpio_and_delay_cb

8
main/ugv_main.c
View File

@ -178,8 +178,12 @@ void loop(void) {
u8g2_DrawStr(&u8g2, 4, 8 + 8, buf); u8g2_DrawStr(&u8g2, 4, 8 + 8, buf);
if (packet.buffer_len) { if (packet.buffer_len) {
ESP_LOGI(TAG, "lora received packet (len %d, rssi: %d, snr: %f): %s\n", packet.buffer_len, packet.rssi, ESP_LOGI(TAG,
packet.snr, packet.buffer); "lora received packet (len %d, rssi: %d, snr: %f): %s\n",
packet.buffer_len,
packet.rssi,
packet.snr,
packet.buffer);
u8g2_SetFont(&u8g2, u8g2_font_4x6_mf); u8g2_SetFont(&u8g2, u8g2_font_4x6_mf);
snprintf(buf, 40, "lora pkt(rssi: %d, snr: %f)", packet.rssi, packet.snr); snprintf(buf, 40, "lora pkt(rssi: %d, snr: %f)", packet.rssi, packet.snr);
u8g2_DrawStr(&u8g2, 4, 8 + 8 + 8, buf); u8g2_DrawStr(&u8g2, 4, 8 + 8 + 8, buf);