rp2040 better support multiple boards
This commit is contained in:
parent
b8847de802
commit
a780a8762b
|
@ -20,15 +20,16 @@ pico_sdk_init()
|
||||||
|
|
||||||
add_executable(${PROJECT})
|
add_executable(${PROJECT})
|
||||||
|
|
||||||
target_sources(${PROJECT} PRIVATE
|
target_sources(${PROJECT} PUBLIC
|
||||||
src/main.c
|
src/main.c
|
||||||
"${TOP}/hw/bsp/rp2040/boards/raspberry_pi_pico/board_raspberry_pi_pico.c"
|
"${TOP}/hw/bsp/${FAMILY}/family.c"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_include_directories(${PROJECT} PRIVATE
|
target_include_directories(${PROJECT} PUBLIC
|
||||||
"src/"
|
"src/"
|
||||||
"${TOP}/hw"
|
"${TOP}/hw"
|
||||||
"${TOP}/src"
|
"${TOP}/src"
|
||||||
|
"${TOP}/hw/bsp/${FAMILY}/boards/${BOARD}"
|
||||||
)
|
)
|
||||||
|
|
||||||
target_compile_definitions(${PROJECT} PUBLIC
|
target_compile_definitions(${PROJECT} PUBLIC
|
||||||
|
|
|
@ -37,7 +37,7 @@ monitor:
|
||||||
else ifeq ($(FAMILY),rp2040)
|
else ifeq ($(FAMILY),rp2040)
|
||||||
|
|
||||||
all:
|
all:
|
||||||
[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DPICO_BUILD_DOCS=0
|
[ -d $(BUILD) ] || cmake -S . -B $(BUILD) -DFAMILY=$(FAMILY) -DBOARD=$(BOARD) -DPICO_BUILD_DOCS=0
|
||||||
$(MAKE) -C $(BUILD)
|
$(MAKE) -C $(BUILD)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -0,0 +1,46 @@
|
||||||
|
/*
|
||||||
|
* The MIT License (MIT)
|
||||||
|
*
|
||||||
|
* Copyright (c) 2021, Ha Thach (tinyusb.org)
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* This file is part of the TinyUSB stack.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef BOARD_H_
|
||||||
|
#define BOARD_H_
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define LED_PIN PICO_DEFAULT_LED_PIN
|
||||||
|
#define LED_STATE_ON 1
|
||||||
|
|
||||||
|
// Button pin is BOOTSEL which is flash CS pin
|
||||||
|
|
||||||
|
#define BUTTON_BOOTSEL
|
||||||
|
#define BUTTON_STATE_ACTIVE 0
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif /* BOARD_H_ */
|
|
@ -2,6 +2,7 @@
|
||||||
* The MIT License (MIT)
|
* The MIT License (MIT)
|
||||||
*
|
*
|
||||||
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
|
* Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
|
||||||
|
* Copyright (c) 2021, Ha Thach (tinyusb.org)
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
* of this software and associated documentation files (the "Software"), to deal
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
@ -31,14 +32,9 @@
|
||||||
#include "hardware/structs/sio.h"
|
#include "hardware/structs/sio.h"
|
||||||
|
|
||||||
#include "bsp/board.h"
|
#include "bsp/board.h"
|
||||||
|
#include "board.h"
|
||||||
|
|
||||||
#define LED_PIN PICO_DEFAULT_LED_PIN
|
#ifdef BUTTON_BOOTSEL
|
||||||
#define LED_STATE_ON 1
|
|
||||||
|
|
||||||
// Button pin is BOOTSEL which is flash CS pin
|
|
||||||
// #define BUTTON_PIN
|
|
||||||
#define BUTTON_STATE_ACTIVE 0
|
|
||||||
|
|
||||||
// This example blinks the Picoboard LED when the BOOTSEL button is pressed.
|
// This example blinks the Picoboard LED when the BOOTSEL button is pressed.
|
||||||
//
|
//
|
||||||
// Picoboard has a button attached to the flash CS pin, which the bootrom
|
// Picoboard has a button attached to the flash CS pin, which the bootrom
|
||||||
|
@ -49,7 +45,6 @@
|
||||||
//
|
//
|
||||||
// This doesn't work if others are trying to access flash at the same time,
|
// This doesn't work if others are trying to access flash at the same time,
|
||||||
// e.g. XIP streamer, or the other core.
|
// e.g. XIP streamer, or the other core.
|
||||||
|
|
||||||
bool __no_inline_not_in_flash_func(get_bootsel_button)() {
|
bool __no_inline_not_in_flash_func(get_bootsel_button)() {
|
||||||
const uint CS_PIN_INDEX = 1;
|
const uint CS_PIN_INDEX = 1;
|
||||||
|
|
||||||
|
@ -79,6 +74,7 @@ bool __no_inline_not_in_flash_func(get_bootsel_button)() {
|
||||||
|
|
||||||
return button_state;
|
return button_state;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
void board_init(void)
|
void board_init(void)
|
||||||
{
|
{
|
||||||
|
@ -123,7 +119,11 @@ void board_led_write(bool state)
|
||||||
|
|
||||||
uint32_t board_button_read(void)
|
uint32_t board_button_read(void)
|
||||||
{
|
{
|
||||||
|
#ifdef BUTTON_BOOTSEL
|
||||||
return BUTTON_STATE_ACTIVE == get_bootsel_button();
|
return BUTTON_STATE_ACTIVE == get_bootsel_button();
|
||||||
|
#else
|
||||||
|
return 0;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
int board_uart_read(uint8_t* buf, int len)
|
int board_uart_read(uint8_t* buf, int len)
|
Loading…
Reference in New Issue