Merged in mindnever/librepilot/LP-512_Support_F3_boards (pull request #426)

LP-512 Support F3 boards

Approved-by: Lalanne Laurent <f5soh@free.fr>
Approved-by: Mateusz Kaduk <mateusz.kaduk@gmail.com>
Approved-by: Vladimir Zidar <mr_w@mindnever.org>
Approved-by: Philippe Renon <philippe_renon@yahoo.fr>

Author: mindnever

Makefile

@@ -340,6 +340,7 @@ PACKAGE_FW_TARGETS += fw_oplinkmini
 PACKAGE_FW_TARGETS += fw_gpsplatinum
 PACKAGE_FW_TARGETS += fw_osd
 PACKAGE_FW_TARGETS += fw_revoproto
+PACKAGE_FW_TARGETS += fw_spracingf3evo fw_spracingf3 fw_nucleof303re fw_pikoblx fw_tinyfish
 
 # Rules to generate GCS resources used to embed firmware binaries into the GCS.
 # They are used later by the vehicle setup wizard to update board firmware.

flight/Makefile

@@ -14,12 +14,16 @@ ALL_BOARDS += oplinkmini
 ALL_BOARDS += gpsplatinum
 ALL_BOARDS += osd
 ALL_BOARDS += discoveryf4bare
+ALL_BOARDS += ccf3d spracingf3 spracingf3evo nucleof303re pikoblx tinyfish
 # SimPosix only builds on Linux
 ifeq ($(UNAME), Linux)
     ALL_BOARDS += simposix
 endif
 
 # Short names of each board (used to display board name in parallel builds)
+spracingf3_short       := 'srf3'
+spracingf3evo_short    := 'spev'
+ccf3d_short            := 'cf3d'
 coptercontrol_short    := 'cc  '
 oplinkmini_short       := 'oplm'
 revolution_short       := 'revo'
@@ -30,6 +34,9 @@ sparky2_short          := 'spk2'
 simposix_short         := 'posx'
 discoveryf4bare_short  := 'df4b'
 gpsplatinum_short      := 'gps9'
+nucleof303re_short     := 'nf3r'
+pikoblx_short          := 'piko'
+tinyfish_short         := 'tfsh'
 
 # Start out assuming that we'll build fw, bl and bu for all boards
 FW_BOARDS  := $(ALL_BOARDS)

flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj

@@ -7,12 +7,18 @@
 
 #include <stdint.h>
 #include "inc/dcc_stdio.h"
-#ifdef STM32F4XX
+#ifdef STM32F4
 # include <stm32f4xx.h>
 #endif
+#ifdef STM32F3
+# include <stm32f30x.h>
+#endif
 #ifdef STM32F2XX
 # include <stm32f2xx.h>
 #endif
+#ifdef STM32F1
+# include <stm32f10x.h>
+#endif
 
 #define FAULT_TRAMPOLINE(_vec)                                                                          \
     __attribute__((naked, no_instrument_function))                                          \

…s/revonano/firmware/cm3_fault_handlers.c flight/libraries/cm3_fault_handlers.cflight/targets/boards/revonano/firmware/cm3_fault_handlers.c renamed to flight/libraries/cm3_fault_handlers.c flight/targets/boards/revonano/firmware/cm3_fault_handlers.c renamed to flight/libraries/cm3_fault_handlers.c

@@ -2,6 +2,7 @@
  ******************************************************************************
  *
  * @file       op_dfu.h
+ * @author     The LibrePilot Project, http://www.librepilot.org Copyright (C) 2017.
  * @author     The OpenPilot Team, http://www.openpilot.org Copyright (C) 2010.
  * @brief
  * @see        The GNU Public License (GPL) Version 3
@@ -26,9 +27,91 @@
 /* Define to prevent recursive inclusion -------------------------------------*/
 #ifndef __OP_DFU_H
 #define __OP_DFU_H
-#include "common.h"
+
 /* Includes ------------------------------------------------------------------*/
 /* Exported types ------------------------------------------------------------*/
+typedef enum {
+    start, keepgoing,
+} DownloadAction;
+
+/**************************************************/
+/* OP_DFU states                       */
+/**************************************************/
+
+typedef enum {
+    DFUidle, // 0
+    uploading, // 1
+    wrong_packet_received, // 2
+    too_many_packets, // 3
+    too_few_packets, // 4
+    Last_operation_Success, // 5
+    downloading, // 6
+    BLidle, // 7
+    Last_operation_failed, // 8
+    uploadingStarting, // 9
+    outsideDevCapabilities, // 10
+    CRC_Fail, // 11
+    failed_jump,
+// 12
+} DFUStates;
+/**************************************************/
+/* OP_DFU commands                       */
+/**************************************************/
+typedef enum {
+    Reserved, // 0
+    Req_Capabilities, // 1
+    Rep_Capabilities, // 2
+    EnterDFU, // 3
+    JumpFW, // 4
+    Reset, // 5
+    Abort_Operation, // 6
+    Upload, // 7
+    Op_END, // 8
+    Download_Req, // 9
+    Download, // 10
+    Status_Request, // 11
+    Status_Rep
+// 12
+} DFUCommands;
+
+typedef enum {
+    High_Density, Medium_Density
+} DeviceType;
+/**************************************************/
+/* OP_DFU transfer types                       */
+/**************************************************/
+typedef enum {
+    FW, // 0
+    Descript
+// 2
+} DFUTransfer;
+/**************************************************/
+/* OP_DFU transfer port                           */
+/**************************************************/
+typedef enum {
+    Usb, // 0
+    Serial
+// 2
+} DFUPort;
+/**************************************************/
+/* OP_DFU programable programable HW types        */
+/**************************************************/
+typedef enum {
+    Self_flash, // 0
+    Remote_flash_via_spi
+// 1
+} DFUProgType;
+/**************************************************/
+/* OP_DFU programable sources			          */
+/**************************************************/
+#define USB            0
+#define SPI            1
+
+#define DownloadDelay  100000
+
+#define MAX_DEL_RETRYS 3
+#define MAX_WRI_RETRYS 3
+
 typedef struct {
     uint8_t    programmingType;
     uint8_t    readWriteFlags;

…rds/discoveryf4bare/firmware/dcc_stdio.c flight/libraries/dcc_stdio.cflight/targets/boards/discoveryf4bare/firmware/dcc_stdio.c renamed to flight/libraries/dcc_stdio.c flight/targets/boards/discoveryf4bare/firmware/dcc_stdio.c renamed to flight/libraries/dcc_stdio.c

@@ -42,6 +42,18 @@
 #define ALARM_LED_OFF()
 #endif
 
+#ifdef PIOS_BUZZER_ALARM
+#define ALARM_BUZZER_ON() \
+    { if (buzzer_enabled) { PIOS_LED_On(PIOS_BUZZER_ALARM); } \
+    }
+#define ALARM_BUZZER_OFF() \
+    { if (buzzer_enabled) { PIOS_LED_Off(PIOS_BUZZER_ALARM); } \
+    }
+#else
+#define ALARM_BUZZER_ON()
+#define ALARM_BUZZER_OFF()
+#endif
+
 #ifdef PIOS_LED_HEARTBEAT
 #define HEARTBEAT_LED_ON()  PIOS_LED_On(PIOS_LED_HEARTBEAT)
 #define HEARTBEAT_LED_OFF() PIOS_LED_Off(PIOS_LED_HEARTBEAT)
@@ -135,9 +147,10 @@ static volatile FlightStatusData currentFlightStatus;
 static volatile bool started = false;
 static volatile pios_notify_notification nextNotification = NOTIFY_NONE;
 
-#ifdef PIOS_LED_ALARM
+
+#if defined(PIOS_LED_ALARM) || defined(PIOS_BUZZER_ALARM)
 static bool handleAlarms(uint16_t *r_pattern, uint16_t *b_pattern);
-#endif // PIOS_LED_ALARM
+#endif // PIOS_LED_ALARM || PIOS_BUZZER_ALARM
 static bool handleNotifications(pios_notify_notification runningNotification, uint16_t *r_pattern, uint16_t *b_pattern);
 static void handleFlightMode(uint16_t *r_pattern, uint16_t *b_pattern);
 static void handleHeartbeat(uint16_t *r_pattern, uint16_t *b_pattern);
@@ -163,6 +176,10 @@ void NotificationOnboardLedsRun()
     static uint8_t lastFlightMode   = -1;
     static bool forceShowFlightMode = false;
     static pios_notify_notification runningNotification = NOTIFY_NONE;
+
+#ifdef PIOS_BUZZER_ALARM
+    static bool buzzer_enabled = false;
+#endif
     static enum {
         STATUS_NOTIFY,
         STATUS_ALARM,
@@ -206,13 +223,17 @@ void NotificationOnboardLedsRun()
     if (cycleCount & 0x10) {
         HEARTBEAT_LED_OFF();
         ALARM_LED_OFF();
+        ALARM_BUZZER_OFF();
         cycleCount = 0x0;
         forceShowFlightMode = false;
         // Notification has been just shown, cleanup
         if (status == STATUS_NOTIFY) {
             runningNotification = NOTIFY_NONE;
         }
         status = (status + 1) % STATUS_LENGHT;
+#ifdef PIOS_BUZZER_ALARM
+        buzzer_enabled = true; /* This is the place where we update buzzer_enabled status based on (not yet implemented) NotificationSettings.Buzzer config */
+#endif
     }
 
     if (status == STATUS_NOTIFY) {
@@ -224,7 +245,7 @@ void NotificationOnboardLedsRun()
 
     // Handles Alarm display
     if (status == STATUS_ALARM) {
-#ifdef PIOS_LED_ALARM
+#if defined(PIOS_LED_ALARM) || defined(PIOS_BUZZER_ALARM)
         if (!cycleCount && !handleAlarms(&r_pattern, &b_pattern)) {
             // no alarms, advance
             status++;
@@ -252,14 +273,16 @@ void NotificationOnboardLedsRun()
     }
     if (r_pattern & 0x1) {
         ALARM_LED_ON();
+        ALARM_BUZZER_ON();
     } else {
         ALARM_LED_OFF();
+        ALARM_BUZZER_OFF();
     }
     r_pattern >>= 1;
     b_pattern >>= 1;
 }
 
-#if defined(PIOS_LED_ALARM)
+#if defined(PIOS_LED_ALARM) || defined(PIOS_BUZZER_ALARM)
 static bool handleAlarms(uint16_t *r_pattern, uint16_t *b_pattern)
 {
     if (currentAlarmLevel == SYSTEMALARMS_ALARM_OK) {
@@ -269,7 +292,7 @@ static bool handleAlarms(uint16_t *r_pattern, uint16_t *b_pattern)
     *r_pattern = BLINK_R_ALARM_PATTERN(currentAlarmLevel);
     return true;
 }
-#endif /* PIOS_LED_ALARM */
+#endif /* PIOS_LED_ALARM || PIOS_BUZZER_ALARM */
 
 
 static bool handleNotifications(pios_notify_notification runningNotification, uint16_t *r_pattern, uint16_t *b_pattern)

…discoveryf4bare/firmware/inc/dcc_stdio.h flight/libraries/inc/dcc_stdio.hflight/targets/boards/discoveryf4bare/firmware/inc/dcc_stdio.h renamed to flight/libraries/inc/dcc_stdio.h flight/targets/boards/discoveryf4bare/firmware/inc/dcc_stdio.h renamed to flight/libraries/inc/dcc_stdio.h

@@ -157,7 +157,8 @@ void processComand(uint8_t *xReceive_Buffer)
     switch (Command) {
     case EnterDFU:
         if (((DeviceState == BLidle) && (Data0 < numberOfDevices))
-            || (DeviceState == DFUidle)) {
+            || (DeviceState == DFUidle)
+            || (DeviceState == failed_jump)) {
             if (Data0 > 0) {
                 OPDfuIni(true);
             }

flight/libraries/inc/op_dfu.h

@@ -54,14 +54,16 @@ include $(FREERTOS_DIR)/library.mk
 OPTESTS		= $(TOPDIR)/Tests
 
 ## PIOS Hardware
-ifeq ($(MCU),cortex-m3)
+ifneq (,$(findstring STM32F10,$(CHIP)))
     include $(PIOS)/stm32f10x/library.mk
-else ifeq ($(MCU),cortex-m4)
+else ifneq (,$(findstring STM32F4,$(CHIP)))
     include $(PIOS)/stm32f4xx/library.mk
-else ifeq ($(MCU),cortex-m0)
+else ifneq (,$(findstring STM32F30,$(CHIP)))
+    include $(PIOS)/stm32f30x/library.mk
+else ifneq (,$(findstring STM32F0,$(CHIP)))
     include $(PIOS)/stm32f0x/library.mk
 else
-    $(error Unsupported MCU: $(MCU))
+    $(error Unsupported CHIP: $(CHIP))
 endif
 
 # List C source files here (C dependencies are automatically generated).
@@ -83,6 +85,7 @@ SRC += $(PIOSCOMMON)/pios_mpu9250.c
 SRC += $(PIOSCOMMON)/pios_mpxv.c
 SRC += $(PIOSCOMMON)/pios_ms4525do.c
 SRC += $(PIOSCOMMON)/pios_ms5611.c
+SRC += $(PIOSCOMMON)/pios_bmp280.c
 SRC += $(PIOSCOMMON)/pios_oplinkrcvr.c
 SRC += $(PIOSCOMMON)/pios_video.c
 SRC += $(PIOSCOMMON)/pios_wavplay.c
@@ -150,6 +153,11 @@ ifeq ($(USE_CXX),YES)
 CPPSRC += $(FLIGHTLIB)/mini_cpp.cpp
 endif
 
+ifeq ($(DEBUG), YES)
+SRC += $(FLIGHTLIB)/dcc_stdio.c
+SRC += $(FLIGHTLIB)/cm3_fault_handlers.c
+endif
+
 ## Modules
 SRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.c)))
 CPPSRC += $(foreach mod, $(MODULES), $(sort $(wildcard $(OPMODULEDIR)/$(mod)/*.cpp)))