Merge pull request #6 from PharosMarcusB/pharos_development

Small fixes, cleanups, and improvements

Author: vanvught

.vscode/tasks.json

@@ -0,0 +1,47 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build RDM Responder",
+            "type": "shell",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "command": "make -f Makefile.GD32",
+            "options": {
+                "cwd": "${workspaceFolder}/gd32_rdm_responder/"
+            }
+        },
+        {
+            "label": "Clean RDM Responder",
+            "type": "shell",
+            "command": "make -f Makefile.GD32 clean",
+            "options": {
+                "cwd": "${workspaceFolder}/gd32_rdm_responder/"
+            }
+        },
+        {
+            "label": "Build DMX USB PRO",
+            "type": "shell",
+            "group": {
+                "kind": "build"
+            },
+            "command": "make -f Makefile.GD32",
+            "options": {
+                "cwd": "${workspaceFolder}/gd32_dmx_usb_pro/"
+            }
+        },
+        {
+            "label": "Clean DMX USB PRO",
+            "type": "shell",
+            "group": {
+                "kind": "build"
+            },
+            "command": "make -f Makefile.GD32 clean",
+            "options": {
+                "cwd": "${workspaceFolder}/gd32_dmx_usb_pro/"
+            }
+        }
+    ]
+}

firmware-template-gd32/lib/Rules.mk

@@ -52,9 +52,11 @@ C_OBJECTS=$(foreach sdir,$(SRCDIR),$(patsubst $(sdir)/%.c,$(BUILD)$(sdir)/%.o,$(
 CPP_OBJECTS=$(foreach sdir,$(SRCDIR),$(patsubst $(sdir)/%.cpp,$(BUILD)$(sdir)/%.o,$(wildcard $(sdir)/*.cpp)))
 ASM_OBJECTS=$(foreach sdir,$(SRCDIR),$(patsubst $(sdir)/%.S,$(BUILD)$(sdir)/%.o,$(wildcard $(sdir)/*.S)))
 
-EXTRA_C_OBJECTS=$(patsubst %.c,$(BUILD)%.o,$(EXTRA_C_SOURCE_FILES))
-EXTRA_C_DIRECTORIES=$(shell dirname $(EXTRA_C_SOURCE_FILES))
-EXTRA_BUILD_DIRS:=$(addsuffix $(EXTRA_C_DIRECTORIES), $(BUILD))
+ifneq ($(EXTRA_C_SOURCE_FILES),)
+	EXTRA_C_OBJECTS=$(patsubst %.c,$(BUILD)%.o,$(EXTRA_C_SOURCE_FILES))
+	EXTRA_C_DIRECTORIES=$(shell dirname $(EXTRA_C_SOURCE_FILES))
+	EXTRA_BUILD_DIRS:=$(addsuffix $(EXTRA_C_DIRECTORIES), $(BUILD))
+endif
 
 OBJECTS:=$(strip $(ASM_OBJECTS) $(C_OBJECTS) $(CPP_OBJECTS) $(EXTRA_C_OBJECTS))
 
@@ -83,7 +85,7 @@ all : builddirs $(TARGET)
 
 builddirs:
 	mkdir -p $(BUILD_DIRS)
-	mkdir -p $(EXTRA_BUILD_DIRS)
+	if [[ -n "${EXTRA_BUILD_DIRS}" ]]; then mkdir -p $(EXTRA_BUILD_DIRS); fi
 	mkdir -p lib_gd32
 
 clean:

gd32_rdm_responder/include/personalities.h

@@ -34,6 +34,9 @@
 #include "rdmhandler.h"
 #include "rdmdeviceresponder.h"
 #include "rdmpersonality.h"
+#ifndef NDEBUG
+# include "rdm_message_print.h"
+#endif
 
 #include "dmxreceiver.h"
 
@@ -165,7 +168,7 @@ class RDMResponder final : DMXReceiver, public RDMDeviceResponder, RDMHandler {
 		}
 
 #ifndef NDEBUG
-		if (nLength != INVALID_RESPONSE) {
+		if (nLength != rdm::responder::INVALID_RESPONSE) {
 			rdm::message_print(pResponse);
 		}
 #endif