From f02d490e890d616883d3b3a11d1711bfcb869631 Mon Sep 17 00:00:00 2001 From: David Sidrane Date: Tue, 3 Nov 2020 13:14:53 -0800 Subject: [PATCH] rddrone-uavcan146:Rename to ucans32k146 --- .ci/Jenkinsfile-compile | 2 +- .github/workflows/compile_nuttx.yml | 2 +- .../nxp/{rddrone-uavcan146 => ucans32k146}/Kconfig | 0 .../{rddrone-uavcan146 => ucans32k146}/default.cmake | 4 ++-- .../firmware.prototype | 4 ++-- .../init/rc.board_defaults | 0 .../nuttx-config/Kconfig | 0 .../nuttx-config/include/board.h | 12 ++++++------ .../nuttx-config/nsh/defconfig | 0 .../nuttx-config/scripts/s32k146.cfg | 0 .../nuttx-config/scripts/script.ld | 2 +- .../nuttx-config/scripts/sram.ld | 2 +- .../src/CMakeLists.txt | 0 .../src/autoleds.c | 4 ++-- .../src/board_config.h | 10 +++++----- .../{rddrone-uavcan146 => ucans32k146}/src/boot.c | 2 +- .../{rddrone-uavcan146 => ucans32k146}/src/bringup.c | 2 +- .../{rddrone-uavcan146 => ucans32k146}/src/buttons.c | 4 ++-- .../src/clockconfig.c | 2 +- .../{rddrone-uavcan146 => ucans32k146}/src/i2c.cpp | 0 .../{rddrone-uavcan146 => ucans32k146}/src/init.c | 2 +- .../src/periphclocks.c | 2 +- .../nxp/{rddrone-uavcan146 => ucans32k146}/src/spi.c | 4 ++-- .../src/timer_config.cpp | 0 .../src/userleds.c | 2 +- 25 files changed, 31 insertions(+), 31 deletions(-) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/Kconfig (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/default.cmake (94%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/firmware.prototype (67%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/init/rc.board_defaults (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/Kconfig (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/include/board.h (94%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/nsh/defconfig (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/scripts/s32k146.cfg (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/scripts/script.ld (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/nuttx-config/scripts/sram.ld (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/CMakeLists.txt (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/autoleds.c (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/board_config.h (95%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/boot.c (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/bringup.c (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/buttons.c (97%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/clockconfig.c (99%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/i2c.cpp (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/init.c (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/periphclocks.c (98%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/spi.c (97%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/timer_config.cpp (100%) rename boards/nxp/{rddrone-uavcan146 => ucans32k146}/src/userleds.c (98%) diff --git a/.ci/Jenkinsfile-compile b/.ci/Jenkinsfile-compile index 63c1c73f11..a8b8c20fe7 100644 --- a/.ci/Jenkinsfile-compile +++ b/.ci/Jenkinsfile-compile @@ -52,7 +52,7 @@ pipeline { "nxp_fmuk66-v3_socketcan", "nxp_fmuk66-v3_rtps", "nxp_fmurt1062-v1_default", - "nxp_rddrone-uavcan146_default", + "nxp_ucans32k146_default", "omnibus_f4sd_default", "px4_fmu-v2_default", "px4_fmu-v2_fixedwing", diff --git a/.github/workflows/compile_nuttx.yml b/.github/workflows/compile_nuttx.yml index b3068fbd4a..8baea26381 100644 --- a/.github/workflows/compile_nuttx.yml +++ b/.github/workflows/compile_nuttx.yml @@ -39,7 +39,7 @@ jobs: nxp_fmuk66-v3_socketcan, nxp_fmuk66-v3_rtps, nxp_fmurt1062-v1_default, - nxp_rddrone-uavcan146_default, + nxp_ucans32k146_default, omnibus_f4sd_default, px4_fmu-v2_default, px4_fmu-v2_fixedwing, diff --git a/boards/nxp/rddrone-uavcan146/Kconfig b/boards/nxp/ucans32k146/Kconfig similarity index 100% rename from boards/nxp/rddrone-uavcan146/Kconfig rename to boards/nxp/ucans32k146/Kconfig diff --git a/boards/nxp/rddrone-uavcan146/default.cmake b/boards/nxp/ucans32k146/default.cmake similarity index 94% rename from boards/nxp/rddrone-uavcan146/default.cmake rename to boards/nxp/ucans32k146/default.cmake index 7f4e27c17c..449b5d647f 100644 --- a/boards/nxp/rddrone-uavcan146/default.cmake +++ b/boards/nxp/ucans32k146/default.cmake @@ -10,7 +10,7 @@ add_definitions( set(uavcanblid_hw_version_major 1) set(uavcanblid_hw_version_minor 0) -set(uavcanblid_name "\"org.nxp.rddrone-uavcan146\"") +set(uavcanblid_name "\"org.nxp.ucans32k146\"") add_definitions( -DHW_UAVCAN_NAME=${uavcanblid_name} @@ -21,7 +21,7 @@ add_definitions( px4_add_board( PLATFORM nuttx VENDOR nxp - MODEL rddrone-uavcan146 + MODEL ucans32k146 LABEL default TOOLCHAIN arm-none-eabi ARCHITECTURE cortex-m4 diff --git a/boards/nxp/rddrone-uavcan146/firmware.prototype b/boards/nxp/ucans32k146/firmware.prototype similarity index 67% rename from boards/nxp/rddrone-uavcan146/firmware.prototype rename to boards/nxp/ucans32k146/firmware.prototype index bb3c62891a..0cc07b63b6 100644 --- a/boards/nxp/rddrone-uavcan146/firmware.prototype +++ b/boards/nxp/ucans32k146/firmware.prototype @@ -1,10 +1,10 @@ { "board_id": 10000, "magic": "PX4FWv1", - "description": "Firmware for the rddrone-uavcan146 board", + "description": "Firmware for the ucans32k146 board", "image": "", "build_time": 0, - "summary": "RDDRONE-UAVCAN146", + "summary": "UCANS32K146", "version": "0.1", "image_size": 0, "image_maxsize": 0, diff --git a/boards/nxp/rddrone-uavcan146/init/rc.board_defaults b/boards/nxp/ucans32k146/init/rc.board_defaults similarity index 100% rename from boards/nxp/rddrone-uavcan146/init/rc.board_defaults rename to boards/nxp/ucans32k146/init/rc.board_defaults diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/Kconfig b/boards/nxp/ucans32k146/nuttx-config/Kconfig similarity index 100% rename from boards/nxp/rddrone-uavcan146/nuttx-config/Kconfig rename to boards/nxp/ucans32k146/nuttx-config/Kconfig diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/include/board.h b/boards/nxp/ucans32k146/nuttx-config/include/board.h similarity index 94% rename from boards/nxp/rddrone-uavcan146/nuttx-config/include/board.h rename to boards/nxp/ucans32k146/nuttx-config/include/board.h index 61358f900d..3c3d8a0234 100644 --- a/boards/nxp/rddrone-uavcan146/nuttx-config/include/board.h +++ b/boards/nxp/ucans32k146/nuttx-config/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/include/board.h + * boards/arm/s32k1xx/ucans32k146/include/board.h * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -53,7 +53,7 @@ /* Clocking *****************************************************************/ -/* The RDDRONE-UAVCAN146 is fitted with a 8MHz Crystal */ +/* The UCANS32K146 is fitted with a 8MHz Crystal */ #define BOARD_XTAL_FREQUENCY 8000000 @@ -63,7 +63,7 @@ /* LED definitions **********************************************************/ -/* The RDDRONE-UAVCAN146 has one RGB LED: +/* The UCANS32K146 has one RGB LED: * * RedLED PTD15 (FTM0 CH0) * GreenLED PTD16 (FTM0 CH1) @@ -91,7 +91,7 @@ #define BOARD_LED_B_BIT (1 << BOARD_LED_B) /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LEDs on board - * the RDDRONE-UAVCAN146. The following definitions describe how NuttX + * the UCANS32K146. The following definitions describe how NuttX * controls the LEDs: * * SYMBOL Meaning LED state @@ -107,11 +107,11 @@ #define LED_SIGNAL 0 /* In a signal handler (no change) */ #define LED_ASSERTION 0 /* An assertion failed (no change) */ #define LED_PANIC 4 /* The system has crashed FLASH OFF OFF */ -#undef LED_IDLE /* RDDRONE-UAVCAN146 in sleep mode (Not used) */ +#undef LED_IDLE /* UCANS32K146 in sleep mode (Not used) */ /* Button definitions *******************************************************/ -/* The RDDRONE-UAVCAN146 supports two buttons: +/* The UCANS32K146 supports two buttons: * * SW3 PTC14 */ diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig b/boards/nxp/ucans32k146/nuttx-config/nsh/defconfig similarity index 100% rename from boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig rename to boards/nxp/ucans32k146/nuttx-config/nsh/defconfig diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/s32k146.cfg b/boards/nxp/ucans32k146/nuttx-config/scripts/s32k146.cfg similarity index 100% rename from boards/nxp/rddrone-uavcan146/nuttx-config/scripts/s32k146.cfg rename to boards/nxp/ucans32k146/nuttx-config/scripts/s32k146.cfg diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld b/boards/nxp/ucans32k146/nuttx-config/scripts/script.ld similarity index 98% rename from boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld rename to boards/nxp/ucans32k146/nuttx-config/scripts/script.ld index 74dbe78e39..2ff2ab3e5a 100644 --- a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld +++ b/boards/nxp/ucans32k146/nuttx-config/scripts/script.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld + * boards/arm/s32k1xx/ucans32k146/scripts/flash.ld * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/sram.ld b/boards/nxp/ucans32k146/nuttx-config/scripts/sram.ld similarity index 98% rename from boards/nxp/rddrone-uavcan146/nuttx-config/scripts/sram.ld rename to boards/nxp/ucans32k146/nuttx-config/scripts/sram.ld index dd9883859b..61afa40f5d 100644 --- a/boards/nxp/rddrone-uavcan146/nuttx-config/scripts/sram.ld +++ b/boards/nxp/ucans32k146/nuttx-config/scripts/sram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld + * boards/arm/s32k1xx/ucans32k146/scripts/sram.ld * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/CMakeLists.txt b/boards/nxp/ucans32k146/src/CMakeLists.txt similarity index 100% rename from boards/nxp/rddrone-uavcan146/src/CMakeLists.txt rename to boards/nxp/ucans32k146/src/CMakeLists.txt diff --git a/boards/nxp/rddrone-uavcan146/src/autoleds.c b/boards/nxp/ucans32k146/src/autoleds.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/autoleds.c rename to boards/nxp/ucans32k146/src/autoleds.c index 49180ad500..c4b67f8ca9 100644 --- a/boards/nxp/rddrone-uavcan146/src/autoleds.c +++ b/boards/nxp/ucans32k146/src/autoleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,7 +33,7 @@ * ****************************************************************************/ -/* The RDDRONE-UAVCAN146 has one RGB LED: +/* The UCANS32K146 has one RGB LED: * * RedLED PTD15 (FTM0 CH0) * GreenLED PTD16 (FTM0 CH1) diff --git a/boards/nxp/rddrone-uavcan146/src/board_config.h b/boards/nxp/ucans32k146/src/board_config.h similarity index 95% rename from boards/nxp/rddrone-uavcan146/src/board_config.h rename to boards/nxp/ucans32k146/src/board_config.h index c05306011f..69c5ee3675 100644 --- a/boards/nxp/rddrone-uavcan146/src/board_config.h +++ b/boards/nxp/ucans32k146/src/board_config.h @@ -36,7 +36,7 @@ /** * @file board_config.h * - * NXP rddrone-uavcan146 internal definitions + * NXP ucans32k146 internal definitions */ #pragma once @@ -64,9 +64,9 @@ __BEGIN_DECLS /* Configuration ************************************************************/ -/* RDDRONE-UAVCAN146 GPIOs **************************************************/ +/* UCANS32K146 GPIOs **************************************************/ -/* LEDs. The RDDRONE-UAVCAN146 has one RGB LED: +/* LEDs. The UCANS32K146 has one RGB LED: * * RedLED PTD15 (FTM0 CH0) * GreenLED PTD16 (FTM0 CH1) @@ -79,7 +79,7 @@ __BEGIN_DECLS #define GPIO_LED_G (PIN_PTD16 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO) #define GPIO_LED_B (PIN_PTD0 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO) -/* Buttons. The RDDRONE-UAVCAN146 supports one button: +/* Buttons. The UCANS32K146 supports one button: * * SW3 PTC14 */ @@ -156,7 +156,7 @@ int s32k1xx_bringup(void); * Name: s32k1xx_spidev_initialize * * Description: - * Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146 + * Called to configure SPI chip select GPIO pins for the UCANS32K146 * board. * ****************************************************************************/ diff --git a/boards/nxp/rddrone-uavcan146/src/boot.c b/boards/nxp/ucans32k146/src/boot.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/boot.c rename to boards/nxp/ucans32k146/src/boot.c index 475fde0afe..e0928cf0a8 100644 --- a/boards/nxp/rddrone-uavcan146/src/boot.c +++ b/boards/nxp/ucans32k146/src/boot.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/bringup.c b/boards/nxp/ucans32k146/src/bringup.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/bringup.c rename to boards/nxp/ucans32k146/src/bringup.c index fbd6f581c4..b972c42f35 100644 --- a/boards/nxp/rddrone-uavcan146/src/bringup.c +++ b/boards/nxp/ucans32k146/src/bringup.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/buttons.c b/boards/nxp/ucans32k146/src/buttons.c similarity index 97% rename from boards/nxp/rddrone-uavcan146/src/buttons.c rename to boards/nxp/ucans32k146/src/buttons.c index da3f3188af..4099b805d1 100644 --- a/boards/nxp/rddrone-uavcan146/src/buttons.c +++ b/boards/nxp/ucans32k146/src/buttons.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,7 +33,7 @@ * ****************************************************************************/ -/* The RDDRONE-UAVCAN146 supports one button: +/* The UCANS32K146 supports one button: * * SW3 PTC14 */ diff --git a/boards/nxp/rddrone-uavcan146/src/clockconfig.c b/boards/nxp/ucans32k146/src/clockconfig.c similarity index 99% rename from boards/nxp/rddrone-uavcan146/src/clockconfig.c rename to boards/nxp/ucans32k146/src/clockconfig.c index fbf74d9aff..95e91ed28e 100644 --- a/boards/nxp/rddrone-uavcan146/src/clockconfig.c +++ b/boards/nxp/ucans32k146/src/clockconfig.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/i2c.cpp b/boards/nxp/ucans32k146/src/i2c.cpp similarity index 100% rename from boards/nxp/rddrone-uavcan146/src/i2c.cpp rename to boards/nxp/ucans32k146/src/i2c.cpp diff --git a/boards/nxp/rddrone-uavcan146/src/init.c b/boards/nxp/ucans32k146/src/init.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/init.c rename to boards/nxp/ucans32k146/src/init.c index 041633e0fa..e6137f0711 100644 --- a/boards/nxp/rddrone-uavcan146/src/init.c +++ b/boards/nxp/ucans32k146/src/init.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/periphclocks.c b/boards/nxp/ucans32k146/src/periphclocks.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/periphclocks.c rename to boards/nxp/ucans32k146/src/periphclocks.c index 3ed959f2de..b805597d82 100644 --- a/boards/nxp/rddrone-uavcan146/src/periphclocks.c +++ b/boards/nxp/ucans32k146/src/periphclocks.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclks.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclks.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/nxp/rddrone-uavcan146/src/spi.c b/boards/nxp/ucans32k146/src/spi.c similarity index 97% rename from boards/nxp/rddrone-uavcan146/src/spi.c rename to boards/nxp/ucans32k146/src/spi.c index 30069e4e2d..9136edb2cc 100644 --- a/boards/nxp/rddrone-uavcan146/src/spi.c +++ b/boards/nxp/ucans32k146/src/spi.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c * * Copyright (C) 2018 Gregory Nutt. All rights reserved. * Author: Ivan Ucherdzhiev @@ -66,7 +66,7 @@ * Name: s32k1xx_spidev_initialize * * Description: - * Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146 + * Called to configure SPI chip select GPIO pins for the UCANS32K146 * board. * ****************************************************************************/ diff --git a/boards/nxp/rddrone-uavcan146/src/timer_config.cpp b/boards/nxp/ucans32k146/src/timer_config.cpp similarity index 100% rename from boards/nxp/rddrone-uavcan146/src/timer_config.cpp rename to boards/nxp/ucans32k146/src/timer_config.cpp diff --git a/boards/nxp/rddrone-uavcan146/src/userleds.c b/boards/nxp/ucans32k146/src/userleds.c similarity index 98% rename from boards/nxp/rddrone-uavcan146/src/userleds.c rename to boards/nxp/ucans32k146/src/userleds.c index fafc71f07b..e9fce1b85a 100644 --- a/boards/nxp/rddrone-uavcan146/src/userleds.c +++ b/boards/nxp/ucans32k146/src/userleds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c + * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c * * Copyright (C) 2019 Gregory Nutt. All rights reserved. * Author: Gregory Nutt