Fixup osd examples, contiki prints panid and channel on boot

2018-02-14 18:49:37 +01:00 · 2018-02-14 18:49:37 +01:00 · 1c8b438bca
parent 3de5c47802
commit 1c8b438bca
19 changed files with 0 additions and 152 deletions
--- a/examples/osd/climate/er-example-server.c
+++ b/examples/osd/climate/er-example-server.c
@ -130,14 +130,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
  PROCESS_BEGIN();

  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/climate2/er-example-server.c
+++ b/examples/osd/climate2/er-example-server.c
@ -126,14 +126,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
  PROCESS_BEGIN();

  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/dual-rgbw-actor/er-example-server.c
+++ b/examples/osd/dual-rgbw-actor/er-example-server.c
@ -212,14 +212,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 {
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/embedd-vm-merkurboard/embedd-vm-server.c
+++ b/examples/osd/embedd-vm-merkurboard/embedd-vm-server.c
@ -392,14 +392,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
  PROCESS_BEGIN();

  PRINTF("Starting Embedd-VM Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/embedd-vm-merkurboard/er-plugtest-server.c
+++ b/examples/osd/embedd-vm-merkurboard/er-plugtest-server.c
@ -502,14 +502,6 @@ PROCESS_THREAD(plugtest_server, ev, data)
  PROCESS_BEGIN();

  PRINTF("ETSI IoT CoAP Plugtests Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/er-rest-example-merkurboard/er-example-server.c
+++ b/examples/osd/er-rest-example-merkurboard/er-example-server.c
@ -113,14 +113,6 @@ PROCESS_THREAD(er_example_server, ev, data)
  PROCESS_PAUSE();

  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/er-rest-example-merkurboard/er-plugtest-server.c
+++ b/examples/osd/er-rest-example-merkurboard/er-plugtest-server.c
@ -81,14 +81,6 @@ PROCESS_THREAD(plugtest_server, ev, data)
  PROCESS_BEGIN();

  PRINTF("ETSI IoT CoAP Plugtests Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/light-actor/er-example-server.c
+++ b/examples/osd/light-actor/er-example-server.c
@ -688,14 +688,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 	  
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/light-shutter-control/er-example-server.c
+++ b/examples/osd/light-shutter-control/er-example-server.c
@ -742,14 +742,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 	  
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/merkurboard/er-example-server.c
+++ b/examples/osd/merkurboard/er-example-server.c
@ -109,14 +109,6 @@ PROCESS_THREAD(er_example_server, ev, data)
  PROCESS_PAUSE();

  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/merkurboard/er-plugtest-server.c
+++ b/examples/osd/merkurboard/er-plugtest-server.c
@ -81,14 +81,6 @@ PROCESS_THREAD(plugtest_server, ev, data)
  PROCESS_BEGIN();

  PRINTF("ETSI IoT CoAP Plugtests Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/pingtheplug/er-example-server.c
+++ b/examples/osd/pingtheplug/er-example-server.c
@ -688,14 +688,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 	  
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/pir-sensor/er-example-server.c
+++ b/examples/osd/pir-sensor/er-example-server.c
@ -378,14 +378,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 {
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/powerbox/er-example-server.c
+++ b/examples/osd/powerbox/er-example-server.c
@ -351,14 +351,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 {
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/pwm-example/er-example-server.c
+++ b/examples/osd/pwm-example/er-example-server.c
@ -70,14 +70,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 {
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/servo-sensor/er-example-server.c
+++ b/examples/osd/servo-sensor/er-example-server.c
@ -403,14 +403,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
 {
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/wallclock-time/wallclock.c
+++ b/examples/osd/wallclock-time/wallclock.c
@ -113,14 +113,6 @@ PROCESS_THREAD(rest_server_example, ev, data)
  static struct etimer loop_periodic_timer;
  PROCESS_BEGIN();
  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/wirelessplug/er-example-server.c
+++ b/examples/osd/wirelessplug/er-example-server.c
@ -946,14 +946,6 @@ PROCESS_THREAD(rest_server_example, ev, data)


  PRINTF("Starting Erbium Example Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);
--- a/examples/osd/wirelessplug/er-plugtest-server.c
+++ b/examples/osd/wirelessplug/er-plugtest-server.c
@ -502,14 +502,6 @@ PROCESS_THREAD(plugtest_server, ev, data)
  PROCESS_BEGIN();

  PRINTF("ETSI IoT CoAP Plugtests Server\n");
-
-#ifdef RF_CHANNEL
-  PRINTF("RF channel: %u\n", RF_CHANNEL);
-#endif
-#ifdef IEEE802154_PANID
-  PRINTF("PAN ID: 0x%04X\n", IEEE802154_PANID);
-#endif
-
  PRINTF("uIP buffer: %u\n", UIP_BUFSIZE);
  PRINTF("LL header: %u\n", UIP_LLH_LEN);
  PRINTF("IP+UDP header: %u\n", UIP_IPUDPH_LEN);