proj: cleaning project files

.vscode/c_cpp_properties.json

@@ -1,25 +1,24 @@
 {
-    "configurations": [
+  "configurations": [
-        {
+    {
-            "name": "ESP-IDF",
+      "name": "ESP-IDF",
-            "compilerPath": "${config:idf.toolsPathWin}\\tools\\riscv32-esp-elf\\esp-13.2.0_20240530\\riscv32-esp-elf\\bin\\riscv32-esp-elf-gcc.exe",
+      "compileCommands": "/home/gustice/jobs/projects/Proj_Zwickau_waitingRoom/FW_X_WatchController/build_uTest/compile_commands.json",
-            "compileCommands": "${config:idf.buildPath}/compile_commands.json",
+      "includePath": [
-            "includePath": [
+        "${config:idf.espIdfPath}/components/**",
-                "${config:idf.espIdfPath}/components/**",
+        "${config:idf.espIdfPathWin}/components/**",
-                "${config:idf.espIdfPathWin}/components/**",
+        "${workspaceFolder}/**",
-                "${workspaceFolder}/**",
+        "${workspaceFolder}/core/**"
-                "${workspaceFolder}/core/**"
+      ],
-            ],
+      "browse": {
-            "browse": {
+        "path": [
-                "path": [
+          "${config:idf.espIdfPath}/components",
-                    "${config:idf.espIdfPath}/components",
+          "${config:idf.espIdfPathWin}/components",
-                    "${config:idf.espIdfPathWin}/components",
+          "${workspaceFolder}",
-                    "${workspaceFolder}",
+          "${workspaceFolder}/core"
-                    "${workspaceFolder}/core"
+        ],
-                ],
+        "limitSymbolsToIncludedHeaders": true
-                "limitSymbolsToIncludedHeaders": true
+      }
-            }
+    }
-        }
+  ],
-    ],
+  "version": 4
-    "version": 4
 }

.vscode/launch.json

@@ -10,39 +10,6 @@
       "type": "espidf",
       "name": "Launch",
       "request": "launch"
-    },
-    {
-      "name": "C/C++: g++.exe debug selected file",
-      "type": "cppdbg",
-      "request": "launch",
-      // "program": "${fileDirname}\\${fileBasenameNoExtension}.exe",
-      "program": "${workspaceFolder}/test/unitOnHost/build/watchFace/watchFaceTest.exe",
-      // "program": "${workspaceFolder}/core/test/unitOnHost/build/devHal/devHalTest.exe",
-      
-      "args": [],
-      "stopAtEntry": false,
-      "cwd": "${fileDirname}",
-      "environment": [],
-      "externalConsole": false,
-      "MIMode": "gdb",
-      "miDebuggerPath": "C:\\msys64\\ucrt64\\bin\\gdb.exe",
-      "setupCommands": [
-        {
-          "description": "Enable pretty-printing for gdb",
-          "text": "-enable-pretty-printing",
-          "ignoreFailures": true
-        },
-        {
-          "description": "Set Disassembly Flavor to Intel",
-          "text": "-gdb-set disassembly-flavor intel",
-          "ignoreFailures": true
-        }
-      ],
-      "existing": false,
-      // "preLaunchTask": "C/C++: g++.exe build active file",
-      "detail": "preLaunchTask: C/C++: g++.exe build active file",
-      "taskDetail": "compiler: C:\\msys64\\ucrt64\\bin\\g++.exe",
-      "taskStatus": "Detected Task"
     }
   ]
 }

.vscode/settings.json

@@ -1,40 +1,42 @@
 {
-    "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -2, NamespaceIndentation: All, FixNamespaceComments: false }",
+  "C_Cpp.clang_format_fallbackStyle": "{ BasedOnStyle: LLVM, UseTab: Never, IndentWidth: 4, TabWidth: 4, AllowShortIfStatementsOnASingleLine: false, IndentCaseLabels: false, ColumnLimit: 0, AccessModifierOffset: -2}",
-
+  "C_Cpp.intelliSenseEngine": "default",
-    "C_Cpp.intelliSenseEngine": "default",
+  "idf.customExtraVars": {
-    "idf.customExtraVars": {
+    "OPENOCD_SCRIPTS": "/home/gustice/tools/.espressif/tools/openocd-esp32/v0.12.0-esp32-20241016/openocd-esp32/share/openocd/scripts/",
-        "OPENOCD_SCRIPTS": "C:\\Tools\\ESP\\tools\\openocd-esp32\\v0.12.0-esp32-20240318/openocd-esp32/share/openocd/scripts",
+    "IDF_CCACHE_ENABLE": "1",
-        "IDF_CCACHE_ENABLE": "1",
+    "ESP_ROM_ELF_DIR": "/home/gustice/tools/.espressif/tools/esp-rom-elfs/20241011/"
-        "ESP_ROM_ELF_DIR": "C:\\Tools\\ESP\\tools\\esp-rom-elfs\\20240305/"
+  },
-    },
+  "idf.openOcdConfigs": [
-    "idf.espIdfPathWin": "C:\\Tools\\ESP-IDF\\v5.3\\esp-idf",
+    "board/esp32c6-builtin.cfg"
-    "idf.openOcdConfigs": [
+  ],
-        "board/esp32c6-builtin.cfg"
+  "idf.flashType": "UART",
-    ],
+  "C_Cpp.autoAddFileAssociations": false,
-    "idf.portWin": "COM9",
+  "project.deviceIp": "172.16.17.56",
-    "idf.toolsPathWin": "C:\\Tools\\ESP",
+  "sonarlint.pathToCompileCommands": "${workspaceFolder}\\build\\compile_commands.json",
-    "idf.flashType": "UART",
+  "idf.port": "/dev/ttyACM0",
-    "C_Cpp.autoAddFileAssociations": false,
+  "cmake.showSystemKits": false,
-    "project.deviceIp": "172.16.17.56",
+  "cmake.defaultVariants": {
-    "sonarlint.pathToCompileCommands": "${workspaceFolder}\\build\\compile_commands.json",
+    "buildType": {
-    "idf.port": "/dev/ttyACM0",
+      "default": "debug",
-    "cmake.showSystemKits": false,
+      "description": "The build type.",
-    "cmake.defaultVariants": {
+      "choices": {
-        "buildType": {
+        "debug": {
-            "default": "debug",
+          "short": "Debug",
-            "description": "The build type.",
+          "long": "Disable optimizations - include debug information.",
-            "choices": {
+          "buildType": "Debug"
-                "debug": {
+        },
-                    "short": "Debug",
+        "release": {
-                    "long": "Disable optimizations - include debug information.",
+          "short": "Release",
-                    "buildType": "Debug"
+          "long": "Optimize for speed - exclude debug information.",
-                },
+          "buildType": "Release"
-                "release": {
-                    "short": "Release",
-                    "long": "Optimize for speed - exclude debug information.",
-                    "buildType": "Release"
-                },
-            }
         }
+      }
     }
+  },
+  "clangd.path": "/home/gustice/.espressif/tools/esp-clang/esp-18.1.2_20240912/esp-clang/bin/clangd",
+  "clangd.arguments": [
+    "--background-index",
+    "--query-driver=/home/gustice/.espressif/tools/riscv32-esp-elf/esp-14.2.0_20241119/riscv32-esp-elf/bin/riscv32-esp-elf-gcc",
+    "--compile-commands-dir=/home/gustice/jobs/projects/Proj_Zwickau_waitingRoom/FW_X_WatchController/build_uTest"
+  ]
 }

.vscode/tasks.json

@@ -1,271 +1,7 @@
 {
   "version": "2.0.0",
   "tasks": [
-    {
-      "label": "Build - Build project",
-      "type": "shell",
-      "command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py build",
-      "windows": {
-        "command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py build",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}"
-          }
-        }
-      },
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}"
-        }
-      },
-      "problemMatcher": [
-        {
-          "owner": "cpp",
-          "fileLocation": [
-            "autoDetect",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
-        }
-      ],
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    },
-    {
-      "label": "Set ESP-IDF Target",
-      "type": "shell",
-      "command": "${command:espIdf.setTarget}",
-      "problemMatcher": {
-        "owner": "cpp",
-        "fileLocation": [
-          "autoDetect",
-          "${workspaceFolder}"
-        ],
-        "pattern": {
-          "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
-        }
-      }
-    },
-    {
-      "label": "Clean - Clean the project",
-      "type": "shell",
-      "command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py fullclean",
-      "windows": {
-        "command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py fullclean",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}"
-          }
-        }
-      },
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}"
-        }
-      },
-      "problemMatcher": [
-        {
-          "owner": "cpp",
-          "fileLocation": [
-            "autoDetect",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
-        }
-      ]
-    },
-    {
-      "label": "Flash - Flash the device",
-      "type": "shell",
-      "command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} -b ${config:idf.flashBaudRate} flash",
-      "windows": {
-        "command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py flash -p ${config:idf.portWin} -b ${config:idf.flashBaudRate}",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}"
-          }
-        }
-      },
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}"
-        }
-      },
-      "problemMatcher": [
-        {
-          "owner": "cpp",
-          "fileLocation": [
-            "autoDetect",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
-        }
-      ]
-    },
-    {
-      "label": "Monitor: Start the monitor",
-      "type": "shell",
-      "command": "${config:idf.pythonBinPath} ${config:idf.espIdfPath}/tools/idf.py -p ${config:idf.port} monitor",
-      "windows": {
-        "command": "${config:idf.pythonBinPathWin} ${config:idf.espIdfPathWin}\\tools\\idf.py -p ${config:idf.portWin} monitor",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}"
-          }
-        }
-      },
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}"
-        }
-      },
-      "problemMatcher": [
-        {
-          "owner": "cpp",
-          "fileLocation": [
-            "autoDetect",
-            "${workspaceFolder}"
-          ],
-          "pattern": {
-            "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-            "file": 1,
-            "line": 2,
-            "column": 3,
-            "severity": 4,
-            "message": 5
-          }
-        }
-      ],
-      "dependsOn": "Flash - Flash the device"
-    },
-    {
-      "label": "OpenOCD: Start openOCD",
-      "type": "shell",
-      "presentation": {
-        "echo": true,
-        "reveal": "never",
-        "focus": false,
-        "panel": "new"
-      },
-      "command": "openocd -s ${command:espIdf.getOpenOcdScriptValue} ${command:espIdf.getOpenOcdConfigs}",
-      "windows": {
-        "command": "openocd.exe -s ${command:espIdf.getOpenOcdScriptValue} ${command:espIdf.getOpenOcdConfigs}",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}"
-          }
-        }
-      },
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}"
-        }
-      },
-      "problemMatcher": {
-        "owner": "cpp",
-        "fileLocation": [
-          "autoDetect",
-          "${workspaceFolder}"
-        ],
-        "pattern": {
-          "regexp": "^(.*?):(\\d+):(\\d*):?\\s+(?:fatal\\s+)?(warning|error):\\s+(.*)$",
-          "file": 1,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 5
-        }
-      }
-    },
-    {
-      "label": "adapter",
-      "type": "shell",
-      "command": "${config:idf.pythonBinPath}",
-      "isBackground": true,
-      "options": {
-        "env": {
-          "PATH": "${env:PATH}:${config:idf.customExtraPaths}",
-          "PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
-        }
-      },
-      "problemMatcher": {
-        "background": {
-          "beginsPattern": "\bDEBUG_ADAPTER_STARTED\b",
-          "endsPattern": "DEBUG_ADAPTER_READY2CONNECT",
-          "activeOnStart": true
-        },
-        "pattern": {
-          "regexp": "(\\d+)-(\\d+)-(\\d+)\\s(\\d+):(\\d+):(\\d+),(\\d+)\\s-(.+)\\s(ERROR)",
-          "file": 8,
-          "line": 2,
-          "column": 3,
-          "severity": 4,
-          "message": 9
-        }
-      },
-      "args": [
-        "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter_main.py",
-        "-e",
-        "${workspaceFolder}/build/${command:espIdf.getProjectName}.elf",
-        "-s",
-        "$OPENOCD_SCRIPTS",
-        "-dn",
-        "esp32",
-        "-om",
-        "connect_to_instance",
-        "-t",
-        "xtensa-esp32-elf-"
 
-      ],
+    
-      "windows": {
-        "command": "${config:idf.pythonBinPathWin}",
-        "options": {
-          "env": {
-            "PATH": "${env:PATH};${config:idf.customExtraPaths}",
-            "PYTHONPATH": "${command:espIdf.getExtensionPath}/esp_debug_adapter/debug_adapter"
-          }
-        }
-      }
-    },
-    {
-      "label": "Start TeraTerm Telnet",
-      "type": "shell",
-      "command": "C:/Program Files (x86)/teraterm5/ttermpro.exe", 
-      "args": [
-          "telnet://${config:project.deviceIp}:23",
-          "/W=\"Device-Platform\"",
-          "/T=1",
-          "/F=\"${workspaceFolder}/core/.configs/TelnetTeraTerm.INI\""
-      ],
-      "problemMatcher": []
-    }
   ]
 }

CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.16)
 
+option(BUILD_UNIT_TESTS "Build unit tests instead of main app" OFF)
+
 if(TgtEnv STREQUAL "Host")
     message("Using Host-Branch")
     add_subdirectory("test/unitOnHost")
@@ -8,10 +10,16 @@ elseif(TgtEnv STREQUAL "Target")
     add_subdirectory("core/test/unitOnTarget")
 else()
     message("Using ESP-Branch")
-    set(EXTRA_COMPONENT_DIRS 
+    if(DEFINED ENV{UNIT_TESTS})
-        "core/components" 
+        message("Using UnitTestFrame")
-        "core/managed_components"
+        add_subdirectory("test/unitOnTarget" ${CMAKE_BINARY_DIR}/main)
-    )
+    else()
-    include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+        set(EXTRA_COMPONENT_DIRS 
-    project(X_WatchController_FW)
+                "core/components" 
+                "core/managed_components"
+            )
+        include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+        message("Using Main App")
+        project(WatchController)
+    endif()
 endif()

esp_idf_project_configuration.json

@@ -0,0 +1,52 @@
+{
+  "App": {
+    "build": {
+      "compileArgs": [],
+      "ninjaArgs": [],
+      "buildDirectoryPath": "",
+      "sdkconfigDefaults": [],
+      "sdkconfigFilePath": ""
+    },
+    "env": {},
+    "idfTarget": "",
+    "flashBaudRate": "",
+    "monitorBaudRate": "",
+    "openOCD": {
+      "debugLevel": -1,
+      "configs": [],
+      "args": []
+    },
+    "tasks": {
+      "preBuild": "",
+      "preFlash": "",
+      "postBuild": "",
+      "postFlash": ""
+    }
+  },
+  "UnitTest": {
+    "build": {
+      "compileArgs": [],
+      "ninjaArgs": [],
+      "buildDirectoryPath": "build_uTest",
+      "sdkconfigDefaults": [],
+      "sdkconfigFilePath": ""
+    },
+    "env": {
+      "UNIT_TESTS": "All"
+    },
+    "idfTarget": "",
+    "flashBaudRate": "",
+    "monitorBaudRate": "",
+    "openOCD": {
+      "debugLevel": -1,
+      "configs": [],
+      "args": []
+    },
+    "tasks": {
+      "preBuild": "",
+      "preFlash": "",
+      "postBuild": "",
+      "postFlash": ""
+    }
+  }
+}

main/watchMain.cpp

@@ -175,6 +175,18 @@ void setDynamics(Cli::CArgs args) {
     }
 }
 
+void showProcessValues(Cli::CArgs args) { 
+    pShell->writeLine("Process values:");
+    char buff[256]; 
+
+    sprintf(buff, "%02x,%02x,%02x", activeState.color.getRed(),activeState.color.getGreen(),activeState.color.getBlue());
+    pShell->writeLine(std::string{"    Color RGB:   "} + buff);
+    sprintf(buff, "%.2f / %.2f", activeState.accel, activeState.speed);
+    pShell->writeLine(std::string{"    Accel/Speed: "} + buff);
+    pShell->writeLine(std::string{"    JumpRange:   "} + std::to_string((int)activeState.minJumps) + " .. " + std::to_string((int)activeState.maxJumps));
+    pShell->writeLine(std::string{"    Provile:     "} + std::to_string((int)activeState.profile));
+}
+
 void startDemoMovement(Cli::CArgs args) {
     ESP_LOGI(TAG, "on startDemoMovement:");
     commandQueue.enqueue(std::make_unique<MoveCommand>(MoveType::Demo));
@@ -213,10 +225,12 @@ static void telnetSocketTask(int addrFamily) {
                 pShell->addBinding(
                     {"tstMove", "start movement (profile-idx,steps) as integers ",
                      [](Cli::CArgs a) { testMovement(a); }});
-
                 pShell->addBinding(
                     {"tstIllum", "test illumination command 0=off /1..6",
                      [](Cli::CArgs a) { testPictoIllum(a); }});
+                pShell->addBinding(
+                    {"showData", "Show process values that are input by DMX, MQTT and SPIT",
+                    [](Cli::CArgs a) { showProcessValues(a); }});
             },
             [](TcpSession &session) {
                 pShell->process();

sdkconfig

@@ -579,15 +579,6 @@ CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
 
-#
-# Example Configuration
-#
-CONFIG_DEVICE_WIFI_SSID="eth2ap"
-CONFIG_DEVICE_WIFI_PASSWORD="12345678"
-CONFIG_DEVICE_WIFI_CHANNEL=1
-CONFIG_DEVICE_MAX_STA_CONN=4
-# end of Example Configuration
-
 #
 # Example Ethernet Configuration
 #
@@ -2145,17 +2136,6 @@ CONFIG_LITTLEFS_MALLOC_STRATEGY_DEFAULT=y
 # CONFIG_LITTLEFS_MALLOC_STRATEGY_INTERNAL is not set
 CONFIG_LITTLEFS_ASSERTS=y
 # end of LittleFS
-
-#
-# Telnet Server
-#
-CONFIG_TELNET_SERVER_DEFAULT_PORT=23
-CONFIG_TELNET_SERVER_MAX_CONNECTIONS=5
-CONFIG_TELNET_SERVER_STACK_SIZE=4096
-CONFIG_TELNET_SERVER_TASK_PRIORITY=24
-CONFIG_TELNET_SERVER_TASK_CORE=0
-CONFIG_TELNET_SERVER_REDIRECT_LOGS=0
-# end of Telnet Server
 # end of Component config
 
 # CONFIG_IDF_EXPERIMENTAL_FEATURES is not set

test/integration/CMakeLists.txt

@@ -8,5 +8,5 @@ set(EXTRA_COMPONENT_DIRS
 )
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(INTEGRATION_TESTS_FW)
+project(IntegrationTest)
 

test/integration/dependencies.lock

@@ -1,9 +0,0 @@
-dependencies:
-  idf:
-    component_hash: null
-    source:
-      type: idf
-    version: 5.3.0
-manifest_hash: c4f4ec05313d427eb56c633f78ce213e553379725bf2af3c511665f930571beb
-target: esp32c6
-version: 1.0.0

test/integration/sdkconfig.defaults

@@ -1,18 +0,0 @@
-#
-# Compiler options
-#
-CONFIG_COMPILER_CXX_EXCEPTIONS=y
-
-#
-# Serial flasher config
-#
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
-CONFIG_ESPTOOLPY_FLASHSIZE="8MB"
-
-#
-# Log output
-#
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
-CONFIG_LOG_DEFAULT_LEVEL=3
-CONFIG_LOG_MAXIMUM_LEVEL_DEBUG=y
-CONFIG_LOG_MAXIMUM_LEVEL=4

test/unitOnHost/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "cmake.cmakePath": "C:/msys64/usr/bin/cmake.exe"
-}

test/unitOnHost/CMakeLists.txt

@@ -9,3 +9,4 @@ project(UnitTests)
 addSubDirs_ofRoot("${CMAKE_CURRENT_LIST_DIR}/../../components")
 addSubDirs_ofRoot("${CMAKE_CURRENT_LIST_DIR}/../../core/components")
 add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../core/test/unitOnHost/hwMock" hwMock)
+# add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../core/test/unitOnHost/freeRtos" freeRtos)

test/unitOnTarget/CMakeLists.txt

@@ -17,4 +17,4 @@ set(EXTRA_COMPONENT_DIRS
 set(TEST_COMPONENTS "testable freeRtosApi hwHal" CACHE STRING "List of components to test")
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-project(unit_test_test)
+project(unit_test)