Merge branch 'main' into BAYCKRC-add-BAYCKRC-targets

.gitignore

@@ -15,3 +15,5 @@ Keil_Projects/Listings
 *~
 *.map
 *.o
+.DS_Store
+.vscode/settings.json

.vscode/launch.json

@@ -20,9 +20,18 @@
 	    "${workspaceFolder}/obj/openocd.cfg",
         ],
 	      "showDevDebugOutput": "none",
-
-      	"serverpath": "${workspaceFolder}${/}tools${/}${config:OS}${/}openocd${/}bin${/}openocd",
-	      "armToolchainPath": "${workspaceRoot}/tools/${config:OS}/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin",
+        "osx": {
+            "serverpath": "${workspaceFolder}/tools/macos/openocd/bin/openocd",
+            "armToolchainPath": "${workspaceFolder}/tools/macos/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin"
+        },
+        "linux": {
+            "serverpath": "${workspaceFolder}/tools/linux/openocd/bin/openocd",
+            "armToolchainPath": "${workspaceFolder}/tools/linux/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin"
+        },
+        "windows": {
+            "serverpath": "${workspaceFolder}\\tools\\windows\\openocd\\bin\\openocd",
+            "armToolchainPath": "${workspaceFolder}\\tools\\windows\\xpack-arm-none-eabi-gcc-10.3.1-2.3\\bin"
+        }
       },
 
       // JLink configuration
@@ -32,7 +41,15 @@
         "name": "AM32 JLink",
         "cwd": "${workspaceRoot}",
 	      "device" : "-AT32F421K8U7",
-	      "gdbPath": "${workspaceRoot}/tools/${config:OS}/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin/arm-none-eabi-gdb",
+        "osx": {
+            "gdbPath": "${workspaceRoot}/tools/macos/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin/arm-none-eabi-gdb"
+        },
+        "linux": {
+            "gdbPath": "${workspaceRoot}/tools/linux/xpack-arm-none-eabi-gcc-10.3.1-2.3/bin/arm-none-eabi-gdb"
+        },
+        "windows": {
+            "gdbPath": "${workspaceRoot}\\tools\\windows\\xpack-arm-none-eabi-gcc-10.3.1-2.3\\bin\\arm-none-eabi-gdb"
+        },
         "executable": "${workspaceRoot}/obj/debug.elf",
 	      "showDevDebugOutput": "raw",
         "servertype" : "jlink",

.vscode/settings.json.linux

@@ -0,0 +1,25 @@
+{
+    "OS": "linux",
+    "makefile.makePath": "/usr/bin/make",
+
+    "makefile.configurations": [
+        {
+            "name": "MakeSingle",
+            "makeArgs": [
+                "-j1"
+            ]
+        },
+            {
+                "name": "MakeParallel-8",
+                "makeArgs": [
+                    "-j8"
+                ]
+        },
+            {
+            "name": "MakeParallel-MAX",
+                "makeArgs": [
+            "-j"
+                ]
+        }
+    ]
+}

.vscode/settings.json.macos

@@ -0,0 +1,25 @@
+{
+    "OS": "macos",
+    "makefile.makePath": "/usr/bin/make",
+
+    "makefile.configurations": [
+        {
+            "name": "MakeSingle",
+            "makeArgs": [
+                "-j1"
+            ]
+        },
+            {
+                "name": "MakeParallel-8",
+                "makeArgs": [
+                    "-j8"
+                ]
+        },
+            {
+            "name": "MakeParallel-MAX",
+                "makeArgs": [
+            "-j"
+                ]
+        }
+    ]
+}

.vscode/settings.json.windows

@@ -0,0 +1,25 @@
+{
+    "OS": "windows",
+    "makefile.makePath": "tools/windows/make/bin/make.exe",
+
+    "makefile.configurations": [
+        {
+            "name": "MakeSingle",
+            "makeArgs": [
+                "-j1"
+            ]
+        },
+            {
+                "name": "MakeParallel-8",
+                "makeArgs": [
+                    "-j8"
+                ]
+        },
+            {
+            "name": "MakeParallel-MAX",
+                "makeArgs": [
+            "-j"
+                ]
+        }
+    ]
+}

Inc/functions.h

@@ -11,7 +11,7 @@
 #include "main.h"
 #include "targets.h"
 
-int getAbsDif(int number1, int number2);
+uint32_t getAbsDif(int number1, int number2);
 void delayMicros(uint32_t micros);
 void delayMillis(uint32_t millis);
 long map(long x, long in_min, long in_max, long out_min, long out_max);