Skip to content

Commit

Permalink
Merge pull request #285 from vanvught/development
Browse files Browse the repository at this point in the history
Several improvements and fixes
  • Loading branch information
vanvught authored Nov 17, 2024
2 parents dbe3674 + ed4468e commit 7a83cc4
Show file tree
Hide file tree
Showing 541 changed files with 9,317 additions and 10,105 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,8 @@ software_version_id.h
/lib-node
/lib-showfile/Doxygen
/opi_emac_eve_example
*._h
*._cpp
/opi_emac_debug_lcd_udp
/lib-dmxnode
opi_emac_llrp_tftpd/do-tftp-bad.sh
10 changes: 5 additions & 5 deletions firmware-template-h3/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ ifeq ($(findstring ORANGE_PI,$(PLATFORM)),ORANGE_PI)
COND=1
endif

include ../firmware-template/libs.mk

LIBS+=h3 clib arm

# Output
TARGET=$(SUFFIX).img
LIST=$(SUFFIX).list
Expand Down Expand Up @@ -64,8 +60,12 @@ ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
endif
endif

include ../firmware-template/libs.mk

LIBS+=h3 clib arm

# The variable for the firmware include directories
INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include) ../firmware-template-h3/include ../lib-h3/CMSIS/Core_A/Include
INCDIRS+=../include $(wildcard ./include) $(wildcard ./*/include) ../firmware-template-h3/include ../lib-h3/CMSIS/Core_A/Include -I../lib-flashcodeinstall/include
INCDIRS:=$(addprefix -I,$(INCDIRS))

# The variable for the libraries include directory
Expand Down
7 changes: 4 additions & 3 deletions firmware-template-h3/lib/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ SRCDIR+=src/debug

$(info [${SRCDIR}])

INCLUDES:=-I./include -I../include -I../lib-device/include -I../lib-flash/include -I../lib-configstore/include -I../lib-hal/include -I../lib-debug/include -I../lib-h3/include -I../lib-arm/include
INCLUDES:=-I./include -I../include -I../lib-device/include -I../lib-configstore/include -I../lib-hal/include -I../lib-debug/include -I../lib-h3/include -I../lib-arm/include
INCLUDES+=-I../lib-flash/include -I../lib-flashcodeinstall/include
INCLUDES+=-I../lib-h3/CMSIS/Core_A/Include
INCLUDES+=$(addprefix -I,$(EXTRA_INCLUDES))

Expand Down Expand Up @@ -63,8 +64,8 @@ $(info $$MAKE_FLAGS [${MAKE_FLAGS}])

COPS=-DBARE_METAL -DH3 $(DEFINES) $(MAKE_FLAGS) $(INCLUDES)
COPS+=-mfpu=neon-vfpv4 -mcpu=cortex-a7 -mfloat-abi=hard -mhard-float
COPS+=-nostartfiles -ffreestanding -nostdlib -fprefetch-loop-arrays
COPS+=-O2 -Wall -Werror -Wextra -Wpedantic -Wunused -Wsign-conversion -Wconversion
COPS+=-nostartfiles -ffreestanding -nostdlib
COPS+=-Os -Wall -Werror -Wextra -Wpedantic -Wunused -Wsign-conversion -Wconversion
COPS+=-Wduplicated-cond -Wlogical-op -Wduplicated-branches
COPS+=-ffunction-sections -fdata-sections

Expand Down
4 changes: 4 additions & 0 deletions firmware-template-linux/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ ifeq ($(findstring ARTNET_VERSION=4,$(DEFINES)),ARTNET_VERSION=4)
endif
endif

ifneq ($(findstring _TIME_STAMP_YEAR_,$(DEFINES)), _TIME_STAMP_YEAR_)
DEFINES+=-D_TIME_STAMP_YEAR_=$(shell date +"%Y") -D_TIME_STAMP_MONTH_=$(shell date +"%-m") -D_TIME_STAMP_DAY_=$(shell date +"%-d")
endif

# The variable for the firmware include directories
INCDIRS=$(wildcard ./lib) $(wildcard ./include) $(wildcard ./*/include) ../firmware-template-linux/include
INCDIRS:=$(addprefix -I,$(INCDIRS)) -I../lib-display/include
Expand Down
4 changes: 0 additions & 4 deletions firmware-template/libs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ else
LIBS+=flashcodeinstall flashcode flash
endif

ifeq ($(findstring NODE_LTC_SMPTE,$(DEFINES)),NODE_LTC_SMPTE)
DEFINES+=CONFIG_DISPLAY_ENABLE_SSD1311 CONFIG_DISPLAY_ENABLE_HD44780 CONFIG_DISPLAY_ENABLE_CURSOR_MODE
endif

ifneq ($(findstring network,$(LIBS)),network)
LIBS+=network
endif
Expand Down
4 changes: 2 additions & 2 deletions lib-arm/.settings/language.settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869088479795149684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-868968903555373684" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand All @@ -17,7 +17,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923882600999393812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1924002177239169812" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/>
</provider>
Expand Down
69 changes: 41 additions & 28 deletions lib-artnet/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.272354303" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -83,6 +85,8 @@
<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2086813026" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand Down Expand Up @@ -177,6 +181,8 @@
<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1814233140" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool>
Expand Down Expand Up @@ -209,6 +215,8 @@
<listOptionValue builtIn="false" value="CONFIG_PANELLED_RDM_PORT"/>
<listOptionValue builtIn="false" value="NODE_SHOWFILE"/>
<listOptionValue builtIn="false" value="CONFIG_SHOWFILE_PROTOCOL_NODE_ARTNET"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.138434766" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool>
Expand Down Expand Up @@ -361,18 +369,13 @@
<listOptionValue builtIn="false" value="BARE_METAL"/>
<listOptionValue builtIn="false" value="RDM_CONTROLLER"/>
<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_DMXIN"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.653222067" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-arm/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-h3/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-hal/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-lightset/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-network/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-rdm/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-e131/include}&quot;"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths.653222067" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.assembler.include.paths" valueType="includePath"/>
<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input.1115950689" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.assembler.input"/>
</tool>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.783814895" name="GNU Arm Cross C Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler">
Expand All @@ -385,18 +388,13 @@
<listOptionValue builtIn="false" value="BARE_METAL"/>
<listOptionValue builtIn="false" value="RDM_CONTROLLER"/>
<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_DMXIN"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.510275320" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-arm/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-h3/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-hal/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-lightset/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-network/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-rdm/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-e131/include}&quot;"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="true" id="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths.510275320" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.c.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath"/>
<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input.2134415444" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.c.compiler.input"/>
</tool>
<tool id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.278366251" name="GNU Arm Cross C++ Compiler" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler">
Expand All @@ -409,6 +407,11 @@
<listOptionValue builtIn="false" value="BARE_METAL"/>
<listOptionValue builtIn="false" value="RDM_CONTROLLER"/>
<listOptionValue builtIn="false" value="ARTNET_VERSION=4"/>
<listOptionValue builtIn="false" value="ARTNET_SHOWFILE"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_DMXIN"/>
<listOptionValue builtIn="false" value="LIGHTSET_PORTS=4"/>
<listOptionValue builtIn="false" value="ARTNET_HAVE_TIMECODE"/>
<listOptionValue builtIn="false" value="OUTPUT_HAVE_STYLESWITCH"/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths.1645629639" name="Include paths (-I)" superClass="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.include.paths" useByScannerDiscovery="true" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
Expand All @@ -420,6 +423,9 @@
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-network/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-rdm/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-e131/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-dmx/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-configstore/include}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/lib-properties/include}&quot;"/>
</option>
<inputType id="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input.391517827" superClass="ilg.gnuarmeclipse.managedbuild.cross.tool.cpp.compiler.input"/>
</tool>
Expand Down Expand Up @@ -448,12 +454,19 @@
</toolChain>
</folderInfo>
<sourceEntries>
<entry excluding="jbc|src|src/h3|src/patterns|src/pixel" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="jbc"/>
<entry excluding="h3|patterns|pixel" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/h3"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/patterns"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/pixel"/>
<entry excluding="src|src/controller|src/node|src/node/4|src/node/dmxin|src/node/failsafe|src/node/rdm|src/node/failsafe/file|src/node/failsafe/rom|src/node/failsafe/spi|src/node/rdm/controller|src/node/rdm/responder" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="controller|node|node/4|node/dmxin|node/failsafe|node/failsafe/file|node/failsafe/rom|node/failsafe/spi|node/rdm|node/rdm/controller|node/rdm/responder" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/controller"/>
<entry excluding="4|dmxin|failsafe|failsafe/file|failsafe/rom|failsafe/spi|rdm|rdm/controller|rdm/responder" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/4"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/dmxin"/>
<entry excluding="file|rom|spi" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/failsafe"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/failsafe/file"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/failsafe/rom"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/failsafe/spi"/>
<entry excluding="controller|responder" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/rdm"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/rdm/controller"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src/node/rdm/responder"/>
</sourceEntries>
</configuration>
</storageModule>
Expand Down
Loading

0 comments on commit 7a83cc4

Please sign in to comment.