Skip to content

Commit a82f112

Browse files
vanvughtvanvught
committed
Updates for previous commits
- Removed MDNS mDns - mDns.Print() -> mdns_print(); - Removed mDns.Run() - mDns.ServiceRecordAdd -> mdns_service_record_add
1 parent c87f41a commit a82f112

File tree

81 files changed

+304
-328
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+304
-328
lines changed

‎linux_artnet/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614854305781129438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614787929562633438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎linux_artnet/src/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
9393
Display display;
9494
ConfigStore configStore;
9595
Network nw(argc, argv);
96-
MDNS mDns;
96+
// MDNS mDns;
9797
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
9898

9999
hw.Print();
@@ -180,15 +180,15 @@ int main(int argc, char **argv) {
180180
while (configStore.Flash())
181181
;
182182

183-
mDns.Print();
183+
mdns_print(); // mDns.Print();
184184
node.Start();
185185

186186
while (keepRunning) {
187187
node.Run();
188188
#if defined (NODE_SHOWFILE)
189189
showFile.Run();
190190
#endif
191-
mDns.Run();
191+
mdns_run(); // mDns.Run();
192192
remoteConfig.Run();
193193
configStore.Flash();
194194
}

‎linux_ddp/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614936542426249438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614787929562633438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎linux_ddp/src/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
7171
Display display;
7272
ConfigStore configStore;
7373
Network nw(argc, argv);
74-
MDNS mDns;
74+
// MDNS mDns;
7575
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
7676

7777
hw.Print();
@@ -116,7 +116,7 @@ int main(int argc, char **argv) {
116116

117117
llrpOnlyDevice.Print();
118118

119-
mDns.ServiceRecordAdd(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
119+
mdns_service_record_add(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
120120

121121
ddpDisplay.Print();
122122

@@ -129,12 +129,12 @@ int main(int argc, char **argv) {
129129
while (configStore.Flash())
130130
;
131131

132-
mDns.Print();
132+
mdns_print(); // mDns.Print();
133133
ddpDisplay.Start();
134134

135135
while (keepRunning) {
136136
ddpDisplay.Run();
137-
mDns.Run();
137+
mdns_run(); // mDns.Run();
138138
remoteConfig.Run();
139139
llrpOnlyDevice.Run();
140140
configStore.Flash();

‎linux_e131/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614854305781129438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614787929562633438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎linux_e131/run.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
#!/bin/bash
22

3-
rm -rf build_linux
4-
53
make
64
retVal=$?
75
if [ $retVal -ne 0 ]; then
86
echo "Error"
97
exit $retVal
108
fi
119

12-
sudo valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -v ./linux_e131 eno1
10+
sudo valgrind --track-origins=yes -v ./linux_e131 bond0

‎linux_e131/src/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ int main(int argc, char **argv) {
9393
Display display;
9494
ConfigStore configStore;
9595
Network nw(argc, argv);
96-
MDNS mDns;
96+
// MDNS mDns;
9797
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
9898

9999
hw.Print();
@@ -160,7 +160,7 @@ int main(int argc, char **argv) {
160160

161161
llrpOnlyDevice.Print();
162162

163-
mDns.ServiceRecordAdd(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
163+
mdns_service_record_add(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
164164

165165
bridge.Print();
166166

@@ -187,15 +187,15 @@ int main(int argc, char **argv) {
187187
while (configStore.Flash())
188188
;
189189

190-
mDns.Print();
190+
mdns_print(); // mDns.Print();
191191
bridge.Start();
192192

193193
while (keepRunning) {
194194
bridge.Run();
195195
#if defined (NODE_SHOWFILE)
196196
showFile.Run();
197197
#endif
198-
mDns.Run();
198+
mdns_run(); // mDns.Run();
199199
remoteConfig.Run();
200200
llrpOnlyDevice.Run();
201201
configStore.Flash();

‎linux_osc/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614854305781129438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614787929562633438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎linux_osc/src/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ int main(int argc, char **argv) {
7474
Display display;
7575
ConfigStore configStore;
7676
Network nw(argc, argv);
77-
MDNS mDns;
77+
// MDNS mDns;
7878
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
7979

8080
hw.Print();
@@ -118,8 +118,8 @@ int main(int argc, char **argv) {
118118

119119
llrpOnlyDevice.Print();
120120

121-
mDns.ServiceRecordAdd(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
122-
mDns.ServiceRecordAdd(nullptr, mdns::Services::OSC, "type=monitor", server.GetPortIncoming());
121+
mdns_service_record_add(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
122+
mdns_service_record_add(nullptr, mdns::Services::OSC, "type=monitor", server.GetPortIncoming());
123123

124124
server.Print();
125125

@@ -132,12 +132,12 @@ int main(int argc, char **argv) {
132132
while (configStore.Flash())
133133
;
134134

135-
mDns.Print();
135+
mdns_print(); // mDns.Print();
136136
server.Start();
137137

138138
while (keepRunning) {
139139
server.Run();
140-
mDns.Run();
140+
mdns_run(); // mDns.Run();
141141
remoteConfig.Run();
142142
llrpOnlyDevice.Run();
143143
configStore.Flash();

‎linux_pp/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614936542426249438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
8+
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1614787929562633438" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎linux_pp/src/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ int main(int argc, char **argv) {
7171
Display display;
7272
ConfigStore configStore;
7373
Network nw(argc, argv);
74-
MDNS mDns;
74+
// MDNS mDns;
7575
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
7676

7777
hw.Print();
@@ -114,7 +114,7 @@ int main(int argc, char **argv) {
114114

115115
llrpOnlyDevice.Print();
116116

117-
mDns.ServiceRecordAdd(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
117+
mdns_service_record_add(nullptr, mdns::Services::RDMNET_LLRP, "node=RDMNet LLRP Only");
118118

119119
pp.Print();
120120

@@ -127,12 +127,12 @@ int main(int argc, char **argv) {
127127
while (configStore.Flash())
128128
;
129129

130-
mDns.Print();
130+
mdns_print(); // mDns.Print();
131131
pp.Start();
132132

133133
while (keepRunning) {
134134
pp.Run();
135-
mDns.Run();
135+
mdns_run(); // mDns.Run();
136136
remoteConfig.Run();
137137
llrpOnlyDevice.Run();
138138
configStore.Flash();

‎opi_dmx_monitor/.settings/language.settings.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<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">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>
@@ -17,7 +17,7 @@
1717
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
1818
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
1919
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
20-
<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">
20+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
2121
<language-scope id="org.eclipse.cdt.core.gcc"/>
2222
<language-scope id="org.eclipse.cdt.core.g++"/>
2323
</provider>

‎opi_dmx_usb_pro/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<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">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎opi_emac_artnet_dmx/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<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">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎opi_emac_artnet_dmx/firmware/main.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ int main() {
7777
ConfigStore configStore;
7878
display.TextStatus(NetworkConst::MSG_NETWORK_INIT, CONSOLE_YELLOW);
7979
Network nw;
80-
MDNS mDns;
8180
display.TextStatus(NetworkConst::MSG_NETWORK_STARTED, CONSOLE_GREEN);
8281
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
8382
FlashCodeInstall spiFlashInstall;
@@ -158,7 +157,7 @@ int main() {
158157
while (configStore.Flash())
159158
;
160159

161-
mDns.Print();
160+
mdns_print(); // mDns.Print();
162161

163162
display.TextStatus(ArtNetMsgConst::START, CONSOLE_YELLOW);
164163

@@ -177,7 +176,7 @@ int main() {
177176
#endif
178177
remoteConfig.Run();
179178
configStore.Flash();
180-
mDns.Run();
179+
// mdns_run(); // mDns.Run(); // mDns.Run();
181180
display.Run();
182181
hw.Run();
183182
}

‎opi_emac_artnet_dmx_multi/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<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">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎opi_emac_artnet_dmx_multi/firmware/main.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ int main() {
7777
ConfigStore configStore;
7878
display.TextStatus(NetworkConst::MSG_NETWORK_INIT, CONSOLE_YELLOW);
7979
Network nw;
80-
MDNS mDns;
8180
display.TextStatus(NetworkConst::MSG_NETWORK_STARTED, CONSOLE_GREEN);
8281
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
8382
FlashCodeInstall spiFlashInstall;
@@ -162,7 +161,7 @@ int main() {
162161
while (configStore.Flash())
163162
;
164163

165-
mDns.Print();
164+
mdns_print(); // mDns.Print();
166165

167166
display.TextStatus(ArtNetMsgConst::START, CONSOLE_YELLOW);
168167

@@ -181,7 +180,7 @@ int main() {
181180
#endif
182181
remoteConfig.Run();
183182
configStore.Flash();
184-
mDns.Run();
183+
// mdns_run(); // mDns.Run(); // mDns.Run();
185184
display.Run();
186185
hw.Run();
187186
}

‎opi_emac_artnet_monitor/.settings/language.settings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
66
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
77
<provider copy-of="extension" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser"/>
8-
<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">
8+
<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-869023348763085684" 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">
99
<language-scope id="org.eclipse.cdt.core.gcc"/>
1010
<language-scope id="org.eclipse.cdt.core.g++"/>
1111
</provider>

‎opi_emac_artnet_monitor/firmware/main.cpp

+2-3
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ int main() {
7777
ConfigStore configStore;
7878
display.TextStatus(NetworkConst::MSG_NETWORK_INIT, CONSOLE_YELLOW);
7979
Network nw;
80-
MDNS mDns;
8180
display.TextStatus(NetworkConst::MSG_NETWORK_STARTED, CONSOLE_GREEN);
8281
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
8382
FlashCodeInstall spiFlashInstall;
@@ -154,7 +153,7 @@ int main() {
154153
while (configStore.Flash())
155154
;
156155

157-
mDns.Print();
156+
mdns_print(); // mDns.Print();
158157

159158
display.TextStatus(ArtNetMsgConst::START, CONSOLE_YELLOW);
160159

@@ -175,7 +174,7 @@ int main() {
175174
configStore.Flash();
176175
ntpClient.Run();
177176
showSystime.Run();
178-
mDns.Run();
177+
// mdns_run(); // mDns.Run(); // mDns.Run();
179178
display.Run();
180179
hw.Run();
181180
}

‎opi_emac_artnet_pixel/firmware/main.cpp

+1-6
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ int main() {
8787
ConfigStore configStore;
8888
display.TextStatus(NetworkConst::MSG_NETWORK_INIT, CONSOLE_YELLOW);
8989
Network nw;
90-
MDNS mDns;
9190
display.TextStatus(NetworkConst::MSG_NETWORK_STARTED, CONSOLE_GREEN);
9291
FirmwareVersion fw(SOFTWARE_VERSION, __DATE__, __TIME__);
9392
FlashCodeInstall spiFlashInstall;
@@ -210,7 +209,7 @@ int main() {
210209
while (configStore.Flash())
211210
;
212211

213-
mDns.Print();
212+
mdns_print(); // mDns.Print();
214213

215214
display.TextStatus(ArtNetMsgConst::START, CONSOLE_YELLOW);
216215

@@ -228,12 +227,8 @@ int main() {
228227
showFile.Run();
229228
#endif
230229
remoteConfig.Run();
231-
#if defined (NODE_RDMNET_LLRP_ONLY)
232-
llrpOnlyDevice.Run();
233-
#endif
234230
configStore.Flash();
235231
pixelTestPattern.Run();
236-
mDns.Run();
237232
display.Run();
238233
hw.Run();
239234
}

0 commit comments

Comments
 (0)