From e2b628c4719a4c78e3cc2ddd662d4ed868ced813 Mon Sep 17 00:00:00 2001 From: night-ghost Date: Tue, 20 Feb 2018 16:47:20 +0500 Subject: [PATCH] AP_HAL_F4light: fixed compilation for boards AirbotF4, AirbotV2 and CL_Racing_F4. Corrected prefix for binaries --- .gitignore | 1 + libraries/AP_HAL_F4Light/0_Done.md | 22 --- libraries/AP_HAL_F4Light/0_Read_me_1st.md | 24 +++ .../AP_HAL_F4Light/1_RevoMini_read_ME.md | 1 - libraries/AP_HAL_F4Light/EEPROM.cpp | 9 +- .../AP_HAL_F4Light/HAL_F4Light_Class.cpp | 149 +----------------- .../1_read_me.md | 0 .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/Analyse.sh | 0 .../support/DEBUG-STLINK.sh | 0 .../boards/f4light_Airbot/support/Rebuild.sh | 27 ++++ .../support/UPLOAD-DFU.sh | 6 +- .../support/UPLOAD-STLINK.sh | 4 +- .../support/UPLOAD-plane-STLINK.sh | 4 +- .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../1_read_me.md | 8 + .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/DEBUG-STLINK.sh | 0 .../support/DOWNLOAD-STLINK.sh | 2 +- .../support/Rebuild.sh | 4 +- .../support/UPLOAD-DFU.sh | 8 +- .../support/UPLOAD-STLINK.sh | 4 +- .../support/UPLOAD-plane-STLINK.sh | 4 +- .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../1_read_me.md | 0 .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/DEBUG-STLINK.sh | 0 .../support/Rebuild.sh | 4 +- .../support/UPLOAD-DFU.sh | 8 +- .../support/UPLOAD-STLINK.sh | 4 +- .../support/UPLOAD-plane-STLINK.sh | 4 +- .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../1_read_me.md | 0 .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/DEBUG-STLINK.sh | 0 .../support/Rebuild.sh | 0 .../support/UPLOAD-DFU.sh | 4 +- .../support/UPLOAD-STLINK.sh | 4 +- .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../1_read_ME.md | 0 .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/DEBUG-STLINK.sh | 0 .../support/Rebuild.sh | 4 +- .../support/UPLOAD-DFU-plane.sh | 6 +- .../support/UPLOAD-DFU.sh | 6 +- .../support/UPLOAD-STLINK.sh | 9 ++ .../support/UPLOAD-plane-STLINK.sh | 9 ++ .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../1_read_me.md | 0 .../board.cpp | 0 .../board.h | 0 .../ld/flash-10000.ld | 0 .../ld/flash-20000.ld | 0 .../ld/flash.ld | 0 .../ld/flash_8000000.ld | 0 .../rules.mk | 0 .../stm32f4xx_conf.h | 0 .../support/DEBUG-STLINK.sh | 0 .../support/Rebuild.sh | 4 +- .../support/UPLOAD-DFU.sh | 8 +- .../support/UPLOAD-STLINK.sh | 4 +- .../support/UPLOAD-plane-STLINK.sh | 4 +- .../system_stm32f4xx.c | 0 .../target-config.mk | 0 .../support/DOWNLOAD-STLINK.sh | 9 -- .../boards/revomini_Airbot/support/Rebuild.sh | 27 ---- .../support/DOWNLOAD-STLINK.sh | 9 -- .../support/UPLOAD-STLINK.sh | 9 -- .../support/UPLOAD-plane-STLINK.sh | 9 -- libraries/AP_HAL_F4Light/hardware/osd/osd.cpp | 27 ++-- libraries/AP_HAL_F4Light/hardware/osd/osd.h | 1 + .../AP_HAL_F4Light/hardware/sd/Sd2Card.cpp | 10 +- libraries/AP_HAL_F4Light/support/MMM.sh | 64 ++++---- mk/board_F4Light.mk | 42 +++-- 114 files changed, 206 insertions(+), 360 deletions(-) delete mode 120000 libraries/AP_HAL_F4Light/1_RevoMini_read_ME.md rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/1_read_me.md (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_Airbot}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_Airbot}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_Airbot}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/support/Analyse.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_Airbot}/support/DEBUG-STLINK.sh (100%) create mode 100755 libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Rebuild.sh rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/support/UPLOAD-DFU.sh (69%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_Airbot}/support/UPLOAD-STLINK.sh (66%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_Airbot}/support/UPLOAD-plane-STLINK.sh (66%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_Airbot}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_Airbot}/target-config.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_AirbotV2}/1_read_me.md (79%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_AirbotV2}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_AirbotV2}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_AirbotV2}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_AirbotV2}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_AirbotV2}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/support/DEBUG-STLINK.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_AirbotV2}/support/DOWNLOAD-STLINK.sh (85%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_AirbotV2}/support/Rebuild.sh (75%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_AirbotV2}/support/UPLOAD-DFU.sh (68%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/support/UPLOAD-STLINK.sh (65%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_AirbotV2}/support/UPLOAD-plane-STLINK.sh (65%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_AirbotV2}/target-config.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MatekF405_OSD}/1_read_me.md (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MatekF405_OSD}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MatekF405_OSD}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MatekF405_OSD}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MatekF405_OSD}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/support/DEBUG-STLINK.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_MatekF405_OSD}/support/Rebuild.sh (75%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_MatekF405_OSD}/support/UPLOAD-DFU.sh (67%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MatekF405_OSD}/support/UPLOAD-STLINK.sh (65%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_MatekF405_OSD}/support/UPLOAD-plane-STLINK.sh (65%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MatekF405_OSD}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MatekF405_OSD}/target-config.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/1_read_me.md (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MiniF4_OSD}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MiniF4_OSD}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MiniF4_OSD}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MiniF4_OSD}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MiniF4_OSD}/support/DEBUG-STLINK.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/support/Rebuild.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revo_MiniF4_OSD => f4light_MiniF4_OSD}/support/UPLOAD-DFU.sh (78%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_MiniF4_OSD}/support/UPLOAD-STLINK.sh (65%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_MiniF4_OSD}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Airbot => f4light_MiniF4_OSD}/target-config.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/1_read_ME.md (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_Revolution}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_Revolution}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_Revolution}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/support/DEBUG-STLINK.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/support/Rebuild.sh (85%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/support/UPLOAD-DFU-plane.sh (70%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/support/UPLOAD-DFU.sh (70%) create mode 100755 libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-STLINK.sh create mode 100755 libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-plane-STLINK.sh rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_Revolution}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_Revolution}/target-config.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_cl_racing}/1_read_me.md (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_cl_racing}/board.cpp (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_cl_racing}/board.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_cl_racing}/ld/flash-10000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_cl_racing}/ld/flash-20000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_cl_racing}/ld/flash.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_cl_racing}/ld/flash_8000000.ld (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_cl_racing}/rules.mk (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_cl_racing}/stm32f4xx_conf.h (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_cl_racing}/support/DEBUG-STLINK.sh (100%) rename libraries/AP_HAL_F4Light/boards/{revo_cl_racing => f4light_cl_racing}/support/Rebuild.sh (76%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_cl_racing}/support/UPLOAD-DFU.sh (67%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_cl_racing}/support/UPLOAD-STLINK.sh (66%) rename libraries/AP_HAL_F4Light/boards/{revo_MatekF405_OSD => f4light_cl_racing}/support/UPLOAD-plane-STLINK.sh (66%) rename libraries/AP_HAL_F4Light/boards/{revomini_AirbotV2 => f4light_cl_racing}/system_stm32f4xx.c (100%) rename libraries/AP_HAL_F4Light/boards/{revomini_Revolution => f4light_cl_racing}/target-config.mk (100%) delete mode 100755 libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DOWNLOAD-STLINK.sh delete mode 100755 libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Rebuild.sh delete mode 100755 libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DOWNLOAD-STLINK.sh delete mode 100755 libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-STLINK.sh delete mode 100755 libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-plane-STLINK.sh diff --git a/.gitignore b/.gitignore index 3e8abedb79..afd9f74325 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ test.ArduCopter/* GPATH GRTAGS GTAGS +config.mk diff --git a/libraries/AP_HAL_F4Light/0_Done.md b/libraries/AP_HAL_F4Light/0_Done.md index 888e0d7411..a7669dfbfc 100644 --- a/libraries/AP_HAL_F4Light/0_Done.md +++ b/libraries/AP_HAL_F4Light/0_Done.md @@ -160,28 +160,6 @@ * a lot of minor enhancements -Warning!!! -EEPROM emulation in Flash cause periodic program hunging on time of sector erase! So to allow auto-save parameters -like MOT_THST_HOVER - MOT_HOVER_LEARN to be 2 you should defer parameter writing (Param HAL_EE_DEFER) - - - -Timer usage: - -1 RC-Output on some boards -2 RC-Output -3 RC-Output -4 soft_i2c0, PPM_IN on AirbotV2 -5 micros() -6 event generation for WFE -7 scheduler -8 PPM_IN -9 soft_i2c1 -10 soft_i2c2 -11 -12 PPM_IN -13 driver's io_completion -14 schedule tail timer diff --git a/libraries/AP_HAL_F4Light/0_Read_me_1st.md b/libraries/AP_HAL_F4Light/0_Read_me_1st.md index 4a63700d60..d52b3efcf3 100644 --- a/libraries/AP_HAL_F4Light/0_Read_me_1st.md +++ b/libraries/AP_HAL_F4Light/0_Read_me_1st.md @@ -1,3 +1,27 @@ this is universal HAL for almost any F4 board, without any external OS per-board Readme files are in boards/{board}/1_Readme.md + + +Warning!!! +EEPROM emulation in Flash cause periodic program hunging on time of sector erase! So to allow auto-save parameters +like MOT_THST_HOVER - MOT_HOVER_LEARN to be 2 you should defer parameter writing (Param BRD_EE_DEFER) + + + +Timer usage: + +1 RC-Output on some boards +2 RC-Output +3 RC-Output +4 soft_i2c0, PPM_IN on AirbotV2 +5 micros() +6 event generation for WFE +7 scheduler +8 PPM_IN +9 soft_i2c1 +10 soft_i2c2 +11 +12 PPM_IN +13 driver's io_completion +14 schedule tail timer diff --git a/libraries/AP_HAL_F4Light/1_RevoMini_read_ME.md b/libraries/AP_HAL_F4Light/1_RevoMini_read_ME.md deleted file mode 120000 index f55dc1335b..0000000000 --- a/libraries/AP_HAL_F4Light/1_RevoMini_read_ME.md +++ /dev/null @@ -1 +0,0 @@ -boards/revomini_Revolution/1_read_ME.md \ No newline at end of file diff --git a/libraries/AP_HAL_F4Light/EEPROM.cpp b/libraries/AP_HAL_F4Light/EEPROM.cpp index fa8e9c9def..0a4b9fad11 100644 --- a/libraries/AP_HAL_F4Light/EEPROM.cpp +++ b/libraries/AP_HAL_F4Light/EEPROM.cpp @@ -654,15 +654,16 @@ uint16_t EEPROMClass::read(uint16_t Address, uint16_t *Data) Address &= ADDRESS_MASK; + uint32_t ptr = pageEnd; + // Check each active page address starting from end - the last value written - for (pageBase += 6; pageEnd >= pageBase; pageEnd -= 4){ - if (read_16(pageEnd) == Address){// Compare the read address with the virtual address - *Data = read_16(pageEnd - 2); // Get content of Address-2 which is variable value + for (pageBase += 6; ptr >= pageBase; ptr -= 4){ + if (read_16(ptr) == Address){// Compare the read address with the virtual address + *Data = read_16(ptr - 2); // Get content of Address-2 which is variable value return EEPROM_OK; } } - // Return ReadStatus value: (0: variable exist, 1: variable doesn't exist) return EEPROM_BAD_ADDRESS; } diff --git a/libraries/AP_HAL_F4Light/HAL_F4Light_Class.cpp b/libraries/AP_HAL_F4Light/HAL_F4Light_Class.cpp index eaba13327d..11cf214808 100644 --- a/libraries/AP_HAL_F4Light/HAL_F4Light_Class.cpp +++ b/libraries/AP_HAL_F4Light/HAL_F4Light_Class.cpp @@ -15,8 +15,6 @@ #include "HAL_F4Light_Class.h" #include "RCInput.h" #include "Util.h" -//#include -//#include #include @@ -27,11 +25,6 @@ #endif -#ifdef USE_WAYBACK_ENABLE -#include "AP_WayBack/AP_WayBack.h" -#endif - - #if defined(BOARD_SDCARD_NAME) || defined(BOARD_DATAFLASH_FATFS) #include "sd/SD.h" @@ -280,10 +273,10 @@ void HAL_F4Light::run(int argc,char* const argv[], Callbacks* callbacks) const #if defined(BOARD_SDCARD_NAME) && defined(BOARD_SDCARD_CS_PIN) - printf("\nEnabling SD at %ldms\n", millis()); + printf("\nEnabling SD at %ldms\n", AP_HAL::millis()); SD.begin(F4Light::SPIDeviceManager::_get_device(BOARD_SDCARD_NAME)); #elif defined(BOARD_DATAFLASH_FATFS) - printf("\nEnabling DataFlash as SD at %ldms\n", millis()); + printf("\nEnabling DataFlash as SD at %ldms\n", AP_HAL::millis()); SD.begin(F4Light::SPIDeviceManager::_get_device(HAL_DATAFLASH_NAME)); #endif @@ -321,33 +314,6 @@ void HAL_F4Light::run(int argc,char* const argv[], Callbacks* callbacks) const } -#if USE_WAYBACK == ENABLED && defined(WAYBACK_DEBUG) - -#define SERIAL_BUFSIZE 128 - -static AP_HAL::UARTDriver* uart; - -static void getSerialLine(char *cp ){ // получение строки - uint8_t cnt=0; // строка не длиннее 256 байт - - while(true){ - if(!uart->available()){ - continue; - } - - char c=uart->read(); - - if(c==0x0d || (cnt && c==0x0a)){ - cp[cnt]=0; - return; - } - if(c==0x0a) continue; // skip unneeded LF - - cp[cnt]=c; - if(cnt_dbg_wayback; - if(dbg){ - - dbg -=1; - - if(dbg < sizeof(uarts)/sizeof(AP_HAL::UARTDriver**) ){ - AP_HAL::UARTDriver** up = uarts[dbg]; - if(up && *up){ - uart = *up; - - AP_WayBack track; - Scheduler::_delay(5000); // time to connect - - track.set_debug_mode(true); - track.init(); - track.start(); - - uart->begin(115200); - - uart->println("send pairs 'lat,lon'"); - uart->println("send H for help"); - - char buffer[SERIAL_BUFSIZE]; - float x,y; - char *bp=buffer; - uint16_t i=0; - - while(1){ - getSerialLine(buffer); - - if(buffer[1]==0) { - switch(buffer[0]){ - case 'G': // return by track - // get point - - track.stop(); - - while(track.get_point(x,y)){ - uart->print(x); - uart->print(","); - uart->println(y); - } - uart->println("."); - break; - - case 'c': - case 'C': - hal_param_helper->_dbg_wayback = 0; - hal_param_helper->_dbg_wayback.save(); - goto done; - - - case 'R': // Reset - track.stop(); - track.end(); - track.init(); - track.start(); - break; - - case 'S': // show current state - i=0; - while(true){ - uint16_t k=i; - if(!track.show_track(i, x, y )) break; - uart->print(k); - uart->print(","); - uart->print(x); - uart->print(","); - uart->println(y); - } - uart->println("."); - break; - case 'h': - case 'H': - uart->println("send pairs 'lat,lon'"); - uart->println("send G to get point"); - - uart->println("send S to show track point"); - uart->println("send R to reset track"); - uart->println("send C to cancel this mode"); - break; - - } - } else { - // given a point - "x,y" - bp=buffer; - - while(*bp) { - if(*bp++ == ',') break; - } - x=atof(buffer); - y=atof(bp); - - uint32_t t=AP_HAL::micros(); - - track.add_point(x,y); - t=AP_HAL::micros() - t; - - uart->print("# time="); - uart->println(t); - - } - } - } - } - } - } -done: -#endif RCOutput::lateInit(); // 2nd stage - now with loaded parameters diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/1_read_me.md b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/1_read_me.md similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/1_read_me.md rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/1_read_me.md diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Analyse.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Analyse.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Analyse.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Analyse.sh diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Rebuild.sh new file mode 100755 index 0000000000..7381a94ed7 --- /dev/null +++ b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/Rebuild.sh @@ -0,0 +1,27 @@ +#git submodule init && git submodule update +export TOOLCHAIN + +ROOT=`cd ../../../../..; pwd` + +export PATH=/usr/local/bin:$PATH + +echo $ROOT + + +( # AirBotF4 board + cd $ROOT/ArduPlane + make f4light-clean + make f4light BOARD=f4light_Airbot && + cp $ROOT/ArduPlane/f4light_Airbot.bin $ROOT/Release/Plane && + cp $ROOT/ArduPlane/f4light_Airbot.hex $ROOT/Release/Plane && + cp $ROOT/ArduPlane/f4light_Airbot.dfu $ROOT/Release/Plane +) && ( + cd $ROOT/ArduCopter + make f4light-clean + make f4light BOARD=f4light_Airbot && + + cp $ROOT/ArduCopter/f4light_Airbot.bin $ROOT/Release/Copter && + cp $ROOT/ArduCopter/f4light_Airbot.hex $ROOT/Release/Copter && + cp $ROOT/ArduCopter/f4light_Airbot.dfu $ROOT/Release/Copter +) + diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-DFU.sh similarity index 69% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-DFU.sh index f126952088..d7391af06a 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-DFU.sh @@ -1,9 +1,9 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_Revolution.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/revomini_Airbot.bin -dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/revomini_Airbot.bin +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/f4light_Airbot.bin +dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/f4light_Airbot.bin diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-STLINK.sh similarity index 66% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-STLINK.sh index 40129d8f8d..e8733f7040 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/revo_cl_racing.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_Airbot.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-plane-STLINK.sh similarity index 66% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-plane-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-plane-STLINK.sh index d4a054c620..4b3da031f7 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-plane-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/support/UPLOAD-plane-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/revo_cl_racing.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/f4light_Airbot.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_Airbot/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_Airbot/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/1_read_me.md b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/1_read_me.md similarity index 79% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/1_read_me.md rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/1_read_me.md index e583e732dc..1ed1b612ba 100644 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/1_read_me.md +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/1_read_me.md @@ -34,3 +34,11 @@ How to get voltage/current reading(tested on omnibus, should work on other targe - BAT_AMP_PERVOLT 38.0 (or 17 for apm power module) Don't try to configure Curr/Vol reading from Initial setup page of MP, because VOL/CURR variables will be reset. + +Attention! + +If you select PPM (both via jumper or removing 0 ohm resistor) UART1 is no more used for RC IN and can be +used for telemetry (Serial1 on MP settings). + +Once PPM is selected you can use this pin for RC IN with PPM/SBUS/DSM, the parser in the HAL is able to understand +which protocol are you using and to decode it properly. diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/board.h b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/DOWNLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/DOWNLOAD-STLINK.sh similarity index 85% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/DOWNLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/DOWNLOAD-STLINK.sh index 6c52aa01fb..08d8e8f15b 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/DOWNLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/DOWNLOAD-STLINK.sh @@ -1,7 +1,7 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary /usr/local/stlink/st-flash --reset read readout.bin 0x08000000 0x100000 diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/Rebuild.sh similarity index 75% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/Rebuild.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/Rebuild.sh index f8112caa05..61d85b0e52 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/Rebuild.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/Rebuild.sh @@ -11,11 +11,11 @@ echo $ROOT ( # AirBotF4 board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 ) # at 4e017bf5b3da4f2a9ffc2e1cc0a37b94edac2bdc diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-DFU.sh similarity index 68% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-DFU.sh index d745273182..48b0d30b5d 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-DFU.sh @@ -1,12 +1,12 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_AirbotV2.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_AirbotV2.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/revomini_Revolution.bin -#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/revomini_Revolution.bin -R +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/f4light_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/f4light_Revolution.bin -R -dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/revo_cl_racing.bin -R +dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/f4light_AirbotV2.bin -R diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-STLINK.sh similarity index 65% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-STLINK.sh index c19c097928..72fbf7f49f 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/MiniF4_OSD.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-plane-STLINK.sh similarity index 65% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-plane-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-plane-STLINK.sh index 542ebbfdf5..de739a79c9 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-plane-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/support/UPLOAD-plane-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/revomini_Airbot.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/f4light_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_AirbotV2/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/1_read_me.md b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/1_read_me.md similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/1_read_me.md rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/1_read_me.md diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/board.h b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/Rebuild.sh similarity index 75% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/Rebuild.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/Rebuild.sh index f8112caa05..61d85b0e52 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/Rebuild.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/Rebuild.sh @@ -11,11 +11,11 @@ echo $ROOT ( # AirBotF4 board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 ) # at 4e017bf5b3da4f2a9ffc2e1cc0a37b94edac2bdc diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-DFU.sh similarity index 67% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-DFU.sh index 784d9c38e9..48b0d30b5d 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-DFU.sh @@ -1,12 +1,12 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_AirbotV2.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_AirbotV2.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/revomini_Revolution.bin -#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/revomini_Revolution.bin -R +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/f4light_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/f4light_Revolution.bin -R -dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/revomini_AirbotV2.bin -R +dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/f4light_AirbotV2.bin -R diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-STLINK.sh similarity index 65% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-STLINK.sh index b8aaebf99c..72fbf7f49f 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/revomini_Airbot.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh similarity index 65% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-plane-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh index 322c2bd0dd..de739a79c9 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-plane-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/revomini_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/f4light_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_MatekF405_OSD/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/1_read_me.md b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/1_read_me.md similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/1_read_me.md rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/1_read_me.md diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/board.h b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/Rebuild.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/Rebuild.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/Rebuild.sh diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-DFU.sh similarity index 78% rename from libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-DFU.sh index 240d932560..97ba59d4e1 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-DFU.sh @@ -1,8 +1,8 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_AirbotV2.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_AirbotV2.bin # bare metal binary -dfu-util -a 0 --dfuse-address 0x08000000 -D ../../../../../ArduCopter/MiniF4_OSD.bin +dfu-util -a 0 --dfuse-address 0x08000000 -D ../../../../../ArduCopter/f4light_MiniF4_OSD.bin diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-STLINK.sh similarity index 65% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-STLINK.sh index 60d7862daa..07d2ff4bc2 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/support/UPLOAD-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/revomini_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_MiniF4_OSD.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Airbot/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_MiniF4_OSD/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/1_read_ME.md b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/1_read_ME.md similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/1_read_ME.md rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/1_read_ME.md diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/board.h b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/Rebuild.sh similarity index 85% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/Rebuild.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/Rebuild.sh index ee955e05de..e36059001a 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/Rebuild.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/Rebuild.sh @@ -11,11 +11,11 @@ echo $ROOT ( # AirBotF4 board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 + make f4light ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 + make f4light ) # at 4e017bf5b3da4f2a9ffc2e1cc0a37b94edac2bdc diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU-plane.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU-plane.sh similarity index 70% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU-plane.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU-plane.sh index 99096c3098..daaa488575 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU-plane.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU-plane.sh @@ -1,9 +1,9 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_Revolution.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/revomini_Revolution.bin -dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduPlane/revomini_Revolution.bin -R +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/f4light_Revolution.bin +dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduPlane/f4light_Revolution.bin -R diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU.sh similarity index 70% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU.sh index 8b9dcc8ed2..5b0740444d 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-DFU.sh @@ -1,9 +1,9 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_Revolution.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/revomini_Revolution.bin -dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/revomini_Revolution.bin -R +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/f4light_Revolution.bin +dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/f4light_Revolution.bin -R diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-STLINK.sh new file mode 100755 index 0000000000..81400408f0 --- /dev/null +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-STLINK.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# production binary with bootloader +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 + +#bare metal binary +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_Revolution.bin 0x08000000 && /usr/local/stlink/st-util -m + + diff --git a/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-plane-STLINK.sh new file mode 100755 index 0000000000..e78d58d902 --- /dev/null +++ b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/support/UPLOAD-plane-STLINK.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +# production binary with bootloader +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 + +#bare metal binary +/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/f4light_Revolution.bin 0x08000000 && /usr/local/stlink/st-util -m + + diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_Revolution/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_Revolution/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/1_read_me.md b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/1_read_me.md similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/1_read_me.md rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/1_read_me.md diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/board.cpp b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.cpp similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/board.cpp rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.cpp diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/board.h b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/board.h rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/board.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash-10000.ld b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash-10000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash-10000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash-10000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash-20000.ld b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash-20000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/ld/flash-20000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash-20000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash.ld b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash.ld rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash_8000000.ld b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash_8000000.ld similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/ld/flash_8000000.ld rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/ld/flash_8000000.ld diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/rules.mk b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/rules.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/rules.mk rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/rules.mk diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/stm32f4xx_conf.h b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/stm32f4xx_conf.h similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/stm32f4xx_conf.h rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/stm32f4xx_conf.h diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DEBUG-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/DEBUG-STLINK.sh similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DEBUG-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/DEBUG-STLINK.sh diff --git a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/Rebuild.sh similarity index 76% rename from libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/Rebuild.sh rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/Rebuild.sh index aeb3c886bb..c4830232df 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_cl_racing/support/Rebuild.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/Rebuild.sh @@ -11,10 +11,10 @@ echo $ROOT ( # AirBotF4 board cd $ROOT/ArduCopter make f4light-clean - make f4light BOARD=revo_cl_racing + make f4light BOARD=f4light_cl_racing ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light BOARD=revo_cl_racing + make f4light BOARD=f4light_cl_racing ) diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-DFU.sh b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-DFU.sh similarity index 67% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-DFU.sh rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-DFU.sh index 784d9c38e9..098479a934 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-DFU.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-DFU.sh @@ -1,12 +1,12 @@ #!/bin/sh #production binary for bootloader -#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/revomini_AirbotV2.bin +#dfu-util -a 0 --dfuse-address 0x08010000 -D /tmp/ArduCopter.build/f4light_AirbotV2.bin # bare metal binary -#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/revomini_Revolution.bin -#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/revomini_Revolution.bin -R +#dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D /tmp/ArduCopter.build/f4light_Revolution.bin +#dfu-util -a 0 --dfuse-address 0x08000000:leave -D ../../../../../ArduCopter/f4light_Revolution.bin -R -dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/revomini_AirbotV2.bin -R +dfu-util -a 0 --dfuse-address 0x08000000:unprotect:force -D ../../../../../ArduCopter/f4light_cl_racing.bin -R diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-STLINK.sh similarity index 66% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-STLINK.sh index 60d7862daa..d492649c96 100755 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/UPLOAD-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/revomini_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/f4light_cl_racing.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-plane-STLINK.sh similarity index 66% rename from libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-plane-STLINK.sh index 322c2bd0dd..2f41817e5c 100755 --- a/libraries/AP_HAL_F4Light/boards/revo_MatekF405_OSD/support/UPLOAD-plane-STLINK.sh +++ b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/support/UPLOAD-plane-STLINK.sh @@ -1,9 +1,9 @@ #!/bin/sh # production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 +#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/f4light_Revolution.bin 0x08010000 #bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/revomini_AirbotV2.bin 0x08000000 && /usr/local/stlink/st-util -m +/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/f4light_cl_racing.bin 0x08000000 && /usr/local/stlink/st-util -m diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/system_stm32f4xx.c b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/system_stm32f4xx.c similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/system_stm32f4xx.c rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/system_stm32f4xx.c diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/target-config.mk b/libraries/AP_HAL_F4Light/boards/f4light_cl_racing/target-config.mk similarity index 100% rename from libraries/AP_HAL_F4Light/boards/revomini_Revolution/target-config.mk rename to libraries/AP_HAL_F4Light/boards/f4light_cl_racing/target-config.mk diff --git a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DOWNLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DOWNLOAD-STLINK.sh deleted file mode 100755 index 6c52aa01fb..0000000000 --- a/libraries/AP_HAL_F4Light/boards/revo_MiniF4_OSD/support/DOWNLOAD-STLINK.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 - -#bare metal binary -/usr/local/stlink/st-flash --reset read readout.bin 0x08000000 0x100000 - - diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Rebuild.sh b/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Rebuild.sh deleted file mode 100755 index 92c0e929ab..0000000000 --- a/libraries/AP_HAL_F4Light/boards/revomini_Airbot/support/Rebuild.sh +++ /dev/null @@ -1,27 +0,0 @@ -#git submodule init && git submodule update -export TOOLCHAIN - -ROOT=`cd ../../../../..; pwd` - -export PATH=/usr/local/bin:$PATH - -echo $ROOT - - -( # AirBotF4 board - cd $ROOT/ArduPlane - make f4light-clean - make f4light BOARD=revomini_Airbot && - cp $ROOT/ArduPlane/revomini_Airbot.bin $ROOT/Release/Plane && - cp $ROOT/ArduPlane/revomini_Airbot.hex $ROOT/Release/Plane && - cp $ROOT/ArduPlane/revomini_Airbot.dfu $ROOT/Release/Plane -) && ( - cd $ROOT/ArduCopter - make f4light-clean - make f4light BOARD=revomini_Airbot && - - cp $ROOT/ArduCopter/revomini_Airbot.bin $ROOT/Release/Copter && - cp $ROOT/ArduCopter/revomini_Airbot.hex $ROOT/Release/Copter && - cp $ROOT/ArduCopter/revomini_Airbot.dfu $ROOT/Release/Copter -) - diff --git a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DOWNLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DOWNLOAD-STLINK.sh deleted file mode 100755 index 6c52aa01fb..0000000000 --- a/libraries/AP_HAL_F4Light/boards/revomini_AirbotV2/support/DOWNLOAD-STLINK.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 - -#bare metal binary -/usr/local/stlink/st-flash --reset read readout.bin 0x08000000 0x100000 - - diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-STLINK.sh b/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-STLINK.sh deleted file mode 100755 index bd64cb1b01..0000000000 --- a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-STLINK.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 - -#bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduCopter/revomini_Revolution.bin 0x08000000 && /usr/local/stlink/st-util -m - - diff --git a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-plane-STLINK.sh b/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-plane-STLINK.sh deleted file mode 100755 index 1458d5e45c..0000000000 --- a/libraries/AP_HAL_F4Light/boards/revomini_Revolution/support/UPLOAD-plane-STLINK.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# production binary with bootloader -#/usr/local/stlink/st-flash --reset write /tmp/ArduCopter.build/revomini_Revolution.bin 0x08010000 - -#bare metal binary -/usr/local/stlink/st-flash --reset write ../../../../../ArduPlane/revomini_Revolution.bin 0x08000000 && /usr/local/stlink/st-util -m - - diff --git a/libraries/AP_HAL_F4Light/hardware/osd/osd.cpp b/libraries/AP_HAL_F4Light/hardware/osd/osd.cpp index 1cf5ea9463..27421ecee9 100644 --- a/libraries/AP_HAL_F4Light/hardware/osd/osd.cpp +++ b/libraries/AP_HAL_F4Light/hardware/osd/osd.cpp @@ -14,7 +14,6 @@ #include "osd_core/compat.h" -// #define OSD_DMA_TRANSFER using namespace F4Light; @@ -840,12 +839,12 @@ void osd_begin(AP_HAL::OwnPtr spi){ #ifdef BOARD_OSD_VSYNC_PIN Revo_hal_handler h = { .vp = vsync_ISR }; - F4LightGPIO::_attach_interrupt(BOARD_OSD_VSYNC_PIN, h.h, RISING, VSI_INT_PRIORITY); + GPIO::_attach_interrupt(BOARD_OSD_VSYNC_PIN, h.h, RISING, VSI_INT_PRIORITY); #endif - task_handle = F4LightScheduler::start_task(OSDns::osd_loop, SMALL_TASK_STACK); // - F4LightScheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // less than main task - F4LightScheduler::set_task_period(task_handle, 10000); // 100Hz + task_handle = Scheduler::start_task(OSDns::osd_loop, SMALL_TASK_STACK); // + Scheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // less than main task + Scheduler::set_task_period(task_handle, 10000); // 100Hz } // all task is in one thread so no sync required @@ -855,7 +854,7 @@ void osd_loop() { osd_need_redraw=false; OSD::update(); - F4LightScheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low + Scheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low } uint32_t pt=millis(); @@ -913,10 +912,10 @@ void osd_loop() { if(update_screen && vsync_wait && (millis() - vsync_time)>50){ // прерывания остановились - с последнего прошло более 50мс vsync_wait=0; // хватит ждать - F4LightScheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // equal to main + Scheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // equal to main OSD::update(); // обновим принудительно (и далее будем обновлять каждые 20мс) update_screen = 0; - F4LightScheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); + Scheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); } } @@ -988,8 +987,8 @@ void vsync_ISR(){ if(update_screen) { // there is data for screen osd_need_redraw=true; - F4LightScheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // higher than all drivers so it will be scheduled just after semaphore release - F4LightScheduler::task_resume(task_handle); // task should be finished at this time so resume it + Scheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // higher than all drivers so it will be scheduled just after semaphore release + Scheduler::task_resume(task_handle); // task should be finished at this time so resume it update_screen = 0; } } @@ -1023,16 +1022,16 @@ uint32_t osd_txspace() { void osd_putc(uint8_t c){ uint8_t cnt=10; while(rb_is_full(&osd_txrb)) { - F4LightScheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // to run in time of yield() + Scheduler::set_task_priority(task_handle, OSD_HIGH_PRIORITY); // to run in time of yield() hal_yield(0); if(--cnt == 0) break; // destination don't listen } rb_push_insert(&osd_txrb, c); - F4LightScheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low + Scheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low } void osd_dequeue() { - F4LightScheduler::set_task_priority(task_handle, 100); // equal to main to not overflow buffers on packet decode + Scheduler::set_task_priority(task_handle, 100); // equal to main to not overflow buffers on packet decode while(!rb_is_empty(&osd_txrb)) { extern bool mavlink_one_byte(char c); @@ -1040,7 +1039,7 @@ void osd_dequeue() { if(mavlink_one_byte(c)) lflags.got_data=true; } - F4LightScheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low + Scheduler::set_task_priority(task_handle, OSD_LOW_PRIORITY); // restore priority to low } diff --git a/libraries/AP_HAL_F4Light/hardware/osd/osd.h b/libraries/AP_HAL_F4Light/hardware/osd/osd.h index 88c4a6b812..1107e20735 100644 --- a/libraries/AP_HAL_F4Light/hardware/osd/osd.h +++ b/libraries/AP_HAL_F4Light/hardware/osd/osd.h @@ -36,5 +36,6 @@ namespace OSDns {// OSD interface emulates UART void max_do_transfer(const uint8_t *buffer, uint16_t len); void update_max_buffer(const uint8_t *buffer, uint16_t len); + inline uint32_t millis(){ return AP_HAL::millis(); } } #endif diff --git a/libraries/AP_HAL_F4Light/hardware/sd/Sd2Card.cpp b/libraries/AP_HAL_F4Light/hardware/sd/Sd2Card.cpp index c8640bc517..fef82663ce 100644 --- a/libraries/AP_HAL_F4Light/hardware/sd/Sd2Card.cpp +++ b/libraries/AP_HAL_F4Light/hardware/sd/Sd2Card.cpp @@ -239,12 +239,12 @@ uint8_t Sd2Card::init(AP_HAL::OwnPtr spi) { _spi = std::move(spi); - F4LightGPIO::_pinMode(DF_RESET,OUTPUT); - F4LightGPIO::_setSpeed(DF_RESET, GPIO_speed_100MHz); + GPIO::_pinMode(DF_RESET,OUTPUT); + GPIO::_setSpeed(DF_RESET, GPIO_speed_100MHz); // Reset the chip. We don't need a semaphore because no SPI activity - F4LightGPIO::_write(DF_RESET,0); - F4LightScheduler::_delay(1); - F4LightGPIO::_write(DF_RESET,1); + GPIO::_write(DF_RESET,0); + Scheduler::_delay(1); + GPIO::_write(DF_RESET,1); if (!_spi) { printf("DataFlash SPIDeviceDriver not found\n"); diff --git a/libraries/AP_HAL_F4Light/support/MMM.sh b/libraries/AP_HAL_F4Light/support/MMM.sh index 7d864f7b79..dbd8a2a42e 100755 --- a/libraries/AP_HAL_F4Light/support/MMM.sh +++ b/libraries/AP_HAL_F4Light/support/MMM.sh @@ -14,29 +14,29 @@ mkdir -p $ROOT/Release/Plane ( # RevoMini board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_Revolution && ( + make f4light VERBOSE=1 BOARD=f4light_Revolution && ( - cp $ROOT/ArduCopter/revomini_Revolution.bin $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_Revolution.hex $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_Revolution.dfu $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Revolution.bin $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Revolution.hex $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Revolution.dfu $ROOT/Release/Copter ) ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_Revolution && ( + make f4light VERBOSE=1 BOARD=f4light_Revolution && ( - cp $ROOT/ArduPlane/revomini_Revolution.bin $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_Revolution.hex $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_Revolution.dfu $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Revolution.bin $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Revolution.hex $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Revolution.dfu $ROOT/Release/Plane ) ) && ( # AirBotF4 board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_Airbot && ( + make f4light VERBOSE=1 BOARD=f4light_Airbot && ( - cp $ROOT/ArduCopter/revomini_Airbot.bin $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_Airbot.hex $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_Airbot.dfu $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Airbot.bin $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Airbot.hex $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_Airbot.dfu $ROOT/Release/Copter make f4light-clean @@ -44,11 +44,11 @@ mkdir -p $ROOT/Release/Plane ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_Airbot && ( + make f4light VERBOSE=1 BOARD=f4light_Airbot && ( - cp $ROOT/ArduPlane/revomini_Airbot.bin $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_Airbot.hex $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_Airbot.dfu $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Airbot.bin $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Airbot.hex $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_Airbot.dfu $ROOT/Release/Plane make f4light-clean @@ -56,11 +56,11 @@ mkdir -p $ROOT/Release/Plane ) && ( # Cl_Racing F4 board cd $ROOT/ArduCopter make f4light-clean - make f4light VERBOSE=1 BOARD=revo_cl_racing && ( + make f4light VERBOSE=1 BOARD=f4light_cl_racing && ( - cp $ROOT/ArduCopter/revo_cl_racing.bin $ROOT/Release/Copter - cp $ROOT/ArduCopter/revo_cl_racing.hex $ROOT/Release/Copter - cp $ROOT/ArduCopter/revo_cl_racing.dfu $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_cl_racing.bin $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_cl_racing.hex $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_cl_racing.dfu $ROOT/Release/Copter make f4light-clean @@ -68,11 +68,11 @@ mkdir -p $ROOT/Release/Plane ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_Airbot && ( + make f4light VERBOSE=1 BOARD=f4light_Airbot && ( - cp $ROOT/ArduPlane/revo_cl_racing.bin $ROOT/Release/Plane - cp $ROOT/ArduPlane/revo_cl_racing.hex $ROOT/Release/Plane - cp $ROOT/ArduPlane/revo_cl_racing.dfu $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_cl_racing.bin $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_cl_racing.hex $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_cl_racing.dfu $ROOT/Release/Plane make f4light-clean @@ -80,22 +80,22 @@ mkdir -p $ROOT/Release/Plane ) && ( # AirBotF4 board cd $ROOT/ArduCopter # make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 && ( + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 && ( - cp $ROOT/ArduCopter/revomini_AirbotV2.bin $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_AirbotV2.hex $ROOT/Release/Copter - cp $ROOT/ArduCopter/revomini_AirbotV2.dfu $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_AirbotV2.bin $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_AirbotV2.hex $ROOT/Release/Copter + cp $ROOT/ArduCopter/f4light_AirbotV2.dfu $ROOT/Release/Copter ) ) && ( cd $ROOT/ArduPlane make f4light-clean - make f4light VERBOSE=1 BOARD=revomini_AirbotV2 && ( + make f4light VERBOSE=1 BOARD=f4light_AirbotV2 && ( - cp $ROOT/ArduPlane/revomini_AirbotV2.bin $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_AirbotV2.hex $ROOT/Release/Plane - cp $ROOT/ArduPlane/revomini_AirbotV2.dfu $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_AirbotV2.bin $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_AirbotV2.hex $ROOT/Release/Plane + cp $ROOT/ArduPlane/f4light_AirbotV2.dfu $ROOT/Release/Plane ) ) && ( diff --git a/mk/board_F4Light.mk b/mk/board_F4Light.mk index 85da4a6880..50b75548bf 100644 --- a/mk/board_F4Light.mk +++ b/mk/board_F4Light.mk @@ -11,6 +11,9 @@ ARM_LD := arm-none-eabi-ld ARM_GDB := arm-none-eabi-gdb ARM_OBJCOPY := arm-none-eabi-objcopy +SIZE := arm-none-eabi-size +DISAS := arm-none-eabi-objdump + #TOOLCHAIN = arm-none-eabi include $(MK_DIR)/find_tools.mk @@ -47,11 +50,11 @@ BLDROOT := $(SRCROOT)/.. BUILD_PATH := $(BUILDROOT) LIBRARIES_PATH := $(BLDROOT)/libraries -REVO_PATH := $(LIBRARIES_PATH)/AP_HAL_F4Light -WIRISH_PATH := $(REVO_PATH)/wirish -BOARDS_PATH := $(REVO_PATH)/boards -HARDWARE_PATH := $(REVO_PATH)/hardware -HAL_PATH := $(REVO_PATH)/hardware/hal +HAL_PATH := $(LIBRARIES_PATH)/AP_HAL_F4Light +WIRISH_PATH := $(HAL_PATH)/wirish +BOARDS_PATH := $(HAL_PATH)/boards +HARDWARE_PATH := $(HAL_PATH)/hardware +HAL_HW_PATH := $(HAL_PATH)/hardware/hal STM32_PATH := $(HARDWARE_PATH)/STM32F4xx_DSP_StdPeriph_Lib_V1.1.0 STM32USB_PATH := $(HARDWARE_PATH)/STM32_USB_Driver cpu_flags := -mthumb -mcpu=cortex-m4 -march=armv7e-m -mfpu=fpv4-sp-d16 -mfloat-abi=hard @@ -71,8 +74,6 @@ LDDIR := $(BOARDS_PATH)/$(BOARD)/ld # $(BOARD)- and $(MEMORY_TARGET)-specific configuration include $(BOARDS_PATH)/$(BOARD)/target-config.mk -SIZE := arm-none-eabi-size -DISAS := arm-none-eabi-objdump ## ## Compilation flags @@ -83,9 +84,6 @@ EXTRAFLAGS += $(SKETCHLIBINCLUDES) -DARDUPILOT_BUILD -DTESTS_MATHLIB_DISABLE -D GITFLAGS := -DGIT_VERSION="\"$(GIT_VERSION) $(shell date --rfc-3339=seconds)\"" -# -Wformat=1 -# -Werror=init-self -Wno-missing-field-initializers - #-Werror WARNFLAGS = -Wall -Wshadow -Wpointer-arith -Wcast-align -Wno-psabi -Wno-unused-parameter -Wno-error=cast-align -Wno-error=unused-but-set-variable WARNFLAGS += -Wwrite-strings -Wformat=2 -Wshadow -Wfloat-equal -Wpointer-arith -Wlogical-op -Wmissing-declarations -Wpacked -Wno-pragmas @@ -98,8 +96,7 @@ OPTFLAGS = -Os OPTFLAGS += -fsingle-precision-constant -g3 -fno-strict-aliasing -fomit-frame-pointer -frename-registers #-fno-strength-reduce OPTFLAGS += -fno-builtin-printf -fno-aggressive-loop-optimizations -fpredictive-commoning -#OPTFLAGS += -fassociative-math -# -freciprocal-math -ffast-math - cause EKF errors +#OPTFLAGS += -fassociative-math -freciprocal-math -ffast-math - cause EKF errors OPTFLAGS += -fno-signed-zeros -fno-trapping-math OPTFLAGS += -finline-functions-called-once -fearly-inlining -finline-small-functions OPTFLAGS += -fmerge-all-constants @@ -147,8 +144,9 @@ GLOBAL_CXXFLAGS += -fconserve-space -fno-enforce-eh-specs -fno-use-cxa-atexit GLOBAL_CXXFLAGS += -std=gnu++11 # Downgrade some diagnostics about nonconformant code from errors to warnings. Thus, using "-fpermissive" will allow some nonconforming code to compile. -GLOBAL_CXXFLAGS += $(GLOBAL_CFLAGS) -fpermissive -#-fpermissive +GLOBAL_CXXFLAGS += $(GLOBAL_CFLAGS) +# -fpermissive + # missing definitions GLOBAL_CXXFLAGS += -c -include $(WIRISH_PATH)/defs.h @@ -181,7 +179,7 @@ LDFLAGS += -Wl,--relax # used to collect files from HAL folders tree TGT_BIN := -COREINCLUDES = -I$(HAL_PATH) -I$(STM32_PATH) -I$(WIRISH_PATH) -I$(BOARDS_PATH)/$(BOARD) -I$(STM32USB_PATH) \ +COREINCLUDES = -I$(HAL_HW_PATH) -I$(STM32_PATH) -I$(WIRISH_PATH) -I$(BOARDS_PATH)/$(BOARD) -I$(STM32USB_PATH) \ -I$(HARDWARE_PATH) \ -I$(STM32_PATH)/Libraries/STM32F4xx_StdPeriph_Driver/inc \ -I$(STM32_PATH)/Libraries/CMSIS/Include \ @@ -312,11 +310,11 @@ f4light-program: f4light-clean: clean - $(v) $(FIND) $(REVO_PATH) -type f -name "*.d" -delete - $(v) $(FIND) $(REVO_PATH) -type f -name "*.o" -delete - $(v) $(FIND) $(REVO_PATH) -type f -name "*.i" -delete - $(v) $(FIND) $(REVO_PATH) -type f -name "*.ii" -delete - $(v) $(FIND) $(REVO_PATH) -type f -name "*.d" -delete + $(v) $(FIND) $(HAL_PATH) -type f -name "*.d" -delete + $(v) $(FIND) $(HAL_PATH) -type f -name "*.o" -delete + $(v) $(FIND) $(HAL_PATH) -type f -name "*.i" -delete + $(v) $(FIND) $(HAL_PATH) -type f -name "*.ii" -delete + $(v) $(FIND) $(HAL_PATH) -type f -name "*.d" -delete # Link the final object. this line sets compilation order @@ -349,8 +347,8 @@ $(BUILD_PATH)/$(BOARD).bin: $(SKETCHELF) $(v)cp $(BUILD_PATH)/$(BOARD).bin . $(v)cp $(BUILD_PATH)/$(BOARD).dfu . @echo "Object file sizes:" - @find $(BUILD_PATH) -iname *.o | xargs $(SIZE) -t > $(BUILD_PATH)/$(BOARD).sizes - @cd $(REVO_PATH); find . -iname *.o | xargs $(SIZE) -t >> $(BUILD_PATH)/$(BOARD).sizes + @find $(BUILD_PATH) -iname "*.o" | xargs $(SIZE) -t > $(BUILD_PATH)/$(BOARD).sizes + cd $(HAL_PATH); find . -follow -iname "*.o" | xargs $(SIZE) -t >> $(BUILD_PATH)/$(BOARD).sizes @cat $(BUILD_PATH)/$(BOARD).sizes @echo " " @echo "Final Size:"