From 56dddee56cc3120151468b867864c61ed1abc613 Mon Sep 17 00:00:00 2001 From: Stacey Sheldon Date: Wed, 23 May 2012 00:29:12 -0400 Subject: [PATCH] cc: use defines for board revisions instead of hard-coded numbers --- flight/Bootloaders/CopterControl/pios_board.c | 4 ++-- flight/CopterControl/System/pios_board.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flight/Bootloaders/CopterControl/pios_board.c b/flight/Bootloaders/CopterControl/pios_board.c index 92092a5ff..4104c4028 100644 --- a/flight/Bootloaders/CopterControl/pios_board.c +++ b/flight/Bootloaders/CopterControl/pios_board.c @@ -76,10 +76,10 @@ void PIOS_Board_Init(void) { uint32_t pios_usb_id; switch(bdinfo->board_rev) { - case 0x01: // Revision 1 + case BOARD_REVISION_CC: PIOS_USB_Init(&pios_usb_id, &pios_usb_main_cfg_cc); break; - case 0x02: // Revision 2 + case BOARD_REVISION_CC3D: PIOS_USB_Init(&pios_usb_id, &pios_usb_main_cfg_cc3d); break; default: diff --git a/flight/CopterControl/System/pios_board.c b/flight/CopterControl/System/pios_board.c index e050d3f08..2db478a07 100644 --- a/flight/CopterControl/System/pios_board.c +++ b/flight/CopterControl/System/pios_board.c @@ -165,12 +165,12 @@ void PIOS_Board_Init(void) { /* Set up the SPI interface to the serial flash */ switch(bdinfo->board_rev) { - case 0x01: // Revision 1 + case BOARD_REVISION_CC: if (PIOS_SPI_Init(&pios_spi_flash_accel_id, &pios_spi_flash_accel_cfg_cc)) { PIOS_Assert(0); } break; - case 0x02: // Revision 2 + case BOARD_REVISION_CC3D: if (PIOS_SPI_Init(&pios_spi_flash_accel_id, &pios_spi_flash_accel_cfg_cc3d)) { PIOS_Assert(0); } @@ -182,11 +182,11 @@ void PIOS_Board_Init(void) { #endif switch(bdinfo->board_rev) { - case 0x01: // Revision 1 + case BOARD_REVISION_CC: PIOS_Flash_Jedec_Init(pios_spi_flash_accel_id, 1, &flash_w25x_cfg); PIOS_FLASHFS_Init(&flashfs_w25x_cfg); break; - case 0x02: // Revision 2 + case BOARD_REVISION_CC3D: PIOS_Flash_Jedec_Init(pios_spi_flash_accel_id, 0, &flash_m25p_cfg); PIOS_FLASHFS_Init(&flashfs_m25p_cfg); break; @@ -259,10 +259,10 @@ void PIOS_Board_Init(void) { uint32_t pios_usb_id; switch(bdinfo->board_rev) { - case 0x01: // Revision 1 + case BOARD_REVISION_CC: PIOS_USB_Init(&pios_usb_id, &pios_usb_main_cfg_cc); break; - case 0x02: // Revision 2 + case BOARD_REVISION_CC3D: PIOS_USB_Init(&pios_usb_id, &pios_usb_main_cfg_cc3d); break; default: @@ -682,7 +682,7 @@ void PIOS_Board_Init(void) { #endif /* PIOS_DEBUG_ENABLE_DEBUG_PINS */ switch(bdinfo->board_rev) { - case 0x01: + case BOARD_REVISION_CC: // Revision 1 with invensense gyros, start the ADC #if defined(PIOS_INCLUDE_ADC) PIOS_ADC_Init(&pios_adc_cfg); @@ -691,7 +691,7 @@ void PIOS_Board_Init(void) { PIOS_ADXL345_Init(pios_spi_flash_accel_id, 0); #endif break; - case 0x02: + case BOARD_REVISION_CC3D: // Revision 2 with L3GD20 gyros, start a SPI interface and connect to it GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);