HAL_ChibiOS: moved more headers to common

allow customisation, but don't require every port to copy the defaults

libraries/AP_HAL_ChibiOS/GPIO.cpp

@@ -31,7 +31,7 @@ static struct gpio_entry {
     {1, PAL_LINE(GPIOB, 6U)},
 #elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_CHIBIOS_FMUV3
     // pin numbers chosen to match px4 build
-    {0,  true,  LINE_LED1},
+    {0,  true,  PAL_LINE(GPIOE, 12U)}, // LED
     {1,  true,  PAL_LINE(GPIOB, 0U)},
     {50, false, PAL_LINE(GPIOE, 14U)},
     {51, false, PAL_LINE(GPIOE, 13U)},

libraries/AP_HAL_ChibiOS/hwdef/common/board.h

@@ -16,24 +16,28 @@
  */
 #pragma once
 
-/*
- * APM HW Defines
- */
-#define PPM_ICU_TIMER  ICUD4
-#define PPM_ICU_CHANNEL  ICU_CHANNEL_2
-
-#define HRT_TIMER GPTD5
-#define LINE_LED1 PAL_LINE(GPIOE,12)
-
 #include "hwdef.h"
 
+#ifndef PPM_ICU_TIMER
+#define PPM_ICU_TIMER  ICUD4
+#endif
+
+#ifndef PPM_ICU_CHANNEL
+#define PPM_ICU_CHANNEL ICU_CHANNEL_2
+#endif
+
+#ifndef HRT_TIMER
+#define HRT_TIMER GPTD5
+#endif
 
 #ifndef HAL_BOARD_INIT_HOOK_DEFINE
 #define HAL_BOARD_INIT_HOOK_DEFINE
 #endif
+
 #ifndef HAL_BOARD_INIT_HOOK_CALL
 #define HAL_BOARD_INIT_HOOK_CALL
 #endif
+
 #if !defined(_FROM_ASM_)
 #ifdef __cplusplus
 extern "C" {

libraries/AP_HAL_ChibiOS/hwdef/fmuv4/board.h

@@ -1,47 +0,0 @@
-/*
- * This file is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Code by Andrew Tridgell and Siddharth Bharat Purohit
- */
-#pragma once
-
-/*
- * APM HW Defines
- */
-#define PPM_ICU_TIMER  ICUD4
-#define PPM_ICU_CHANNEL  ICU_CHANNEL_2
-
-#define HRT_TIMER GPTD5
-#define LINE_LED1 PAL_LINE(GPIOE,12)
-
-#include "hwdef.h"
-
-
-#ifndef HAL_BOARD_INIT_HOOK_DEFINE
-#define HAL_BOARD_INIT_HOOK_DEFINE
-#endif
-#ifndef HAL_BOARD_INIT_HOOK_CALL
-#define HAL_BOARD_INIT_HOOK_CALL
-#endif
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-  HAL_BOARD_INIT_HOOK_DEFINE
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-

libraries/AP_HAL_ChibiOS/hwdef/mindpx-v2/board.h

@@ -1,47 +0,0 @@
-/*
- * This file is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Code by Andrew Tridgell and Siddharth Bharat Purohit
- */
-#pragma once
-
-/*
- * APM HW Defines
- */
-#define PPM_ICU_TIMER  ICUD4
-#define PPM_ICU_CHANNEL  ICU_CHANNEL_2
-
-#define HRT_TIMER GPTD5
-#define LINE_LED1 PAL_LINE(GPIOE,12)
-
-#include "hwdef.h"
-
-
-#ifndef HAL_BOARD_INIT_HOOK_DEFINE
-#define HAL_BOARD_INIT_HOOK_DEFINE
-#endif
-#ifndef HAL_BOARD_INIT_HOOK_CALL
-#define HAL_BOARD_INIT_HOOK_CALL
-#endif
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-  HAL_BOARD_INIT_HOOK_DEFINE
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-

libraries/AP_HAL_ChibiOS/hwdef/skyviper-f412/board.h

@@ -1,60 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-/*
- * This file is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This file is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * Modified for use in AP_HAL by Andrew Tridgell and Siddharth Bharat Purohit
- */
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Setup for STMicroelectronics STM32 F412 SkyViper board.
- */
-
-#include "hwdef.h"
-
-/*
- * APM HW Defines
- */
-
-#define HRT_TIMER GPTD5
-
-#define PPM_ICU_TIMER  ICUD1
-#define PPM_ICU_CHANNEL  ICU_CHANNEL_1
-
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-
-#endif /* _BOARD_H_ */