From eb4859c31d11f20d3e9a5b78cc54dd7fb431bcdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Phillip=20K=C3=BChne?= Date: Tue, 28 Jan 2025 20:22:38 +0100 Subject: [PATCH] Update power measurement examples Update power measurement examples to the state in which they were used as test cases in thesis --- .../Power_Measurements/Display/Display.ino | 2 +- .../ESP32_baseline/ESP32_baseline.ino | 4 ++-- .../Power_Measurements/Motors/Motors.ino | 3 +-- .../advanced/Power_Measurements/WLAN/WLAN.ino | 17 ++++++++--------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/example/advanced/Power_Measurements/Display/Display.ino b/example/advanced/Power_Measurements/Display/Display.ino index c455fc4..0a0a889 100644 --- a/example/advanced/Power_Measurements/Display/Display.ino +++ b/example/advanced/Power_Measurements/Display/Display.ino @@ -3,7 +3,7 @@ Dezibot dezibot = Dezibot(); // How many times to run a command on the display consecutively; -const uint16_t iterations = 5000; +const uint16_t iterations = 1000; void setup() { dezibot.begin(); diff --git a/example/advanced/Power_Measurements/ESP32_baseline/ESP32_baseline.ino b/example/advanced/Power_Measurements/ESP32_baseline/ESP32_baseline.ino index e587853..ad1a1cf 100644 --- a/example/advanced/Power_Measurements/ESP32_baseline/ESP32_baseline.ino +++ b/example/advanced/Power_Measurements/ESP32_baseline/ESP32_baseline.ino @@ -1,10 +1,10 @@ #include "Dezibot.h" -#include "esp_pm.h" +#include "esp_pm.h" #include "esp_task_wdt.h" Dezibot dezibot; -const uint16_t cycleTime = 2e4; //20000 ms = 20 s +const uint16_t cycleTime = 20e3; esp_pm_lock_handle_t cpuFreqLock; esp_pm_lock_handle_t apbFreqLock; diff --git a/example/advanced/Power_Measurements/Motors/Motors.ino b/example/advanced/Power_Measurements/Motors/Motors.ino index b4f446b..9da99ed 100644 --- a/example/advanced/Power_Measurements/Motors/Motors.ino +++ b/example/advanced/Power_Measurements/Motors/Motors.ino @@ -14,8 +14,7 @@ void loop() { dezibot.motion.rotateAntiClockwise(); delay(20000); // Turn on both motors at the same time - dezibot.motion.left.setSpeed(DEFAULT_BASE_VALUE); - dezibot.motion.right.setSpeed(DEFAULT_BASE_VALUE); + dezibot.motion.move(); delay(20000); dezibot.motion.stop(); delay(20000); diff --git a/example/advanced/Power_Measurements/WLAN/WLAN.ino b/example/advanced/Power_Measurements/WLAN/WLAN.ino index ece11b9..8a780f2 100644 --- a/example/advanced/Power_Measurements/WLAN/WLAN.ino +++ b/example/advanced/Power_Measurements/WLAN/WLAN.ino @@ -4,29 +4,28 @@ Dezibot dezibot = Dezibot(); void setup() { - Serial.begin(112500); - while (!Serial) { - ; /* Wait for USB-CDC Serial init to complete. */ - } #ifdef DEBUG - dezibot.display.begin(); - dezibot.display.println("Debug enabled."); + Serial.begin(112500); Serial.println("Debug enabled."); #endif dezibot.communication.begin(); dezibot.communication.setGroupNumber(1); dezibot.communication.sendMessage("Repeated send power consumption test commencing"); #ifdef DEBUG - dezibot.display.println("Mesh set up"); + Serial.println("Mesh set up"); /* Set up receive handler */ dezibot.communication.onReceive(handle_receive); - dezibot.display.println("Set up receive. Printing incoming messages:"); + Serial.println("Set up receive. Printing incoming messages:"); Serial.println("Sending broadcast messages to generate TX power consumption:"); #endif + delay(5000); + #ifdef DEBUG + Serial.println("Starting Transmission..."); + #endif } void handle_receive(String &message) { - dezibot.display.println(message); + Serial.println(message); } void loop() {