From 98f8a4d59e1e951ca773e9931ca1b6e2f693cde1 Mon Sep 17 00:00:00 2001 From: borisbstyle Date: Mon, 30 Jan 2017 17:01:54 +0100 Subject: [PATCH] Add KISSCC (KISSFC alias) --- src/main/target/KISSFC/KISSCC.mk | 0 src/main/target/KISSFC/target.c | 14 ++++++++++++++ src/main/target/KISSFC/target.h | 20 ++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100755 src/main/target/KISSFC/KISSCC.mk diff --git a/src/main/target/KISSFC/KISSCC.mk b/src/main/target/KISSFC/KISSCC.mk new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/main/target/KISSFC/target.c b/src/main/target/KISSFC/target.c index a48fc93a02..0832a99000 100644 --- a/src/main/target/KISSFC/target.c +++ b/src/main/target/KISSFC/target.c @@ -25,6 +25,19 @@ #include "drivers/dma.h" const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { +#ifdef KISSCC + DEF_TIM(TIM1, CH2N,PB14, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM8, CH2N,PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM15,CH1N,PB15, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED | TIMER_OUTPUT_INVERTED), + DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), + DEF_TIM(TIM3, CH1, PA6, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), + DEF_TIM(TIM17,CH1, PA7, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), + DEF_TIM(TIM2, CH2, PB3, TIM_USE_PWM | TIM_USE_PPM, TIMER_INPUT_ENABLED), + DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, TIMER_INPUT_ENABLED), + DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, TIMER_INPUT_ENABLED), + DEF_TIM(TIM2, CH4, PB11, TIM_USE_PWM, TIMER_INPUT_ENABLED), + DEF_TIM(TIM16,CH1N,PA13, TIM_USE_PWM, TIMER_INPUT_ENABLED), // KISSCC new softserial? +#else DEF_TIM(TIM1, CH2N,PB14, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), DEF_TIM(TIM8, CH2N,PB0, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), DEF_TIM(TIM15,CH1N,PB15, TIM_USE_MOTOR, TIMER_OUTPUT_ENABLED), @@ -35,4 +48,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM2, CH1, PA15, TIM_USE_PWM, TIMER_INPUT_ENABLED), DEF_TIM(TIM2, CH3, PA2, TIM_USE_PWM, TIMER_INPUT_ENABLED), DEF_TIM(TIM2, CH4, PB11, TIM_USE_PWM, TIMER_INPUT_ENABLED), +#endif }; diff --git a/src/main/target/KISSFC/target.h b/src/main/target/KISSFC/target.h index 90e32cf6df..4960cb30e1 100644 --- a/src/main/target/KISSFC/target.h +++ b/src/main/target/KISSFC/target.h @@ -47,11 +47,17 @@ #define USE_ACC_MPU6050 #define ACC_MPU6050_ALIGN CW180_DEG +#define USE_SOFTSERIAL #define USE_VCP #define USE_UART1 #define USE_UART2 #define USE_UART3 +#ifdef KISSCC +#define USE_SOFTSERIAL1 +#define SERIAL_PORT_COUNT 5 +#else #define SERIAL_PORT_COUNT 4 +#endif #define UART1_TX_PIN PA9 #define UART1_RX_PIN PA10 @@ -62,6 +68,12 @@ #define UART3_TX_PIN PB10 // PB10 (AF7) #define UART3_RX_PIN PB11 // PB11 (AF7) +#ifdef KISSCC +#define SOFTSERIAL_1_TIMER TIM16 +#define SOFTSERIAL_1_TIMER_RX_HARDWARE 11 +#define SOFTSERIAL_1_TIMER_TX_HARDWARE 11 +#endif + #define USE_I2C #define I2C_DEVICE (I2CDEV_1) // PB6/SCL, PB7/SDA @@ -72,7 +84,11 @@ //#define CURRENT_METER_ADC_PIN PA5 //#define RSSI_ADC_PIN PB2 +#ifdef KISSCC +#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_SOFTSERIAL | FEATURE_TELEMETRY) +#else #define DEFAULT_FEATURES FEATURE_VBAT +#endif #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART2 @@ -88,5 +104,9 @@ #define TARGET_IO_PORTD 0xffff #define TARGET_IO_PORTF (BIT(4)) +#ifdef KISSCC +#define USABLE_TIMER_CHANNEL_COUNT 11 +#else #define USABLE_TIMER_CHANNEL_COUNT 10 +#endif #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) | TIM_N(15) | TIM_N(16) | TIM_N(17))