LP-548 Moves PIOS_OPLINK_RCVR_TIMEOUT_MS to pios_oplinkrcvr.c and adds oplinkreceiver and gcsreceiver modules to coptercontrol.

webbbn · webbbn · commit 59d20ee7528a · 2017-09-04T11:25:06.000-07:00
diff --git a/flight/pios/common/pios_oplinkrcvr.c b/flight/pios/common/pios_oplinkrcvr.c
@@ -37,6 +37,8 @@
 #include <oplinkstatus.h>
 #include <pios_oplinkrcvr_priv.h>
 
+// Put receiver in failsafe if not updated within timeout
+#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 /* Provide a RCVR driver */
 static int32_t PIOS_OPLinkRCVR_Get(uint32_t rcvr_id, uint8_t channel);
diff --git a/flight/targets/boards/ccf3d/pios_board.h b/flight/targets/boards/ccf3d/pios_board.h
@@ -204,7 +204,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/coptercontrol/firmware/Makefile b/flight/targets/boards/coptercontrol/firmware/Makefile
@@ -133,6 +133,8 @@ ifndef TESTAPP
     SRC += $(FLIGHT_UAVOBJ_DIR)/txpidsettings.c
     SRC += $(FLIGHT_UAVOBJ_DIR)/txpidstatus.c
     SRC += $(FLIGHT_UAVOBJ_DIR)/mpugyroaccelsettings.c
+    SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c
+    SRC += $(FLIGHT_UAVOBJ_DIR)/oplinkreceiver.c
     # Command line option for Gcsreceiver module
     ifeq ($(GCSRECEIVER), YES)
         SRC += $(FLIGHT_UAVOBJ_DIR)/gcsreceiver.c
diff --git a/flight/targets/boards/coptercontrol/pios_board.h b/flight/targets/boards/coptercontrol/pios_board.h
@@ -228,7 +228,6 @@ extern uint32_t pios_spi_flash_accel_adapter_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/discoveryf4bare/pios_board.h b/flight/targets/boards/discoveryf4bare/pios_board.h
@@ -203,8 +203,6 @@ extern uint32_t pios_packet_handler;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_RFM22B_RCVR_TIMEOUT_MS  200
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/oplinkmini/firmware/Makefile b/flight/targets/boards/oplinkmini/firmware/Makefile
@@ -28,8 +28,7 @@ include $(FLIGHT_ROOT_DIR)/make/firmware-defs.mk
 override USE_DSP_LIB := NO
 
 # List of mandatory modules to include
-MODULES += \
-    RadioComBridge
+MODULES += RadioComBridge
 
 # List of optional modules to include
 OPTMODULES =
diff --git a/flight/targets/boards/pikoblx/pios_board.h b/flight/targets/boards/pikoblx/pios_board.h
@@ -161,7 +161,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/revolution/pios_board.h b/flight/targets/boards/revolution/pios_board.h
@@ -1,3 +1,4 @@
+
 /**
  ******************************************************************************
  * @addtogroup OpenPilotSystem OpenPilot System
@@ -223,8 +224,6 @@ extern uint32_t pios_packet_handler;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_RFM22B_RCVR_TIMEOUT_MS  200
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/revonano/pios_board.h b/flight/targets/boards/revonano/pios_board.h
@@ -218,8 +218,6 @@ extern uint32_t pios_packet_handler;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_RFM22B_RCVR_TIMEOUT_MS  200
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/revoproto/pios_board.h b/flight/targets/boards/revoproto/pios_board.h
@@ -196,7 +196,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/sparky2/pios_board.h b/flight/targets/boards/sparky2/pios_board.h
@@ -1,3 +1,4 @@
+
 /**
  ******************************************************************************
  * @addtogroup OpenPilotSystem OpenPilot System
@@ -225,8 +226,6 @@ extern uint32_t pios_packet_handler;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_RFM22B_RCVR_TIMEOUT_MS  200
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/spracingf3/pios_board.h b/flight/targets/boards/spracingf3/pios_board.h
@@ -167,7 +167,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/spracingf3evo/pios_board.h b/flight/targets/boards/spracingf3evo/pios_board.h
@@ -172,7 +172,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/flight/targets/boards/tinyfish/pios_board.h b/flight/targets/boards/tinyfish/pios_board.h
@@ -135,7 +135,6 @@ extern uint32_t pios_ws2811_id;
 #define PIOS_RCVR_MAX_DEVS           3
 #define PIOS_RCVR_MAX_CHANNELS       12
 #define PIOS_GCSRCVR_TIMEOUT_MS      100
-#define PIOS_OPLINK_RCVR_TIMEOUT_MS  100
 
 // -------------------------
 // Receiver PPM input
diff --git a/python/examples/example.py b/python/examples/example.py
@@ -56,7 +56,7 @@ def setup(self, port):
             _port = int(port[3:]) - 1
         else:
             _port = port
-        serPort = serial.Serial(port, 57600, timeout=.5)
+        serPort = serial.Serial(_port, 57600, timeout=.5)
         if not serPort.isOpen():
             raise IOError("Failed to open serial port")
 
