OP-942 moved DelayedCallbackScheduler into pios/common

2025-02-20 10:54:14 +01:00 · 2014-02-02 20:31:37 +01:00 · 2014-02-02 20:31:37 +01:00 · 5b9a17f630
commit 5b9a17f630
parent b076ba02a1
29 changed files with 39 additions and 14 deletions
--- a/flight/pios/common/pios_callbackscheduler.c
+++ b/flight/pios/common/pios_callbackscheduler.c
--- a/flight/uavobjects/inc/callbackscheduler.h
+++ b/flight/uavobjects/inc/callbackscheduler.h
--- a/flight/pios/pios.h
+++ b/flight/pios/pios.h
@ -93,6 +93,14 @@
 #include <pios_task_monitor.h>
 #endif

+/* PIOS CallbackScheduler */
+#ifdef PIOS_INCLUDE_CALLBACKSCHEDULER
+#ifndef PIOS_INCLUDE_FREERTOS
+#error PiOS CallbackScheduler requires PIOS_INCLUDE_FREERTOS to be defined
+#endif
+#include <pios_callbackscheduler.h>
+#endif
+
 /* PIOS bootloader helper */
 #ifdef PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/pios/pios_sim_posix.h
+++ b/flight/pios/pios_sim_posix.h
@ -47,6 +47,14 @@
 #include <pios_task_monitor.h>
 #endif

+/* PIOS CallbackScheduler */
+#ifdef PIOS_INCLUDE_CALLBACKSCHEDULER
+#ifndef PIOS_INCLUDE_FREERTOS
+#error PiOS CallbackScheduler requires PIOS_INCLUDE_FREERTOS to be defined
+#endif
+#include <pios_callbackscheduler.h>
+#endif
+
 /* C Lib Includes */
 #include <stdio.h>
 #include <stdlib.h>
--- a/flight/targets/boards/coptercontrol/firmware/Makefile
+++ b/flight/targets/boards/coptercontrol/firmware/Makefile
@ -70,7 +70,6 @@ ifndef TESTAPP
    SRC += $(OPUAVTALK)/uavtalk.c
    SRC += $(OPUAVOBJ)/uavobjectmanager.c
    SRC += $(OPUAVOBJ)/eventdispatcher.c
-    SRC += $(OPUAVOBJ)/callbackscheduler.c

    ## UAVObjects
    SRC += $(OPUAVSYNTHDIR)/accessorydesired.c
--- a/flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
@ -36,7 +36,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_config.h
@ -43,6 +43,10 @@
 /* PIOS FreeRTOS support */
 #define PIOS_INCLUDE_FREERTOS

+
+/* PIOS CallbackScheduler support */
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
+
 /* PIOS bootloader helper */
 #define PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
+++ b/flight/targets/boards/coptercontrol/firmware/inc/pios_config_posix.h
@ -34,6 +34,7 @@
 #define PIOS_INCLUDE_DELAY
 #define PIOS_INCLUDE_LED
 #define PIOS_INCLUDE_FREERTOS
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
 #define PIOS_INCLUDE_TASK_MONITOR
 #define PIOS_INCLUDE_COM
 #define PIOS_INCLUDE_UDP
--- a/flight/targets/boards/oplinkmini/firmware/Makefile
+++ b/flight/targets/boards/oplinkmini/firmware/Makefile
@ -46,7 +46,6 @@ ifndef TESTAPP
    SRC += $(OPUAVTALK)/uavtalk.c
    SRC += $(OPUAVOBJ)/uavobjectmanager.c
    SRC += $(OPUAVOBJ)/eventdispatcher.c
-    SRC += $(OPUAVOBJ)/callbackscheduler.c

    ## UAVObjects
    SRC += $(OPUAVSYNTHDIR)/oplinkstatus.c
--- a/flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
@ -37,7 +37,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_config.h
@ -43,6 +43,9 @@
 /* PIOS FreeRTOS support */
 #define PIOS_INCLUDE_FREERTOS

+/* PIOS CallbackScheduler support */
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
+
 /* PIOS bootloader helper */
 #define PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
+++ b/flight/targets/boards/oplinkmini/firmware/inc/pios_config_posix.h
@ -34,6 +34,7 @@
 #define PIOS_INCLUDE_DELAY
 #define PIOS_INCLUDE_LED
 #define PIOS_INCLUDE_FREERTOS
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
 #define PIOS_INCLUDE_TASK_MONITOR
 #define PIOS_INCLUDE_COM
 #define PIOS_INCLUDE_UDP
--- a/flight/targets/boards/osd/firmware/Makefile
+++ b/flight/targets/boards/osd/firmware/Makefile
@ -55,7 +55,6 @@ ifndef TESTAPP
    SRC += $(OPUAVTALK)/uavtalk.c
    SRC += $(OPUAVOBJ)/uavobjectmanager.c
    SRC += $(OPUAVOBJ)/eventdispatcher.c
-    SRC += $(OPUAVOBJ)/callbackscheduler.c

    ## OSD fonts
    SRC += $(OPSYSTEM)/fonts.c
--- a/flight/targets/boards/osd/firmware/inc/openpilot.h
+++ b/flight/targets/boards/osd/firmware/inc/openpilot.h
@ -36,7 +36,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/osd/firmware/inc/pios_config.h
+++ b/flight/targets/boards/osd/firmware/inc/pios_config.h
@ -43,6 +43,9 @@
 /* PIOS FreeRTOS support */
 #define PIOS_INCLUDE_FREERTOS

+/* PIOS CallbackScheduler support */
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
+
 /* PIOS bootloader helper */
 #define PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/targets/boards/revolution/firmware/Makefile
+++ b/flight/targets/boards/revolution/firmware/Makefile
@ -73,7 +73,6 @@ ifndef TESTAPP
    SRC += $(OPUAVTALK)/uavtalk.c
    SRC += $(OPUAVOBJ)/uavobjectmanager.c
    SRC += $(OPUAVOBJ)/eventdispatcher.c
-    SRC += $(OPUAVOBJ)/callbackscheduler.c

    #ifeq ($(DEBUG), YES)
    SRC += $(OPSYSTEM)/dcc_stdio.c
--- a/flight/targets/boards/revolution/firmware/Makefile.osx
+++ b/flight/targets/boards/revolution/firmware/Makefile.osx
@ -141,7 +141,6 @@ SRC += $(OPSYSTEM)/alarms.c
 SRC += $(OPUAVTALK)/uavtalk.c
 SRC += $(OPUAVOBJ)/uavobjectmanager.c
 SRC += $(OPUAVOBJ)/eventdispatcher.c
-SRC += $(OPUAVOBJ)/callbackscheduler.c
 SRC += $(UAVOBJSYNTHDIR)/uavobjectsinit.c
 else
 ## TESTCODE
--- a/flight/targets/boards/revolution/firmware/inc/openpilot.h
+++ b/flight/targets/boards/revolution/firmware/inc/openpilot.h
@ -37,7 +37,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/revolution/firmware/inc/pios_config.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_config.h
@ -43,6 +43,9 @@
 /* PIOS FreeRTOS support */
 #define PIOS_INCLUDE_FREERTOS

+/* PIOS Callback Scheduler support */
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
+
 /* PIOS bootloader helper */
 #define PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
+++ b/flight/targets/boards/revolution/firmware/inc/pios_config_sim.h
@ -35,6 +35,7 @@
 #define PIOS_INCLUDE_LED
 #define PIOS_INCLUDE_SDCARD
 #define PIOS_INCLUDE_FREERTOS
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
 #define PIOS_INCLUDE_TASK_MONITOR
 #define PIOS_INCLUDE_COM
 // #define PIOS_INCLUDE_GPS
--- a/flight/targets/boards/revoproto/firmware/Makefile
+++ b/flight/targets/boards/revoproto/firmware/Makefile
@ -71,7 +71,6 @@ ifndef TESTAPP
    SRC += $(OPUAVTALK)/uavtalk.c
    SRC += $(OPUAVOBJ)/uavobjectmanager.c
    SRC += $(OPUAVOBJ)/eventdispatcher.c
-    SRC += $(OPUAVOBJ)/callbackscheduler.c

    #ifeq ($(DEBUG), YES)
    SRC += $(OPSYSTEM)/dcc_stdio.c
--- a/flight/targets/boards/revoproto/firmware/Makefile.osx
+++ b/flight/targets/boards/revoproto/firmware/Makefile.osx
@ -145,7 +145,6 @@ SRC += $(OPSYSTEM)/alarms.c
 SRC += $(OPUAVTALK)/uavtalk.c
 SRC += $(OPUAVOBJ)/uavobjectmanager.c
 SRC += $(OPUAVOBJ)/eventdispatcher.c
-SRC += $(OPUAVOBJ)/callbackscheduler.c
 SRC += $(UAVOBJSYNTHDIR)/uavobjectsinit.c


--- a/flight/targets/boards/revoproto/firmware/inc/openpilot.h
+++ b/flight/targets/boards/revoproto/firmware/inc/openpilot.h
@ -37,7 +37,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/revoproto/firmware/inc/pios_config.h
+++ b/flight/targets/boards/revoproto/firmware/inc/pios_config.h
@ -43,6 +43,9 @@
 /* PIOS FreeRTOS support */
 #define PIOS_INCLUDE_FREERTOS

+/* PIOS Callback Scheduler support */
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
+
 /* PIOS bootloader helper */
 #define PIOS_INCLUDE_BL_HELPER
 /* #define PIOS_INCLUDE_BL_HELPER_WRITE_SUPPORT */
--- a/flight/targets/boards/revoproto/firmware/inc/pios_config_sim.h
+++ b/flight/targets/boards/revoproto/firmware/inc/pios_config_sim.h
@ -35,6 +35,7 @@
 #define PIOS_INCLUDE_LED
 #define PIOS_INCLUDE_SDCARD
 #define PIOS_INCLUDE_FREERTOS
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
 #define PIOS_INCLUDE_TASK_MONITOR
 #define PIOS_INCLUDE_COM
 // #define PIOS_INCLUDE_GPS
--- a/flight/targets/boards/simposix/firmware/Makefile
+++ b/flight/targets/boards/simposix/firmware/Makefile
@ -85,7 +85,6 @@ SRC += $(FLIGHTLIB)/alarms.c
 SRC += $(OPUAVTALK)/uavtalk.c
 SRC += $(OPUAVOBJ)/uavobjectmanager.c
 SRC += $(OPUAVOBJ)/eventdispatcher.c
-SRC += $(OPUAVOBJ)/callbackscheduler.c
 SRC += $(UAVOBJSYNTHDIR)/uavobjectsinit.c

 SRC += $(FLIGHTLIB)/CoordinateConversions.c
@ -101,6 +100,7 @@ SRC += $(MATHLIB)/pid.c
 SRC += $(PIOSCORECOMMON)/pios_task_monitor.c
 SRC += $(PIOSCORECOMMON)/pios_dosfs_logfs.c
 SRC += $(PIOSCORECOMMON)/pios_debuglog.c
+SRC += $(PIOSCORECOMMON)/pios_callbackscheduler.c

 ## PIOS Hardware
 include $(PIOS)/posix/library.mk
--- a/flight/targets/boards/simposix/firmware/inc/openpilot.h
+++ b/flight/targets/boards/simposix/firmware/inc/openpilot.h
@ -37,7 +37,6 @@
 #include <utlist.h>
 #include <uavobjectmanager.h>
 #include <eventdispatcher.h>
-#include <callbackscheduler.h>
 #include <uavtalk.h>

 #include "alarms.h"
--- a/flight/targets/boards/simposix/firmware/inc/pios_config.h
+++ b/flight/targets/boards/simposix/firmware/inc/pios_config.h
@ -36,6 +36,7 @@

 /* Major features */
 #define PIOS_INCLUDE_FREERTOS
+#define PIOS_INCLUDE_CALLBACKSCHEDULER
 #define PIOS_INCLUDE_BL_HELPER

 /* Enable/Disable PiOS Modules */
--- a/make/apps-defs.mk
+++ b/make/apps-defs.mk
@ -96,6 +96,7 @@ SRC += $(PIOSCOMMON)/pios_usb_util.c

 ## PIOS system code
 SRC += $(PIOSCOMMON)/pios_task_monitor.c
+SRC += $(PIOSCOMMON)/pios_callbackscheduler.c

 ## Misc library functions
 SRC += $(FLIGHTLIB)/fifo_buffer.c