Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-21 15:25:36 +03:00
Code Issues Wiki Activity

Merge branch 'master' into RP2350

Browse source 
# Conflicts:
#	lib/main/tinyUSB/hw/bsp/espressif/components/led_strip/LICENSE
#	lib/main/tinyUSB/hw/bsp/samd11/boards/cynthion_d11/board.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/cmsis_compiler.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/cmsis_gcc.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/cmsis_version.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/core_cm0.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/core_cm33.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/mpu_armv8.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/system_ARMCM0.h
#	lib/main/tinyUSB/hw/mcu/dialog/da1469x/SDK_10.0.8.105/sdk/bsp/include/system_DA1469x.h
#	lib/main/tinyUSB/lib/SEGGER_RTT/Config/SEGGER_RTT_Conf.h
#	lib/main/tinyUSB/lib/SEGGER_RTT/RTT/SEGGER_RTT.c
#	lib/main/tinyUSB/lib/SEGGER_RTT/RTT/SEGGER_RTT.h
#	src/platform/PICO/pico/platform.h
#	src/platform/PICO/pico/version.h
#	src/platform/PICO/usb/usb_cdc.c
#	src/platform/PICO/usb/usb_descriptors.c
This commit is contained in:
blckmn 2025-05-29 16:15:35 +10:00
commit d87b99c7c8
48 changed files with 1746 additions and 10869 deletions
Download patch file Download diff file Expand all files Collapse all files

52
lib/main/tinyUSB/hw/bsp/samd11/boards/cynthion_d11/board.h
View file

@ -1,52 +0,0 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2020, 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
// LED
#define LED_PIN PIN_PA27 // pin PA22
#define LED_STATE_ON 0
// Button
#if ((_BOARD_REVISION_MAJOR_ == 0) && (_BOARD_REVISION_MINOR_ < 6))
#define BUTTON_PIN PIN_PA16 // pin PB22
#define BUTTON_PULL_MODE GPIO_PULL_UP
#else
#define BUTTON_PIN PIN_PA02
#define BUTTON_PULL_MODE GPIO_PULL_OFF
#endif
#define BUTTON_STATE_ACTIVE 0
#ifdef __cplusplus
}
#endif
#endif /* BOARD_H_ */