diff --git a/Robotito/include/control.h b/Robotito/include/control.h index 1168f0c75d7ecba23ec34c9f8be49f5410078d05..29116c8de8f2027871a75859109db3ed2cb4f2a6 100644 --- a/Robotito/include/control.h +++ b/Robotito/include/control.h @@ -87,6 +87,7 @@ typedef struct { static servo_t motors[NMOTORS]; static odom_t odometry; +static float float_buffer[6]; esp_err_t omni_init(); diff --git a/Robotito/src/control/control.c b/Robotito/src/control/control.c index 4247566fd1dd6f2740a69091953e3abef26d4e69..e615f991a1831595b8a0d41aca843b07aa12550d 100644 --- a/Robotito/src/control/control.c +++ b/Robotito/src/control/control.c @@ -121,20 +121,19 @@ static void callback_odometry(){ //char* Txdata = (char*) malloc(100); //sprintf (Txdata, "Hello world index \r\n"); //uart_write_bytes(UART_NUM_2, Txdata, strlen(Txdata)); - float float_buffer[6]; //float_buffer = o; - float_buffer[0] = o->x; + float_buffer[0] = PI; float_buffer[1] = o->x_dot; float_buffer[2] = o->y; float_buffer[3] = o->y_dot; float_buffer[4] = o->phi; float_buffer[5] = o->phi_dot; uart_write_bytes(UART_NUM_2, &float_buffer[0], sizeof(float)); - uart_write_bytes(UART_NUM_2, &float_buffer[1], sizeof(float)); - uart_write_bytes(UART_NUM_2, &float_buffer[2], sizeof(float)); - uart_write_bytes(UART_NUM_2, &float_buffer[3], sizeof(float)); - uart_write_bytes(UART_NUM_2, &float_buffer[4], sizeof(float)); - uart_write_bytes(UART_NUM_2, &float_buffer[5], sizeof(float)); + // uart_write_bytes(UART_NUM_2, &float_buffer[1], sizeof(float)); + // uart_write_bytes(UART_NUM_2, &float_buffer[2], sizeof(float)); + // uart_write_bytes(UART_NUM_2, &float_buffer[3], sizeof(float)); + // uart_write_bytes(UART_NUM_2, &float_buffer[4], sizeof(float)); + // uart_write_bytes(UART_NUM_2, &float_buffer[5], sizeof(float)); free(v); } diff --git a/Robotito/src/main.c b/Robotito/src/main.c index 1eda5dfab9a4eb5d57b114497a6eb865bb72b46e..37eb3b852cd85d67dd31d698151b4b9119667f6b 100644 --- a/Robotito/src/main.c +++ b/Robotito/src/main.c @@ -50,7 +50,6 @@ static void uart_task(void *pvParameters) len = uart_read_bytes(UART_NUM, data, BUF_SIZE, portMAX_DELAY); if (len == BUF_SIZE){ memcpy(&fdata, data , sizeof(fdata)); - printf("%s \n",data); for (int i = 0; i < FLOAT_BUF_SIZE; i++) { printf("El dato %d en float es: %f \n",i, fdata[i]); @@ -83,7 +82,7 @@ static void init_uart(void) uart_set_pin(UART_NUM, 5, 4, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE); - uart_driver_install(UART_NUM, BUF_SIZE*2, BUF_SIZE*2, 5, &uart_queue, 0); + uart_driver_install(UART_NUM, 1024, 1024, 5, &uart_queue, 0); xTaskCreate(uart_task, "uart_task", TASK_MEMORY, NULL, 5, NULL); }