Browse Source

rddrone-uavcan146:Rename to ucans32k146

release/1.12
David Sidrane 4 years ago committed by David Sidrane
parent
commit
f02d490e89
  1. 2
      .ci/Jenkinsfile-compile
  2. 2
      .github/workflows/compile_nuttx.yml
  3. 0
      boards/nxp/ucans32k146/Kconfig
  4. 4
      boards/nxp/ucans32k146/default.cmake
  5. 4
      boards/nxp/ucans32k146/firmware.prototype
  6. 0
      boards/nxp/ucans32k146/init/rc.board_defaults
  7. 0
      boards/nxp/ucans32k146/nuttx-config/Kconfig
  8. 12
      boards/nxp/ucans32k146/nuttx-config/include/board.h
  9. 0
      boards/nxp/ucans32k146/nuttx-config/nsh/defconfig
  10. 0
      boards/nxp/ucans32k146/nuttx-config/scripts/s32k146.cfg
  11. 2
      boards/nxp/ucans32k146/nuttx-config/scripts/script.ld
  12. 2
      boards/nxp/ucans32k146/nuttx-config/scripts/sram.ld
  13. 0
      boards/nxp/ucans32k146/src/CMakeLists.txt
  14. 4
      boards/nxp/ucans32k146/src/autoleds.c
  15. 10
      boards/nxp/ucans32k146/src/board_config.h
  16. 2
      boards/nxp/ucans32k146/src/boot.c
  17. 2
      boards/nxp/ucans32k146/src/bringup.c
  18. 4
      boards/nxp/ucans32k146/src/buttons.c
  19. 2
      boards/nxp/ucans32k146/src/clockconfig.c
  20. 0
      boards/nxp/ucans32k146/src/i2c.cpp
  21. 2
      boards/nxp/ucans32k146/src/init.c
  22. 2
      boards/nxp/ucans32k146/src/periphclocks.c
  23. 4
      boards/nxp/ucans32k146/src/spi.c
  24. 0
      boards/nxp/ucans32k146/src/timer_config.cpp
  25. 2
      boards/nxp/ucans32k146/src/userleds.c

2
.ci/Jenkinsfile-compile

@ -52,7 +52,7 @@ pipeline {
"nxp_fmuk66-v3_socketcan", "nxp_fmuk66-v3_socketcan",
"nxp_fmuk66-v3_rtps", "nxp_fmuk66-v3_rtps",
"nxp_fmurt1062-v1_default", "nxp_fmurt1062-v1_default",
"nxp_rddrone-uavcan146_default", "nxp_ucans32k146_default",
"omnibus_f4sd_default", "omnibus_f4sd_default",
"px4_fmu-v2_default", "px4_fmu-v2_default",
"px4_fmu-v2_fixedwing", "px4_fmu-v2_fixedwing",

2
.github/workflows/compile_nuttx.yml

@ -39,7 +39,7 @@ jobs:
nxp_fmuk66-v3_socketcan, nxp_fmuk66-v3_socketcan,
nxp_fmuk66-v3_rtps, nxp_fmuk66-v3_rtps,
nxp_fmurt1062-v1_default, nxp_fmurt1062-v1_default,
nxp_rddrone-uavcan146_default, nxp_ucans32k146_default,
omnibus_f4sd_default, omnibus_f4sd_default,
px4_fmu-v2_default, px4_fmu-v2_default,
px4_fmu-v2_fixedwing, px4_fmu-v2_fixedwing,

0
boards/nxp/rddrone-uavcan146/Kconfig → boards/nxp/ucans32k146/Kconfig

4
boards/nxp/rddrone-uavcan146/default.cmake → boards/nxp/ucans32k146/default.cmake

@ -10,7 +10,7 @@ add_definitions(
set(uavcanblid_hw_version_major 1) set(uavcanblid_hw_version_major 1)
set(uavcanblid_hw_version_minor 0) set(uavcanblid_hw_version_minor 0)
set(uavcanblid_name "\"org.nxp.rddrone-uavcan146\"") set(uavcanblid_name "\"org.nxp.ucans32k146\"")
add_definitions( add_definitions(
-DHW_UAVCAN_NAME=${uavcanblid_name} -DHW_UAVCAN_NAME=${uavcanblid_name}
@ -21,7 +21,7 @@ add_definitions(
px4_add_board( px4_add_board(
PLATFORM nuttx PLATFORM nuttx
VENDOR nxp VENDOR nxp
MODEL rddrone-uavcan146 MODEL ucans32k146
LABEL default LABEL default
TOOLCHAIN arm-none-eabi TOOLCHAIN arm-none-eabi
ARCHITECTURE cortex-m4 ARCHITECTURE cortex-m4

4
boards/nxp/rddrone-uavcan146/firmware.prototype → boards/nxp/ucans32k146/firmware.prototype

@ -1,10 +1,10 @@
{ {
"board_id": 10000, "board_id": 10000,
"magic": "PX4FWv1", "magic": "PX4FWv1",
"description": "Firmware for the rddrone-uavcan146 board", "description": "Firmware for the ucans32k146 board",
"image": "", "image": "",
"build_time": 0, "build_time": 0,
"summary": "RDDRONE-UAVCAN146", "summary": "UCANS32K146",
"version": "0.1", "version": "0.1",
"image_size": 0, "image_size": 0,
"image_maxsize": 0, "image_maxsize": 0,

0
boards/nxp/rddrone-uavcan146/init/rc.board_defaults → boards/nxp/ucans32k146/init/rc.board_defaults

0
boards/nxp/rddrone-uavcan146/nuttx-config/Kconfig → boards/nxp/ucans32k146/nuttx-config/Kconfig

12
boards/nxp/rddrone-uavcan146/nuttx-config/include/board.h → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -53,7 +53,7 @@
/* Clocking *****************************************************************/ /* Clocking *****************************************************************/
/* The RDDRONE-UAVCAN146 is fitted with a 8MHz Crystal */ /* The UCANS32K146 is fitted with a 8MHz Crystal */
#define BOARD_XTAL_FREQUENCY 8000000 #define BOARD_XTAL_FREQUENCY 8000000
@ -63,7 +63,7 @@
/* LED definitions **********************************************************/ /* LED definitions **********************************************************/
/* The RDDRONE-UAVCAN146 has one RGB LED: /* The UCANS32K146 has one RGB LED:
* *
* RedLED PTD15 (FTM0 CH0) * RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1) * GreenLED PTD16 (FTM0 CH1)
@ -91,7 +91,7 @@
#define BOARD_LED_B_BIT (1 << BOARD_LED_B) #define BOARD_LED_B_BIT (1 << BOARD_LED_B)
/* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LEDs on board /* 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: * controls the LEDs:
* *
* SYMBOL Meaning LED state * SYMBOL Meaning LED state
@ -107,11 +107,11 @@
#define LED_SIGNAL 0 /* In a signal handler (no change) */ #define LED_SIGNAL 0 /* In a signal handler (no change) */
#define LED_ASSERTION 0 /* An assertion failed (no change) */ #define LED_ASSERTION 0 /* An assertion failed (no change) */
#define LED_PANIC 4 /* The system has crashed FLASH OFF OFF */ #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 *******************************************************/ /* Button definitions *******************************************************/
/* The RDDRONE-UAVCAN146 supports two buttons: /* The UCANS32K146 supports two buttons:
* *
* SW3 PTC14 * SW3 PTC14
*/ */

0
boards/nxp/rddrone-uavcan146/nuttx-config/nsh/defconfig → boards/nxp/ucans32k146/nuttx-config/nsh/defconfig

0
boards/nxp/rddrone-uavcan146/nuttx-config/scripts/s32k146.cfg → boards/nxp/ucans32k146/nuttx-config/scripts/s32k146.cfg

2
boards/nxp/rddrone-uavcan146/nuttx-config/scripts/script.ld → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

2
boards/nxp/rddrone-uavcan146/nuttx-config/scripts/sram.ld → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

0
boards/nxp/rddrone-uavcan146/src/CMakeLists.txt → boards/nxp/ucans32k146/src/CMakeLists.txt

4
boards/nxp/rddrone-uavcan146/src/autoleds.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,7 +33,7 @@
* *
****************************************************************************/ ****************************************************************************/
/* The RDDRONE-UAVCAN146 has one RGB LED: /* The UCANS32K146 has one RGB LED:
* *
* RedLED PTD15 (FTM0 CH0) * RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1) * GreenLED PTD16 (FTM0 CH1)

10
boards/nxp/rddrone-uavcan146/src/board_config.h → boards/nxp/ucans32k146/src/board_config.h

@ -36,7 +36,7 @@
/** /**
* @file board_config.h * @file board_config.h
* *
* NXP rddrone-uavcan146 internal definitions * NXP ucans32k146 internal definitions
*/ */
#pragma once #pragma once
@ -64,9 +64,9 @@ __BEGIN_DECLS
/* Configuration ************************************************************/ /* 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) * RedLED PTD15 (FTM0 CH0)
* GreenLED PTD16 (FTM0 CH1) * GreenLED PTD16 (FTM0 CH1)
@ -79,7 +79,7 @@ __BEGIN_DECLS
#define GPIO_LED_G (PIN_PTD16 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO) #define GPIO_LED_G (PIN_PTD16 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO)
#define GPIO_LED_B (PIN_PTD0 | 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 * SW3 PTC14
*/ */
@ -156,7 +156,7 @@ int s32k1xx_bringup(void);
* Name: s32k1xx_spidev_initialize * Name: s32k1xx_spidev_initialize
* *
* Description: * 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. * board.
* *
****************************************************************************/ ****************************************************************************/

2
boards/nxp/rddrone-uavcan146/src/boot.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

2
boards/nxp/rddrone-uavcan146/src/bringup.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

4
boards/nxp/rddrone-uavcan146/src/buttons.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,7 +33,7 @@
* *
****************************************************************************/ ****************************************************************************/
/* The RDDRONE-UAVCAN146 supports one button: /* The UCANS32K146 supports one button:
* *
* SW3 PTC14 * SW3 PTC14
*/ */

2
boards/nxp/rddrone-uavcan146/src/clockconfig.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

0
boards/nxp/rddrone-uavcan146/src/i2c.cpp → boards/nxp/ucans32k146/src/i2c.cpp

2
boards/nxp/rddrone-uavcan146/src/init.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

2
boards/nxp/rddrone-uavcan146/src/periphclocks.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

4
boards/nxp/rddrone-uavcan146/src/spi.c → 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. * Copyright (C) 2018 Gregory Nutt. All rights reserved.
* Author: Ivan Ucherdzhiev <ivanucherdjiev@gmail.com> * Author: Ivan Ucherdzhiev <ivanucherdjiev@gmail.com>
@ -66,7 +66,7 @@
* Name: s32k1xx_spidev_initialize * Name: s32k1xx_spidev_initialize
* *
* Description: * 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. * board.
* *
****************************************************************************/ ****************************************************************************/

0
boards/nxp/rddrone-uavcan146/src/timer_config.cpp → boards/nxp/ucans32k146/src/timer_config.cpp

2
boards/nxp/rddrone-uavcan146/src/userleds.c → 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. * Copyright (C) 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
Loading…
Cancel
Save