contiki-core: rename pbio-conf.h back to contiki-conf.h

This reverts 9019f02. This way, there is a clear separation between what is contiki and what is pbio.
pybricks · Dec 17, 2019 · d784184 · d784184
1 parent 962d4db
commit d784184
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 9 deletions.
diff --git a/lib/contiki-core/sys/cc.h b/lib/contiki-core/sys/cc.h
@@ -46,7 +46,7 @@
 #ifndef CC_H_
 #define CC_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/cc-gcc.h"
 
 /**

diff --git a/lib/contiki-core/sys/clock.h b/lib/contiki-core/sys/clock.h
@@ -70,7 +70,7 @@
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 /**
  * A second, measured in system clock time.

diff --git a/lib/contiki-core/sys/compower.c b/lib/contiki-core/sys/compower.c
@@ -43,7 +43,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/energest.h"
 #include "sys/compower.h"
 #include "net/packetbuf.h"

diff --git a/lib/contiki-core/sys/energest.c b/lib/contiki-core/sys/energest.c
@@ -39,7 +39,7 @@
  */
 
 #include "sys/energest.h"
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #if ENERGEST_CONF_ON
 

diff --git a/lib/contiki-core/sys/etimer.c b/lib/contiki-core/sys/etimer.c
@@ -45,7 +45,7 @@
  * Adam Dunkels <[email protected]>
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #include "sys/etimer.h"
 #include "sys/process.h"

diff --git a/lib/contiki-core/sys/log.h b/lib/contiki-core/sys/log.h
@@ -35,7 +35,7 @@
 #ifndef LOG_H_
 #define LOG_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #if LOG_CONF_ENABLED
 void log_message(const char *part1, const char *part2);

diff --git a/lib/contiki-core/sys/rtimer.h b/lib/contiki-core/sys/rtimer.h
@@ -54,7 +54,7 @@
 #ifndef RTIMER_H_
 #define RTIMER_H_
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 
 #ifndef RTIMER_CLOCK_DIFF
 typedef unsigned short rtimer_clock_t;

diff --git a/lib/contiki-core/sys/stimer.c b/lib/contiki-core/sys/stimer.c
@@ -45,7 +45,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/clock.h"
 #include "sys/stimer.h"
 

diff --git a/lib/contiki-core/sys/timer.c b/lib/contiki-core/sys/timer.c
@@ -45,7 +45,7 @@
  * @{
  */
 
-#include "pbio-conf.h"
+#include "contiki-conf.h"
 #include "sys/clock.h"
 #include "sys/timer.h"
 

diff --git a/lib/pbio/platform/city_hub/pbio-conf.h → lib/pbio/platform/city_hub/contiki-conf.h b/lib/pbio/platform/city_hub/pbio-conf.h → lib/pbio/platform/city_hub/contiki-conf.h
diff --git a/lib/pbio/platform/cplus_hub/pbio-conf.h → lib/pbio/platform/cplus_hub/contiki-conf.h b/lib/pbio/platform/cplus_hub/pbio-conf.h → lib/pbio/platform/cplus_hub/contiki-conf.h
diff --git a/lib/pbio/platform/debug/pbio-conf.h → lib/pbio/platform/debug/contiki-conf.h b/lib/pbio/platform/debug/pbio-conf.h → lib/pbio/platform/debug/contiki-conf.h
diff --git a/lib/pbio/platform/ev3dev_stretch/pbio-conf.h → ...io/platform/ev3dev_stretch/contiki-conf.h b/lib/pbio/platform/ev3dev_stretch/pbio-conf.h → ...io/platform/ev3dev_stretch/contiki-conf.h
diff --git a/lib/pbio/platform/move_hub/pbio-conf.h → lib/pbio/platform/move_hub/contiki-conf.h b/lib/pbio/platform/move_hub/pbio-conf.h → lib/pbio/platform/move_hub/contiki-conf.h
diff --git a/lib/pbio/platform/nxt/pbio-conf.h → lib/pbio/platform/nxt/contiki-conf.h b/lib/pbio/platform/nxt/pbio-conf.h → lib/pbio/platform/nxt/contiki-conf.h