Skip to content

Commit

Permalink
Sync with local development
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanvught
vanvught committed Dec 26, 2023
1 parent 742c879 commit c664ba1
Show file tree
Hide file tree
Showing 50 changed files with 531 additions and 1,013 deletions.
10 changes: 1 addition & 9 deletions gd32_emac_artnet_pixel_dmx_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ void main() {
ArtNetParams artnetParams(&storeArtNet);

if (artnetParams.Load()) {
artnetParams.Dump();
artnetParams.Set(DMXPORT_OFFSET);
}

Expand All @@ -135,7 +134,6 @@ void main() {
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}

Expand Down Expand Up @@ -182,7 +180,6 @@ void main() {
Dmx dmx;

dmxparams.Load();
dmxparams.Dump();
dmxparams.Set(&dmx);

for (uint32_t nPortIndex = DMXPORT_OFFSET; nPortIndex < artnetnode::MAX_PORTS; nPortIndex++) {
Expand Down Expand Up @@ -233,7 +230,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -248,7 +244,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show(&node, DMXPORT_OFFSET);
Expand All @@ -266,11 +261,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::ARTNET, remoteconfig::Output::PIXEL, node.GetActiveOutputPorts());

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
9 changes: 1 addition & 8 deletions gd32_emac_artnet_pixel_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ void main() {
ArtNetParams artnetParams(&storeArtNet);

if (artnetParams.Load()) {
artnetParams.Dump();
artnetParams.Set(DMXPORT_OFFSET);
}

Expand All @@ -123,7 +122,6 @@ void main() {
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}

Expand Down Expand Up @@ -182,7 +180,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -200,7 +197,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show(&node, DMXPORT_OFFSET);
Expand All @@ -218,11 +214,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::ARTNET, remoteconfig::Output::PIXEL, node.GetActiveOutputPorts());

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
2 changes: 1 addition & 1 deletion gd32_emac_ddp_pixel_dmx_multi/.settings/language.settings.xml
View file
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 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="-987013254894174242" 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="-959482629664744322" 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
9 changes: 1 addition & 8 deletions gd32_emac_ddp_pixel_dmx_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ void main() {
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}

Expand All @@ -140,7 +139,6 @@ void main() {
Dmx dmx;

dmxparams.Load();
dmxparams.Dump();
dmxparams.Set(&dmx);

DmxSend dmxSend;
Expand Down Expand Up @@ -176,7 +174,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -192,7 +189,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show();
Expand All @@ -210,11 +206,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::DDP, remoteconfig::Output::PIXEL, nActivePorts);

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
2 changes: 1 addition & 1 deletion gd32_emac_ddp_pixel_multi/.settings/language.settings.xml
View file
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 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="-987013254894174242" 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="-959482629664744322" 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
8 changes: 1 addition & 7 deletions gd32_emac_ddp_pixel_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ void main() {
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}

Expand Down Expand Up @@ -148,7 +147,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -164,7 +162,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show();
Expand All @@ -182,11 +179,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::DDP, remoteconfig::Output::PIXEL, nActivePorts);

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
6 changes: 1 addition & 5 deletions gd32_emac_debug/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,18 +133,14 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show();

RemoteConfig remoteConfig(remoteconfig::Node::RDMNET_LLRP_ONLY, remoteconfig::Output::CONFIG, 0);

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
20 changes: 5 additions & 15 deletions gd32_emac_e131_pixel_dmx_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,8 @@ void main() {

E131Bridge bridge;

if (e131params.Load()) {
e131params.Dump();
e131params.Set(DMXPORT_OFFSET);
}
e131params.Load();
e131params.Set(DMXPORT_OFFSET);

// LightSet A - Pixel - 64 Universes

Expand All @@ -129,10 +127,8 @@ void main() {
StorePixelDmx storePixelDmx;
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}
pixelDmxParams.Load();
pixelDmxParams.Set(&pixelDmxConfiguration);

WS28xxDmxMulti pixelDmxMulti(pixelDmxConfiguration);
pixelDmxMulti.SetPixelDmxHandler(new PixelDmxStartStop);
Expand Down Expand Up @@ -181,7 +177,6 @@ void main() {
Dmx dmx;

dmxparams.Load();
dmxparams.Dump();
dmxparams.Set(&dmx);

for (uint32_t nPortIndex = DMXPORT_OFFSET; nPortIndex < e131bridge::MAX_PORTS; nPortIndex++) {
Expand Down Expand Up @@ -228,7 +223,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -244,7 +238,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show(&bridge, DMXPORT_OFFSET);
Expand All @@ -262,11 +255,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::E131, remoteconfig::Output::PIXEL, bridge.GetActiveOutputPorts());

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
20 changes: 5 additions & 15 deletions gd32_emac_e131_pixel_multi/firmware/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,15 @@ void main() {

E131Bridge bridge;

if (e131params.Load()) {
e131params.Dump();
e131params.Set(DMXPORT_OFFSET);
}
e131params.Load();
e131params.Set(DMXPORT_OFFSET);

PixelDmxConfiguration pixelDmxConfiguration;

StorePixelDmx storePixelDmx;
PixelDmxParams pixelDmxParams(&storePixelDmx);

if (pixelDmxParams.Load()) {
pixelDmxParams.Dump();
pixelDmxParams.Set(&pixelDmxConfiguration);
}
pixelDmxParams.Load();
pixelDmxParams.Set(&pixelDmxConfiguration);

WS28xxDmxMulti pixelDmxMulti(pixelDmxConfiguration);
pixelDmxMulti.SetPixelDmxHandler(new PixelDmxStartStop);
Expand Down Expand Up @@ -173,7 +168,6 @@ void main() {
RDMDeviceParams rdmDeviceParams;

rdmDeviceParams.Load();
rdmDeviceParams.Dump();
rdmDeviceParams.Set(&llrpOnlyDevice);

llrpOnlyDevice.Print();
Expand All @@ -192,7 +186,6 @@ void main() {
DisplayUdfParams displayUdfParams;

displayUdfParams.Load();
displayUdfParams.Dump();
displayUdfParams.Set(&display);

display.Show(&bridge);
Expand All @@ -210,11 +203,8 @@ void main() {

RemoteConfig remoteConfig(remoteconfig::Node::E131, remoteconfig::Output::PIXEL, bridge.GetActiveOutputPorts());

StoreRemoteConfig storeRemoteConfig;
RemoteConfigParams remoteConfigParams(&storeRemoteConfig);

RemoteConfigParams remoteConfigParams;
remoteConfigParams.Load();
remoteConfigParams.Dump();
remoteConfigParams.Set(&remoteConfig);

while (configStore.Flash())
Expand Down
3 changes: 1 addition & 2 deletions lib-artnet/include/artnetparams.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ class ArtNetParams {

void Set(uint32_t nPortIndexOffset);

void Dump();

bool IsRdm() const {
return isMaskSet(artnetparams::Mask::ENABLE_RDM);
}
Expand Down Expand Up @@ -187,6 +185,7 @@ class ArtNetParams {
return static_cast<artnet::PortProtocol>((m_Params.nProtocol >> (nPortIndex * 2)) & 0x3);
}

void Dump();
void callbackFunction(const char *pLine);
void SetBool(const uint8_t nValue, const uint32_t nMask);
bool isMaskSet(uint32_t nMask) const {
Expand Down
Loading

0 comments on commit c664ba1

Please sign in to comment.