boards new split VENDOR_MODEL naming convention

src/drivers/boards/common/board_common.h

@@ -255,7 +255,7 @@
 #  else
 /*  Use PX4IO FW search paths defaults based on version */
 #    if BOARD_USES_PX4IO_VERSION == 2
-#      define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4io-v2_default.bin", "/fs/microsd/px4io2.bin", "/fs/microsd/px4io.bin", nullptr }
+#      define PX4IO_FW_SEARCH_PATHS {"/etc/extras/px4_io-v2_default.bin", "/fs/microsd/px4io2.bin", "/fs/microsd/px4io.bin", nullptr }
 #    endif
 #  endif
 #endif

src/drivers/camera_trigger/camera_trigger_params.c

@@ -112,8 +112,8 @@ PARAM_DEFINE_INT32(TRIG_MODE, 0);
 /**
  * Camera trigger pin
  *
- * Selects which pin is used, ranges from 1 to 6 (AUX1-AUX6 on px4fmu-v2 and the rail
- * pins on px4fmu-v4). The PWM interface takes two pins per camera, while relay
+ * Selects which pin is used, ranges from 1 to 6 (AUX1-AUX6 on px4_fmu-v2 and the rail
+ * pins on px4_fmu-v4). The PWM interface takes two pins per camera, while relay
  * triggers on every pin individually. Example: Value 56 would trigger on pins 5 and 6.
  * For GPIO mode Pin 6 will be triggered followed by 5. With a value of 65 pin 5 will
  * be triggered followed by 6. Pins may be non contiguous. I.E. 16 or 61.

src/drivers/px4io/px4io.cpp

@@ -2008,7 +2008,7 @@ PX4IO::io_reg_modify(uint8_t page, uint8_t offset, uint16_t clearbits, uint16_t
 int
 PX4IO::print_debug()
 {
-#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
+#ifdef CONFIG_ARCH_BOARD_PX4_FMU_V2
 	int io_fd = -1;
 
 	if (io_fd <= 0) {

src/drivers/samv7/adc/adc.cpp

@@ -315,7 +315,7 @@ ADC::_tick()
 void
 ADC::update_system_power(void)
 {
-#ifdef CONFIG_ARCH_BOARD_PX4FMU_V2
+#ifdef CONFIG_ARCH_BOARD_PX4_FMU_V2
 	system_power_s system_power;
 	system_power.timestamp = hrt_absolute_time();
 
@@ -348,7 +348,7 @@ ADC::update_system_power(void)
 		_to_system_power = orb_advertise(ORB_ID(system_power), &system_power);
 	}
 
-#endif // CONFIG_ARCH_BOARD_PX4FMU_V2
+#endif // CONFIG_ARCH_BOARD_PX4_FMU_V2
 }
 
 uint16_t

src/lib/parameters/CMakeLists.txt

@@ -125,7 +125,7 @@ if(${PX4_PLATFORM} STREQUAL "nuttx")
 endif()
 
 # TODO: find a better way to do this
-if (NOT "${PX4_BOARD}" MATCHES "px4io")
+if (NOT "${PX4_BOARD}" MATCHES "px4_io")
 	add_library(parameters
 		${SRCS}
 		px4_parameters.c

src/modules/commander/commander_helper.cpp

@@ -279,7 +279,6 @@ int led_init()
 	led_control.timestamp = hrt_absolute_time();
 	led_control_pub = orb_advertise_queue(ORB_ID(led_control), &led_control, LED_UORB_QUEUE_LENGTH);
 
-#if !defined(CONFIG_ARCH_BOARD_RPI) && !defined(CONFIG_ARCH_BOARD_BBBLUE)
 	/* first open normal LEDs */
 	DevMgr::getHandle(LED0_DEVICE_PATH, h_leds);
 
@@ -305,7 +304,6 @@ int led_init()
 
 	/* switch amber off */
 	led_off(LED_AMBER);
-#endif
 
 	return 0;
 }
@@ -313,9 +311,7 @@ int led_init()
 void led_deinit()
 {
 	orb_unadvertise(led_control_pub);
-#if !defined(CONFIG_ARCH_BOARD_RPI) && !defined(CONFIG_ARCH_BOARD_BBBLUE)
 	DevMgr::releaseHandle(h_leds);
-#endif
 }
 
 int led_toggle(int led)

src/modules/systemlib/CMakeLists.txt

@@ -51,7 +51,7 @@ else()
 endif()
 
 # TODO: find a better way to do this
-if (NOT "${PX4_BOARD}" MATCHES "px4io")
+if (NOT "${PX4_BOARD}" MATCHES "px4_io")
 	px4_add_library(systemlib ${SRCS})
 else()
 	add_library(systemlib ${PX4_SOURCE_DIR}/src/platforms/empty.c)

src/modules/uavcan/uavcan_main.cpp

@@ -173,7 +173,7 @@ int UavcanNode::getHardwareVersion(uavcan::protocol::HardwareVersion &hwver)
 	int rv = -1;
 
 	if (UavcanNode::instance()) {
-		if (!std::strncmp(px4_board_name(), "PX4FMU_V2", 9)) {
+		if (!std::strncmp(px4_board_name(), "PX4_FMU_V2", 9)) {
 			hwver.major = 2;
 
 		} else {

src/systemcmds/ver/ver.c

@@ -80,7 +80,7 @@ static void usage(const char *reason)
 	PRINT_MODULE_USAGE_COMMAND_DESCR("all", "Print all versions");
 	PRINT_MODULE_USAGE_COMMAND_DESCR("hwcmp", "Compare hardware version (returns 0 on match)");
 	PRINT_MODULE_USAGE_ARG("<hw> [<hw2>]",
-			       "Hardware to compare against (eg. PX4FMU_V4). An OR comparison is used if multiple are specified", false);
+			       "Hardware to compare against (eg. PX4_FMU_V4). An OR comparison is used if multiple are specified", false);
 	PRINT_MODULE_USAGE_COMMAND_DESCR("hwtypecmp", "Compare hardware type (returns 0 on match)");
 	PRINT_MODULE_USAGE_ARG("<hwtype> [<hwtype2>]",
 			       "Hardware type to compare against (eg. V2). An OR comparison is used if multiple are specified", false);
@@ -108,7 +108,7 @@ int ver_main(int argc, char *argv[])
 					}
 
 				} else {
-					PX4_ERR("Not enough arguments, try 'ver hwcmp PX4FMU_V2'");
+					PX4_ERR("Not enough arguments, try 'ver hwcmp PX4_FMU_V2'");
 				}
 
 				return 1;