Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development #282

Merged
merged 17 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,3 @@ software_version_id.h
/lib-nextion
/lib-node
/lib-showfile/Doxygen
/lib-clib
lib-network/src/emac/gd32/ptp/ntp/net_ptp.cpp
2 changes: 1 addition & 1 deletion firmware-template-h3/Rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ endif

include ../firmware-template/libs.mk

LIBS+=c++ h3 c arm
LIBS+=h3 clib arm

# Output
TARGET=$(SUFFIX).img
Expand Down
37 changes: 33 additions & 4 deletions include/cstring
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @file cstring
*
*/
/* Copyright (C) 2021 by Arjan van Vught mailto:info@orangepi-dmx.nl
/* Copyright (C) 2021-2024 by Arjan van Vught mailto:info@gd32-dmx.org
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
Expand All @@ -26,8 +26,37 @@
#ifndef CSTRING_
#define CSTRING_

#ifdef __cplusplus
# include <string.h>
#endif
#include <string.h>

// Get rid of those macros defined in <string.h> in lieu of real functions.
#undef memcmp
#undef memcpy
#undef memmove
#undef memset
#undef strchr
#undef strcmp
#undef strcpy
#undef strerror
#undef strlen
#undef strncmp
#undef strncpy
#undef strstr
#undef strtok

namespace std {
using ::memcmp;
using ::memcpy;
using ::memmove;
using ::memset;
using ::strcmp;
using ::strcpy;
using ::strerror;
using ::strlen;
using ::strncmp;
using ::strncpy;
using ::strtok;
using ::strchr;
using ::strstr;
}

#endif /* CSTRING_ */
22 changes: 12 additions & 10 deletions lib-arm/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<targetPlatform archList="all" binaryParser="" id="cdt.managedbuild.targetPlatform.gnu.cross.866050940" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
<builder id="cdt.managedbuild.builder.gnu.cross.1628366801" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.318651365" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.418153163" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.c.compiler.option.include.paths.418153163" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" useByScannerDiscovery="false" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.60298507" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
Expand All @@ -45,7 +45,7 @@
<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.271860043" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"/>
<tool id="cdt.managedbuild.tool.gnu.cross.archiver.418515012" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
<tool id="cdt.managedbuild.tool.gnu.cross.assembler.553773458" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.3189995" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="gnu.both.asm.option.include.paths.3189995" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/include}&quot;"/>
</option>
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.69290645" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
Expand All @@ -55,7 +55,6 @@
<sourceEntries>
<entry excluding="builtins|src" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
<entry excluding="debug|builtins" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/builtins"/>
<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="src/debug"/>
</sourceEntries>
</configuration>
Expand Down Expand Up @@ -134,28 +133,31 @@
</storageModule>
<storageModule moduleId="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145.;cdt.managedbuild.tool.gnu.cross.c.compiler.1982306637;cdt.managedbuild.tool.gnu.c.compiler.input.1888524606">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354.;cdt.managedbuild.tool.gnu.c.compiler.base.1382458660;cdt.managedbuild.tool.gnu.c.compiler.input.1157907807">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1944703491;cdt.managedbuild.tool.gnu.cpp.compiler.input.220843750">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1724897672;cdt.managedbuild.tool.gnu.cpp.compiler.input.1925533409">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354.;cdt.managedbuild.tool.gnu.cpp.compiler.base.2017114645;cdt.managedbuild.tool.gnu.cpp.compiler.input.258966306">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792.;cdt.managedbuild.tool.gnu.cross.c.compiler.1080471636;cdt.managedbuild.tool.gnu.c.compiler.input.157592822">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354.;cdt.managedbuild.tool.gnu.c.compiler.base.1382458660;cdt.managedbuild.tool.gnu.c.compiler.input.1157907807">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.378117466;cdt.managedbuild.tool.gnu.cpp.compiler.input.334666458">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.1544501101;cdt.managedbuild.toolchain.gnu.cross.base.1544501101.2091608426;cdt.managedbuild.tool.gnu.cross.c.compiler.318651365;cdt.managedbuild.tool.gnu.c.compiler.input.60298507">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.;cdt.managedbuild.tool.gnu.cross.c.compiler.916864593;cdt.managedbuild.tool.gnu.c.compiler.input.772314880">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.378117466;cdt.managedbuild.tool.gnu.cpp.compiler.input.334666458">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.1794967145.;cdt.managedbuild.tool.gnu.cross.c.compiler.1982306637;cdt.managedbuild.tool.gnu.c.compiler.input.1888524606">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1724897672;cdt.managedbuild.tool.gnu.cpp.compiler.input.1925533409">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680;cdt.managedbuild.toolchain.gnu.cross.base.563973127.2112828680.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1944703491;cdt.managedbuild.tool.gnu.cpp.compiler.input.220843750">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1103449656.633010792.;cdt.managedbuild.tool.gnu.cross.c.compiler.1080471636;cdt.managedbuild.tool.gnu.c.compiler.input.157592822">
<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354;cdt.managedbuild.toolchain.gnu.cross.base.252252823.1507776794.202961412.1905879354.;cdt.managedbuild.tool.gnu.cpp.compiler.base.2017114645;cdt.managedbuild.tool.gnu.cpp.compiler.input.258966306">
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
</scannerConfigBuildInfo>
</storageModule>
Expand Down
6 changes: 3 additions & 3 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="952892912759689915" 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="-869171961626701684" 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 @@ -16,8 +16,8 @@
<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="([^/\\\\]*)((g?cc)|([gc]\+\+)|(clang))" prefer-non-shared="true"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923569655314817812" 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 copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1923799119167841812" 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
5 changes: 5 additions & 0 deletions lib-arm/.settings/org.eclipse.cdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
doxygen/doxygen_new_line_after_brief=true
doxygen/doxygen_use_brief_tag=false
doxygen/doxygen_use_javadoc_tags=true
doxygen/doxygen_use_pre_tag=false
doxygen/doxygen_use_structural_commands=false
eclipse.preferences.version=1
environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1544501101.820928665/PATH/delimiter=\:
environment/project/cdt.managedbuild.toolchain.gnu.cross.base.1544501101.820928665/PATH/operation=replace
Expand Down
Loading
Loading