From 61083874a72f632c4c60a1bc3b093fc166370cde Mon Sep 17 00:00:00 2001 From: "Pawel Spychalski (DzikuVx)" Date: Mon, 21 Sep 2020 14:49:29 +0200 Subject: [PATCH 1/2] First cut on KakuteF7 Mini V3 --- src/main/target/KAKUTEF7MINIV3/CMakeLists.txt | 1 + src/main/target/KAKUTEF7MINIV3/target.c | 44 +++++ src/main/target/KAKUTEF7MINIV3/target.h | 175 ++++++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 src/main/target/KAKUTEF7MINIV3/CMakeLists.txt create mode 100644 src/main/target/KAKUTEF7MINIV3/target.c create mode 100644 src/main/target/KAKUTEF7MINIV3/target.h diff --git a/src/main/target/KAKUTEF7MINIV3/CMakeLists.txt b/src/main/target/KAKUTEF7MINIV3/CMakeLists.txt new file mode 100644 index 00000000000..edef8c9c0d2 --- /dev/null +++ b/src/main/target/KAKUTEF7MINIV3/CMakeLists.txt @@ -0,0 +1 @@ +target_stm32f722xe(KAKUTEF7MINIV3) diff --git a/src/main/target/KAKUTEF7MINIV3/target.c b/src/main/target/KAKUTEF7MINIV3/target.c new file mode 100644 index 00000000000..445b0a658a7 --- /dev/null +++ b/src/main/target/KAKUTEF7MINIV3/target.c @@ -0,0 +1,44 @@ +/* + * This file is part of INAV Project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU General Public License Version 3, as described below: + * + * This file is free software: you may copy, redistribute and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ + +#include +#include +#include "drivers/io.h" +#include "drivers/bus.h" +#include "drivers/timer.h" +#include "drivers/sensor.h" +#include "drivers/pwm_mapping.h" + +const timerHardware_t timerHardware[] = { + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S1 + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S2 + DEF_TIM(TIM3, CH1, PB4, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S3 + DEF_TIM(TIM3, CH2, PB5, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S4 + DEF_TIM(TIM4, CH1, PB6, TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S5 + DEF_TIM(TIM4, CH2, PB7, TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6 + DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0, 0), // LED STRIP + DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // RX2 +}; + +const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]); \ No newline at end of file diff --git a/src/main/target/KAKUTEF7MINIV3/target.h b/src/main/target/KAKUTEF7MINIV3/target.h new file mode 100644 index 00000000000..a32f9655c92 --- /dev/null +++ b/src/main/target/KAKUTEF7MINIV3/target.h @@ -0,0 +1,175 @@ +/* + * This file is part of INAV Project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Alternatively, the contents of this file may be used under the terms + * of the GNU General Public License Version 3, as described below: + * + * This file is free software: you may copy, redistribute and/or modify + * it under the terms of the GNU General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/. + */ + +#pragma once + +#define TARGET_BOARD_IDENTIFIER "K7M3" +#define USBD_PRODUCT_STRING "KakuteF7-Mini-V3" + +#define LED0 PD2 +#define BEEPER PC8 +#define BEEPER_INVERTED + +/* + * Buses + */ +#define USE_SPI +#define USE_SPI_DEVICE_1 +#define SPI1_SCK_PIN PA5 +#define SPI1_MISO_PIN PA6 +#define SPI1_MOSI_PIN PA7 + +#define USE_SPI_DEVICE_2 +#define SPI2_SCK_PIN PB13 +#define SPI2_MISO_PIN PB14 +#define SPI2_MOSI_PIN PB15 + +#define USE_SPI_DEVICE_3 +#define SPI3_SCK_PIN PC10 +#define SPI3_MISO_PIN PC11 +#define SPI3_MOSI_PIN PC12 + +#define USE_I2C +#define USE_I2C_DEVICE_1 +#define I2C1_SCL PB8 +#define I2C1_SDA PB9 + +/* + * Serial Ports + */ +#define USE_VCP + +#define USE_UART1 +#define UART1_TX_PIN PA9 +#define UART1_RX_PIN PA10 + +#define USE_UART2 +#define UART2_TX_PIN PA2 +#define UART2_RX_PIN PA3 + +#define USE_UART3 +#define UART3_TX_PIN PB10 +#define UART3_RX_PIN PB11 + +#define USE_UART4 +#define UART4_TX_PIN PA0 +#define UART4_RX_PIN PA1 + +#define USE_UART6 +#define UART6_TX_PIN PC6 +#define UART6_RX_PIN PC7 + +#define SERIAL_PORT_COUNT 6 + +/* + * Gyro + */ +#define USE_EXTI +#define USE_MPU_DATA_READY_SIGNAL + +// MPU6000 +#define USE_IMU_MPU6000 +#define IMU_MPU6000_ALIGN CW270_DEG +#define MPU6000_SPI_BUS BUS_SPI1 +#define MPU6000_EXTI_PIN PA4 +#define MPU6000_CS_PIN PB2 + +/* + * Blackbox Onboard Flash + */ +#define USE_FLASHFS +#define USE_FLASH_M25P16 +#define M25P16_CS_PIN PB12 +#define M25P16_SPI_BUS BUS_SPI2 + +/* + * OSD + */ +#define USE_OSD +#define USE_MAX7456 +#define MAX7456_SPI_BUS BUS_SPI3 +#define MAX7456_CS_PIN PA15 + +/* + * Baro + */ +#define USE_BARO +#define BARO_I2C_BUS BUS_I2C1 +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 + +/* + * Mag + */ +#define USE_MAG +#define MAG_I2C_BUS BUS_I2C1 +#define USE_MAG_HMC5883 +#define USE_MAG_QMC5883 +#define USE_MAG_IST8310 +#define USE_MAG_MAG3110 +#define USE_MAG_LIS3MDL + +/* + * ADC + */ +#define USE_ADC +#define ADC_CHANNEL_1_PIN PC0 +#define ADC_CHANNEL_2_PIN PC1 +#define ADC_CHANNEL_3_PIN PC2 + +#define VBAT_ADC_CHANNEL ADC_CHN_1 +#define CURRENT_METER_ADC_CHANNEL ADC_CHN_2 +#define RSSI_ADC_CHANNEL ADC_CHN_3 + +/* + * LED Strip + */ +#define USE_LED_STRIP +#define WS2811_PIN PA8 + +/* + * Defaults + */ +#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT +#define SERIALRX_UART SERIAL_PORT_USART1 +#define DEFAULT_RX_TYPE RX_TYPE_SERIAL +#define SERIALRX_PROVIDER SERIALRX_SBUS +#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_VBAT | FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX) + +#define USE_SERIAL_4WAY_BLHELI_INTERFACE +#define MAX_PWM_OUTPUT_PORTS 6 +#define USE_DSHOT +#define USE_ESC_SENSOR +#define USE_SERIALSHOT + +#define USE_RANGEFINDER +#define RANGEFINDER_I2C_BUS BUS_I2C1 +#define TEMPERATURE_I2C_BUS BUS_I2C1 +#define PITOT_I2C_BUS BUS_I2C1 + +/*** Used pins ***/ +#define TARGET_IO_PORTA 0xffff +#define TARGET_IO_PORTB 0xffff +#define TARGET_IO_PORTC 0xffff +#define TARGET_IO_PORTD (BIT(2)) \ No newline at end of file From fbd8d426a795d4a05eab2bf7e195a52f2aea9d1f Mon Sep 17 00:00:00 2001 From: stronnag Date: Mon, 28 Sep 2020 15:07:45 +0100 Subject: [PATCH 2/2] [DOC] clarify usage of serial bit id and values (#6160) --- docs/Cli.md | 60 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/docs/Cli.md b/docs/Cli.md index ecc4ce4f3e6..6489d967a7a 100644 --- a/docs/Cli.md +++ b/docs/Cli.md @@ -95,31 +95,41 @@ After restoring it's always a good idea to `dump` or `diff` the settings once ag ### serial -The syntax of the `serial` command is `serial `. - -A shorter form is also supported to enable and disable functions using `serial +n` and -`serial -n`, where n is the a serial function identifier. The following values are available: - -| Function | Identifier | -|-----------------------|---------------| -| MSP | 0 | -| GPS | 1 | -| TELEMETRY_FRSKY | 2 | -| TELEMETRY_HOTT | 3 | -| TELEMETRY_LTM | 4 | -| TELEMETRY_SMARTPORT | 5 | -| RX_SERIAL | 6 | -| BLACKBOX | 7 | -| TELEMETRY_MAVLINK | 8 | -| TELEMETRY_IBUS | 9 | -| RCDEVICE | 10 | -| VTX_SMARTAUDIO | 11 | -| VTX_TRAMP | 12 | -| UAV_INTERCONNECT | 13 | -| OPTICAL_FLOW | 14 | -| LOG | 15 | -| RANGEFINDER | 16 | -| VTX_FFPV | 17 | +The syntax of the `serial` command is `serial `. + +A shorter form is also supported to enable and disable a single function using `serial +n` and `serial -n`, where n is the a serial function identifier. The following values are available: + +| Function | Bit Identifier | Numeric value | +|-----------------------|---------------|----------------| +| MSP | 0 | 1 | +| GPS | 1 | 2 | +| TELEMETRY_FRSKY | 2 | 4 | +| TELEMETRY_HOTT | 3 | 8 | +| TELEMETRY_LTM | 4 | 16 | +| TELEMETRY_SMARTPORT | 5 | 32 | +| RX_SERIAL | 6 | 64 | +| BLACKBOX | 7 | 128 | +| TELEMETRY_MAVLINK | 8 | 256 | +| TELEMETRY_IBUS | 9 | 512 | +| RCDEVICE | 10 | 1024 | +| VTX_SMARTAUDIO | 11 | 2048 | +| VTX_TRAMP | 12 | 4096 | +| UAV_INTERCONNECT | 13 | 8192 | +| OPTICAL_FLOW | 14 | 16384 | +| LOG | 15 | 32768 | +| RANGEFINDER | 16 | 65536 | +| VTX_FFPV | 17 | 131072 | + +Thus, to enable MSP and LTM on a port, one would use the function **value** of 17 (1 << 0)+(1<<4), aka 1+16, aka 17. + +``` +serial 0 17 57600 57600 57600 57600 +``` +but to remove LTM using the +/- shorthand, use the **bit Id** (4, TELEMETRY_LTM): + +``` +serial 0 -4 +``` `serial` can also be used without any argument to print the current configuration of all the serial ports.