Feature multiplatform

example/gnu_make.mk

@@ -0,0 +1,78 @@
+# Makefile for Wirepas C Mesh API example, GNU make version
+
+# Variables
+
+# This example needs the C Mesh API library
+MESH_LIB_FOLDER := ../lib
+MESH_LIB := $(MESH_LIB_FOLDER)/build/mesh_api_lib.a
+
+# Detect platform and set toolchain variables
+include $(MESH_LIB_FOLDER)/tools.mk
+
+# Path of source files and build outputs
+SOURCEPREFIX   := .
+BUILDPREFIX    := build
+
+# Targets definition
+MAIN_APP := meshAPIExample
+
+TARGET_APP := $(BUILDPREFIX)/$(MAIN_APP)
+
+# Add API header
+CFLAGS  += -I$(MESH_LIB_FOLDER)/api
+
+# Source files
+SOURCES:= $(SOURCEPREFIX)/main.c
+
+# Object files
+OBJECTS := $(patsubst $(SOURCEPREFIX)/%,         \
+                      $(BUILDPREFIX)/%,          \
+                      $(SOURCES:.c=.o))
+
+
+# Functions
+
+# Also create the target directory if it does not exist
+define COMPILE
+	echo "  CC $(2)"
+	mkdir -p $(dir $(1))
+	$(CC) $(CFLAGS) -c -o $(1) $(2)
+endef
+
+define LINK
+	echo "  LD $(1)"
+	$(CC) $(LDFLAGS) -o $(1) $(2) $(MESH_LIB)
+endef
+
+define CLEAN
+	echo "  CLEAN"
+	$(RM) -r $(BUILDPREFIX)
+endef
+
+
+# Target rules
+
+ifeq ($(V),1)
+	# "V=1" on command line, print commands
+else
+.SILENT:
+	# Default, do not print commands
+endif
+
+.PHONY: all
+all: app
+
+app: lib $(TARGET_APP)
+
+.PHONY: clean
+clean:
+	$(call CLEAN)
+
+lib:
+	make -C $(MESH_LIB_FOLDER)
+
+$(BUILDPREFIX)/%.o: $(SOURCEPREFIX)/%.c
+	$(call COMPILE,$@,$<)
+
+$(BUILDPREFIX)/$(MAIN_APP): $(OBJECTS) $(MESH_LIB)
+	$(call LINK,$@,$^)

example/main.c

@@ -7,16 +7,31 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
+
+#ifdef PLATFORM_IS_WIN32
+#    include <windows.h>  // For Sleep()
+#    define sleep(sec) Sleep(sec * 1000)
+#    define pause() Sleep(500)
+#else
+#    include <unistd.h>  // For sleep(), pause()
+#endif
 
 #include "wpc.h"
 
-#define LOG_MODULE_NAME "Main"
+#define LOG_MODULE_NAME "example_main"
 #define MAX_LOG_LEVEL INFO_LOG_LEVEL
 #include "logger.h"
 
 // Default serial port
-char * port_name = "/dev/ttyACM0";
+#ifdef PLATFORM_IS_WIN32
+static char * port_name = "COM1";
+#elif PLATFORM_IS_LINUX
+static char * port_name = "/dev/ttyACM0";
+#elif PLATFORM_IS_DARWIN
+static char * port_name = "/dev/cu.usbmodem0001234567890";
+#else
+static char * port_name = "/dev/ttyS0";
+#endif
 
 // Node configuration
 #define NODE_ADDRESS 0x1
@@ -35,13 +50,26 @@ static bool onDataReceived(const uint8_t * bytes,
                            uint8_t hop_count,
                            unsigned long long timestamp_ms_epoch)
 {
+    // Suppress warnings for unused parameters
+    (void) bytes;
+    (void) num_bytes;
+    (void) src_addr;
+    (void) dst_addr;
+    (void) qos;
+    (void) src_ep;
+    (void) dst_ep;
+    (void) travel_time;
+    (void) hop_count;
+    (void) timestamp_ms_epoch;
+
     // Handle Data received here
-    LOGI("Data received on EP %d of len %d with id %d from 0x%x to 0x%x\n",
+    LOGI("Data received on EP %u of len %u with id %u from %lu to %lu\n",
          dst_ep,
          num_bytes,
          bytes[0],
-         src_addr,
-         dst_addr);
+         (unsigned long) src_addr,
+         (unsigned long) dst_addr);
+
     return true;
 }
 
@@ -56,7 +84,25 @@ static bool onDiagReceived(const uint8_t * bytes,
                            uint8_t hop_count,
                            unsigned long long timestamp_ms_epoch)
 {
+    // Suppress warnings for unused parameters
+    (void) bytes;
+    (void) num_bytes;
+    (void) src_addr;
+    (void) dst_addr;
+    (void) qos;
+    (void) src_ep;
+    (void) dst_ep;
+    (void) travel_time;
+    (void) hop_count;
+    (void) timestamp_ms_epoch;
+
     // Handle diag packet here
+    // Handle Data received here
+    LOGI("Diag received from EP %u of len %u from %lu to %lu\n",
+         src_ep,
+         num_bytes,
+         (unsigned long) src_addr,
+         (unsigned long) dst_addr);
 
     return true;
 }

example/makefile

@@ -1,87 +1,43 @@
-# Makefile for Wirepas C Mesh API example
-
-# Toolchain
-CC  := gcc
-AS  := as
-LD  := ld
-AR  := ar
-
-# Paths, including trailing path separator
-SOURCEPREFIX   := ./
-BUILDPREFIX    := build/
-
-# This example needs the mesh lib
-MESH_LIB_FOLDER := ../lib/
-MESH_LIB := $(MESH_LIB_FOLDER)build/mesh_api_lib.a
-
-# General compiler flags
-CFLAGS  := -std=gnu99 -Wall -Werror
-
-# Targets definition
-MAIN_APP := meshAPIExample
-
-TARGET_APP := $(BUILDPREFIX)$(MAIN_APP)
-
-# Add Api header
-CFLAGS  += -I$(MESH_LIB_FOLDER)api
-# Add pthtread lib as needed by Mesh Lib
-LDFLAGS += -pthread
-# Add Reentrant flag as using pthread
-CFLAGS  += -D_REENTRANT
-
-# Specific sources for main
-SOURCES:= $(SOURCEPREFIX)main.c
-
-OBJECTS := $(patsubst $(SOURCEPREFIX)%,                     \
-                  $(BUILDPREFIX)%,                          \
-                  $(SOURCES:.c=.o))
-
-# Functions
-
-# Also create the target directory if it does not exist
-define COMPILE
-	echo "  CC $(2)"
-	mkdir -p $(dir $(1))
-	$(CC) $(CFLAGS) -c -o $(1) $(2)
-endef
-
-define LINK
-	echo "  Linking $(1)"
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(1) $(2) $(MESH_LIB)
-endef
-
-define CLEAN
-	echo "  Cleaning up"
-	$(RM) -r $(BUILDPREFIX)
-endef
-
-# Target rules
-
-# Use dependency files automatically generated by GCC.
-# First collect all C source files
-AUTODEPS := $(patsubst $(SOURCEPREFIX)%.c, $(BUILDPREFIX)%.d, $(SOURCES))
-
-ifeq ($(V),1)
-# "V=1" on command line, print commands.
-else
-# Default, do not print commands.
-.SILENT:
-endif
-
-.PHONY: all
-all: app
-
-app: $(TARGET_APP)
-
-.PHONY: clean
-clean:
-	$(call CLEAN)
-
-$(MESH_LIB):
-	make -C $(MESH_LIB_FOLDER)
-
-$(BUILDPREFIX)%.o: $(SOURCEPREFIX)%.c
-	$(call COMPILE,$@,$<)
-
-$(BUILDPREFIX)$(MAIN_APP): $(OBJECTS) $(MESH_LIB)
-	$(call LINK,$@,$^)
+# This file selects the correct makefile for Microsoft NMAKE and GNU make
+
+# Theory of operation:
+#
+# Microsoft NMAKE considers the caret (^) as an escape character. It is
+# possible to specify a literal newline character in a macro by using a
+# caret at the end of a line. The next line will then be consumed as part
+# of the macro definition. GNU make does not consider a caret as anything
+# special, so macro definitions that end in a caret will consume just a
+# single line.
+#
+# This distinction can be used to hide single lines from NMAKE. Putting
+# GNU make-specific directives on those lines can then be used to hide
+# NMAKE-specific portions from GNU make.
+
+GNU_MAKE_IF=^
+ifeq (0, 1)                             # This line only interpreted by GNU make
+
+# Include NMAKE makefile                #                                   #
+!INCLUDE nmake.mk                       #                                   #
+#                                       # < This portion only seen by NMAKE #
+# Begin skip everything else for NMAKE  #                                   #
+!IF 0                                   #                                   #
+
+GNU_MAKE_ELSE=^
+else                                    # This line only interpreted by GNU make
+
+# Include GNU make makefile             #                                      #
+include gnu_make.mk                     # < This portion only seen by GNU make #
+#                                       #                                      #
+
+GNU_MAKE_ENDIF=^
+endif                                   # This line only interpreted by GNU make
+
+GNU_MAKE_IF_2=^
+ifeq (0, 1)                             # This line only interpreted by GNU make
+
+# End skip everything else for NMAKE    #                                   #
+!ENDIF                                  # < This portion only seen by NMAKE #
+#                                       #                                   #
+
+GNU_MAKE_ENDIF_2=^
+endif                                   # This line only interpreted by GNU make

example/nmake.mk

@@ -0,0 +1,60 @@
+# Makefile for Wirepas C Mesh API example, Microsoft NMAKE version
+
+# Variables
+
+# This example needs the C Mesh API library
+MESH_LIB_FOLDER = ..\lib
+MESH_LIB = $(MESH_LIB_FOLDER)\build\mesh_api_lib.lib
+
+# Detect platform and set toolchain variables
+!INCLUDE $(MESH_LIB_FOLDER)\tools_msvc.mk
+
+# Path of source files and build outputs
+SOURCEPREFIX = .
+BUILDPREFIX = build
+
+# Targets definition
+MAIN_APP = meshAPIExample
+TARGET_APP = $(BUILDPREFIX)\$(MAIN_APP).exe
+
+# Add API header
+CFLAGS = $(CFLAGS) /I$(MESH_LIB_FOLDER)\api
+
+# Source files
+SOURCES = $(SOURCEPREFIX)\main.c
+
+# Object files, one for each C source file
+OBJECTS = $(SOURCES:.c=.obj)
+
+
+# Target rules
+
+!IF "$(V)"=="1"
+	# "V=1" on command line, print commands
+!MESSAGE SOURCES: $(SOURCES)
+!MESSAGE OBJECTS: $(OBJECTS)
+!ELSE
+.SILENT:# Default, do not print commands
+!ENDIF
+
+all: app
+
+app: lib $(TARGET_APP)
+
+clean:
+	echo CLEAN
+	-del /F $(OBJECTS) $(TARGET_APP) >NUL 2>NUL
+	-rmdir /S /Q $(BUILDPREFIX) >NUL 2>NUL
+
+lib:
+	cd $(MESH_LIB_FOLDER) && $(MAKE) /nologo /f nmake.mk
+
+.c.obj:
+	echo CC $*.c
+	-mkdir $(@D) >NUL 2>NUL
+	$(CC) $(CFLAGS) /c /Fo$@ $*.c
+
+$(TARGET_APP): $(OBJECTS) $(MESH_LIB)
+	echo LINK $@
+	-mkdir $(@D) >NUL 2>NUL
+	$(CC) $(LDFLAGS) /Fe$@ $**