From 6a82c669706c86ca5a9415f85bedd7bad44da03c Mon Sep 17 00:00:00 2001
From: Evgeny Sychov <evgeny.sychov@gmail.com>
Date: Wed, 20 Jul 2016 09:35:50 -0700
Subject: [PATCH] Add CPPM support to Sirin target, fix vtx_channel size in cli

---
 src/main/io/serial_cli.c           |  2 +-
 src/main/target/SIRINFPV/target.c  | 21 +++++++++++----------
 src/main/target/SIRINFPV/target.h  |  4 ++--
 src/main/target/SIRINFPV/target.mk |  1 -
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 1ca39c469..fccab2747 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -824,7 +824,7 @@ const clivalue_t valueTable[] = {
     { "ledstrip_visual_beeper",      VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP,  &masterConfig.ledstrip_visual_beeper, .config.lookup = { TABLE_OFF_ON } },
 #endif
 #ifdef USE_RTC6705
-    { "vtx_channel",                VAR_INT16  | MASTER_VALUE, &masterConfig.vtx_channel, .config.minmax = { 0,  39 } },
+    { "vtx_channel",                VAR_UINT8  | MASTER_VALUE, &masterConfig.vtx_channel, .config.minmax = { 0,  39 } },
     { "vtx_power",                  VAR_UINT8  | MASTER_VALUE, &masterConfig.vtx_power,   .config.minmax = { 0,  1 } },
 #endif
 #ifdef OSD
diff --git a/src/main/target/SIRINFPV/target.c b/src/main/target/SIRINFPV/target.c
index 0630b527d..b52fbd00e 100644
--- a/src/main/target/SIRINFPV/target.c
+++ b/src/main/target/SIRINFPV/target.c
@@ -22,7 +22,7 @@
 #include "drivers/pwm_mapping.h"
 
 const uint16_t multiPPM[] = {
-    // No PPM
+    PWM7  | (MAP_TO_PPM_INPUT << 8),
     PWM1  | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM2  | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM3  | (MAP_TO_MOTOR_OUTPUT << 8),
@@ -43,21 +43,21 @@ const uint16_t multiPWM[] = {
 };
 
 const uint16_t airPPM[] = {
-    // No PPM
-    PWM1  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM2  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM3  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM4  | (MAP_TO_MOTOR_OUTPUT << 8),
+    PWM7  | (MAP_TO_PPM_INPUT << 8),
+    PWM1  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM2  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM3  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM4  | (MAP_TO_SERVO_OUTPUT << 8),
     PWM5  | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM6  | (MAP_TO_MOTOR_OUTPUT << 8),
     0xFFFF
 };
 
 const uint16_t airPWM[] = {
-    PWM1  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM2  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM3  | (MAP_TO_MOTOR_OUTPUT << 8),
-    PWM4  | (MAP_TO_MOTOR_OUTPUT << 8),
+    PWM1  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM2  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM3  | (MAP_TO_SERVO_OUTPUT << 8),
+    PWM4  | (MAP_TO_SERVO_OUTPUT << 8),
     PWM5  | (MAP_TO_MOTOR_OUTPUT << 8),
     PWM6  | (MAP_TO_MOTOR_OUTPUT << 8),
     0xFFFF
@@ -73,6 +73,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM3,  IO_TAG(PB0), TIM_Channel_3, TIM3_IRQn,               1, IOCFG_AF_PP, GPIO_AF_2 }, // PWM5 - PB0  - *TIM3_CH3
     { TIM3,  IO_TAG(PB1), TIM_Channel_4, TIM3_IRQn,               1, IOCFG_AF_PP, GPIO_AF_2 }, // PWM6 - PB1  - *TIM3_CH4
 
+    { TIM2,  IO_TAG(PB11), TIM_Channel_4, TIM2_IRQn,              0, IOCFG_AF_PP, GPIO_AF_1 }, // RC_CH3 - PB11 - *TIM2_CH4, USART3_RX (AF7)y
 };
 
 
diff --git a/src/main/target/SIRINFPV/target.h b/src/main/target/SIRINFPV/target.h
index 0b2ca5f96..1632d2046 100644
--- a/src/main/target/SIRINFPV/target.h
+++ b/src/main/target/SIRINFPV/target.h
@@ -149,8 +149,8 @@
 #define TARGET_IO_PORTC         (BIT(13)|BIT(14)|BIT(15))
 #define TARGET_IO_PORTF         (BIT(0)|BIT(1)|BIT(3)|BIT(4))
 
-#define USABLE_TIMER_CHANNEL_COUNT 6
-#define USED_TIMERS             (TIM_N(3) | TIM_N(4))
+#define USABLE_TIMER_CHANNEL_COUNT 7
+#define USED_TIMERS             (TIM_N(2) | TIM_N(3) | TIM_N(4))
 #define TIMER_APB1_PERIPHERALS  (RCC_APB1Periph_TIM3 | RCC_APB1Periph_TIM4)
 #define TIMER_AHB_PERIPHERALS   (RCC_AHBPeriph_GPIOB)
 
diff --git a/src/main/target/SIRINFPV/target.mk b/src/main/target/SIRINFPV/target.mk
index 945fb1fe9..19cc56e95 100644
--- a/src/main/target/SIRINFPV/target.mk
+++ b/src/main/target/SIRINFPV/target.mk
@@ -15,4 +15,3 @@ TARGET_SRC = \
             drivers/vtx_soft_spi_rtc6705.c \
             drivers/max7456.c \
             io/osd.c
-