Skip to content

Commit 61c03a9

Browse files
committed
Now compiles with current ESP-IDF (functionality unknown)
1 parent 4a67d59 commit 61c03a9

File tree

10 files changed

+3441
-13
lines changed

10 files changed

+3441
-13
lines changed

esp32_sawppy/.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,8 @@
33
// for the documentation about the extensions.json format
44
"recommendations": [
55
"platformio.platformio-ide"
6+
],
7+
"unwantedRecommendations": [
8+
"ms-vscode.cpptools-extension-pack"
69
]
710
}

esp32_sawppy/.vscode/settings.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"files.associations": {
33
"cmath": "cpp",
4-
"joy_adc.h": "c"
4+
"joy_adc.h": "c",
5+
"gpio_assignments.h": "c",
6+
"joy_msg.h": "c",
7+
"joy_rmt_rc.h": "c",
8+
"volt_adc.h": "c"
59
}
610
}

esp32_sawppy/lib/hardware/volt_adc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static const adc1_channel_t voltage_channel = ADC1_GPIO35_CHANNEL;
5353
static const adc_bits_width_t voltage_precision = ADC_WIDTH_BIT_12;
5454

5555
// No ADC input attenuation
56-
static const adc_atten_t voltage_attenuation = ADC_ATTEN_0db;
56+
static const adc_atten_t voltage_attenuation = ADC_ATTEN_DB_0;
5757

5858
// Conversion coefficient calculated with help of Fluke multimeter and ESP32
5959
// dev module. Will vary between different ESP32 modules and actual resistance

esp32_sawppy/lib/messages/msg_print.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void joy_msg_print_task(void* pvParameter)
4646
{
4747
if (pdTRUE == xQueuePeek(xJoystickQueue, &message, portMAX_DELAY))
4848
{
49-
ESP_LOGI(TAG_JOY, "%d | steer %+.2f | speed %+.2f | button %d",
49+
ESP_LOGI(TAG_JOY, "%lu | steer %+.2f | speed %+.2f | button %lu",
5050
message.timeStamp,
5151
message.axes[axis_steer],
5252
message.axes[axis_speed],
@@ -79,7 +79,7 @@ void twist_msg_print_task(void* pvParameter)
7979
{
8080
if (pdTRUE == xQueuePeek(xTwistQueue, &message, portMAX_DELAY))
8181
{
82-
ESP_LOGI(TAG_TWIST, "%d | linear %+.2f,%+.2f,%+.2f | angular %+.2f,%+.2f,%+.2f",
82+
ESP_LOGI(TAG_TWIST, "%lu | linear %+.2f,%+.2f,%+.2f | angular %+.2f,%+.2f,%+.2f",
8383
message.timeStamp,
8484
message.linear.x,
8585
message.linear.y,
@@ -114,7 +114,7 @@ void wheel_msg_print_task(void* pvParameter)
114114
{
115115
if (pdTRUE == xQueuePeek(xWheelQueue, &message, portMAX_DELAY))
116116
{
117-
printf("wheel_msg %d",
117+
printf("wheel_msg %lu",
118118
message.timeStamp);
119119
for (int wheel = 0; wheel < WHEEL_MSG_DATA_COUNT; wheel++)
120120
{

esp32_sawppy/lib/rover/joy_steer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ SOFTWARE.
5252
*/
5353
typedef struct joy_steer_task_parameters
5454
{
55-
xQueueHandle xJoyMsgQueue;
56-
xQueueHandle xCmdVelQueue;
55+
QueueHandle_t xJoyMsgQueue;
56+
QueueHandle_t xCmdVelQueue;
5757
} joy_steer_task_parameters;
5858

5959
/*

esp32_sawppy/lib/rover/wheel_ackermann.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ SOFTWARE.
5757
*/
5858
typedef struct wheel_ackermann_task_parameters
5959
{
60-
xQueueHandle xCmdVelQueue;
61-
xQueueHandle xWheelQueue;
60+
QueueHandle_t xCmdVelQueue;
61+
QueueHandle_t xWheelQueue;
6262
} wheel_ackermann_task_parameters;
6363

6464
/*

esp32_sawppy/lib/wifi/http_file_server.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ static const TickType_t powerUpdatePeriod = pdMS_TO_TICKS(100);
6666
*/
6767
typedef struct http_file_server_task_parameters
6868
{
69-
xQueueHandle xJoystickQueue;
70-
xQueueHandle xPowerQueue;
69+
QueueHandle_t xJoystickQueue;
70+
QueueHandle_t xPowerQueue;
7171
} http_file_server_task_parameters;
7272

7373
/*

esp32_sawppy/lib/wifi/softap_start.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ static void wifi_event_handler(void* arg, esp_event_base_t event_base, int32_t e
2020
{
2121
if (event_id == WIFI_EVENT_AP_STACONNECTED) {
2222
wifi_event_ap_staconnected_t* event = (wifi_event_ap_staconnected_t*) event_data;
23-
ESP_LOGI(TAG, "station "MACSTR" join, AID=%d", MAC2STR(event->mac), event->aid);
2423
} else if (event_id == WIFI_EVENT_AP_STADISCONNECTED) {
2524
wifi_event_ap_stadisconnected_t* event = (wifi_event_ap_stadisconnected_t*) event_data;
26-
ESP_LOGI(TAG, "station "MACSTR" leave, AID=%d", MAC2STR(event->mac), event->aid);
2725
}
2826
}
2927

0 commit comments

Comments
 (0)