From bbddb40147f254eeaea60316c6b0ca08e9179958 Mon Sep 17 00:00:00 2001 From: Jaro Date: Fri, 15 Oct 2021 21:24:37 +0200 Subject: [PATCH] fix speed --- platformio.ini | 4 ++-- src/main.cpp | 31 +++++++++++++++---------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/platformio.ini b/platformio.ini index f432cb6..b0c2686 100644 --- a/platformio.ini +++ b/platformio.ini @@ -12,8 +12,8 @@ platform = espressif32 board = esp32cam framework = arduino -monitor_port = COM[13678] -monitor_speed = 115200 +monitor_port = /dev/ttyUSB0 +monitor_speed = 460800 monitor_rts = 0 monitor_dtr = 0 lib_deps = diff --git a/src/main.cpp b/src/main.cpp index 9255035..9d65273 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -66,10 +66,9 @@ void reboot_esp32(char *aLine) void set_speed(char *aLine) { - char *cmd = strtok(aLine, " \t"); - char *speed = strtok(NULL," \t"); - Serial.updateBaudRate(strtoul(speed,nullptr,10)); - Serial.print("[OK] SETTING SPEED"); + char *speed = aLine + strlen(aLine) + 1; + Serial.updateBaudRate(atol(speed)); + Serial.printf("[OK] SETTING SPEED %s",speed); } @@ -101,29 +100,29 @@ void print_measurement(char *aLine) void set_brightness(char *aLine) { - char *cmd = strtok(aLine, " \t"); - char *str = strtok(NULL," \t"); + char *str = aLine + strlen(aLine) + 1; sensor_t * s = esp_camera_sensor_get(); - s->set_brightness(s, strtol(str,nullptr,10)); // -2 to 2 - Serial.print("[OK] SETTING BRIGHTNESS"); + s->set_brightness(s, atol(str)); // -2 to 2 + Serial.print("[OK] SETTING BRIGHTNESS "); + Serial.println(str); } void set_saturation(char *aLine) { - char *cmd = strtok(aLine, " \t"); - char *str = strtok(NULL," \t"); + char *str = aLine + strlen(aLine) + 1; sensor_t * s = esp_camera_sensor_get(); - s->set_saturation(s, strtol(str,nullptr,10)); // -2 to 2 - Serial.print("[OK] SETTING SATURATION"); + s->set_saturation(s, atol(str)); // -2 to 2 + Serial.print("[OK] SETTING SATURATION "); + Serial.println(str);; } void set_contrast(char *aLine) { - char *cmd = strtok(aLine, " \t"); - char *str = strtok(NULL," \t"); + char *str = aLine + strlen(aLine) + 1; sensor_t * s = esp_camera_sensor_get(); - s->set_contrast(s, strtol(str,nullptr,10)); // -2 to 2 - Serial.print("[OK] SETTING CONTRAST"); + s->set_contrast(s, atol(str)); // -2 to 2 + Serial.print("[OK] SETTING CONTRAST "); + Serial.println(str); } const command_action_t commands[] = {