tests: Make more tests run

main/watchMain.cpp

@@ -513,7 +513,7 @@ void LightingTask() {
     };
 
     while (true) {
-        auto onPos = pictoIllumQue.dequeue(0);
+        auto onPos = pictoIllumQue.tryDequeue();
         if (onPos) {
             ESP_LOGI(TAG, "Changing picto-Illum to pos = %i", onPos->pos);
             ESP_LOGI(TAG, "Current color set r%i g%i b%i ",
@@ -585,10 +585,11 @@ void MovementTask() {
 
     StepperMotor stepper(stepperCfg, stepperDriver, initSens);
 
+    SyslogInst logger;
     WatchMotor watch(stepper, [](uint8_t newPos) {
         pictoIllumQue.enqueue(std::make_unique<PictoIllumCommand>(newPos));
         responseQueue.enqueue(std::make_unique<WatchIndex>(ResponseType::StepAt, newPos));
-    });
+    }, logger);
 
     ESP_LOGI("Stepper", "Find Home");
     stepper.findRef();
@@ -653,7 +654,7 @@ void MovementTask() {
                 int delay = Random::randomWithIn(2000,3000)/portTICK_PERIOD_MS;
                 Syslog::logv(Syslog::Severity::Informational,
                                 "ShuffleMode Wait for %i", delay);
-                auto cmd = commandQueue.dequeue(delay);
+                auto cmd = commandQueue.tryDequeueFor(delay);
                 if (cmd) {
                     if (cmd->type != MoveType::Shuffle) {
                         commandQueue.enqueue(std::move(cmd));

main/watchMain.hpp

@@ -41,22 +41,6 @@
 #include "mqttClient.hpp"
 #include "watchFace.hpp"
 #include "random.hpp"
-
-// #include "esp_chip_info.h"
-// #include "esp_flash.h"
-// #include "esp_ota_ops.h"
-// #include "esp_partition.h"
-// #include "esp_random.h"
-// #include "esp_system.h"
-// #include "fileSystem.hpp"
-// #include "lwip/apps/netbiosns.h"
-// #include "mdns.h"
-// #include "soc/soc_caps.h"
-// #include "systemFunctions.hpp"
-// #include <inttypes.h>
-// #include <sys/param.h>
-// #include <unistd.h>
-
 #include "sad_DetectedServer.hpp"
 #include "spit_object.hpp"
 #include "spit_player.hpp"