Merge branch 'release/1.0' into community

SynthstromAudible · Nov 7, 2023 · afa2ba1 · afa2ba1
2 parents ffa39ad + c562cfd
commit afa2ba1
Show file tree

Hide file tree

Showing 87 changed files with 665 additions and 464 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,13 +17,34 @@
       "request": "launch",
       "cwd": "${workspaceRoot}",
       "executable": "${workspaceRoot}/build/Debug/deluge.elf",
+      "windows": {
+        "serverpath": "C:\\Program Files\\SEGGER\\JLink\\JLinkGDBServerCL.exe", 
+      },
       "servertype": "jlink",
       "device": "R7S721020",
       "interface": "swd",
-      "runToEntryPoint": "main",
+      //"runToEntryPoint": "main",
       "svdFile": "${workspaceRoot}/contrib/rza1.svd",
+      "overrideLaunchCommands": [
+        "load"
+      ],
+      "overrideResetCommands": [
+        "monitor reset",
+        "load"
+      ],
+      "overrideRestartCommands": [
+        "jump start"
+      ],
       "rttConfig": {
         "enabled": true,
+        "address": "auto",
+        "decoders": [
+          {
+            "port": 0,
+            "timestamp": true,
+            "type": "console"
+          }
+        ]
       },
     },
     {
@@ -160,7 +181,7 @@
       "type": "lldb",
       "request": "launch",
       "targetCreateCommands": [
-        "target create ${workspaceFolder}/build/debug/deluge7SEG.elf"
+        "target create ${workspaceFolder}/build/Debug/deluge.elf"
       ],
       "processCreateCommands": [
         "gdb-remote localhost:3333"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,4 +15,5 @@
         "SDRAM",
         "Synthstrom"
     ],
+    "cortex-debug.armToolchainPath.windows": "${workspaceRoot}/toolchain/win32-x86_64/arm-none-eabi-gcc/bin",
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -48,6 +48,7 @@ execute_process(
 string(TIMESTAMP DATE_TODAY "%Y.%m.%d")
 
 # Build our version string
+set(BUILD_COMMIT_SHORT "${GIT_COMMIT_SHORT}") # Used in firmware
 set(BUILD_VERSION_STRING "${PROJECT_VERSION}${SEMVER_PRERELEASE_ID}-${GIT_COMMIT_SHORT}") # Used in firmware
 set(BUILD_VERSION_SUFFIX "-v${PROJECT_VERSION}${SEMVER_PRERELEASE_ID}+${DATE_TODAY}-${GIT_COMMIT_SHORT}") # Used for filename