Targets to compile

Removed features to get targets compile: NAZE: removed LEDSTRIP SPRACINGF3EVO; removed TRANSPONDER BETAFLIGHTF3: removed ESC telemetry CC3D OPBL: removed completely MICROSCISKY: removed completely FURYF3: removed sonar and ESC telemetry SPRACINGF3MINI: removed ESC telemetry STM32F3DISCOVERY: removed SONAR CJMCU: removed target FURYF3: disabled SONAR and ESC telemetry
lkaino · Apr 9, 2017 · 9baa809 · 9baa809
1 parent bf500bf
commit 9baa809
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 479 deletions.
diff --git a/src/main/flight/mixer_tricopter.c b/src/main/flight/mixer_tricopter.c
@@ -619,7 +619,7 @@ static void tailTuneModeServoSetup(struct servoSetup_t *pSS, servoParam_t *pServ
                     *pSS->cal.avg.pCalibConfig = pSS->cal.avg.sum / pSS->cal.avg.numOf;
                     pSS->cal.done = true;
                 } else {
-                    pSS->cal.avg.sum += tailServo.ADC;
+                    pSS->cal.avg.sum += tailServo.ADCRaw;
                     pSS->cal.avg.numOf++;
                 }
             }
@@ -628,7 +628,7 @@ static void tailTuneModeServoSetup(struct servoSetup_t *pSS, servoParam_t *pServ
             switch (pSS->cal.subState) {
             case SS_C_MIN:
                 // Wait for the servo to reach min position
-                if (tailServo.ADC < (gpTriMixerConfig->tri_servo_min_adc + 10)) {
+                if (tailServo.ADCRaw < (gpTriMixerConfig->tri_servo_min_adc + 10)) {
                     if (!pSS->cal.waitingServoToStop) {
                         pSS->cal.avg.sum += GetCurrentDelay_ms(pSS->cal.timestamp_ms);
                         pSS->cal.avg.numOf++;
@@ -656,7 +656,7 @@ static void tailTuneModeServoSetup(struct servoSetup_t *pSS, servoParam_t *pServ
                 break;
             case SS_C_MAX:
                 // Wait for the servo to reach max position
-                if (tailServo.ADC > (gpTriMixerConfig->tri_servo_max_adc - 10)) {
+                if (tailServo.ADCRaw > (gpTriMixerConfig->tri_servo_max_adc - 10)) {
                     if (!pSS->cal.waitingServoToStop) {
                         pSS->cal.avg.sum += GetCurrentDelay_ms(pSS->cal.timestamp_ms);
                         pSS->cal.avg.numOf++;
@@ -687,9 +687,9 @@ static void updateServoAngle(float dT)
     } else {
         static pt1Filter_t feedbackFilter;
         // Read new servo feedback signal sample and run it through filter
-        const uint16_t ADC = pt1FilterApply4(&feedbackFilter, adcGetChannel(tailServo.ADCChannel), 70, dT);
-        tailServo.angle = feedbackServoStep(gpTriMixerConfig, ADC);
-        tailServo.ADC = ADC;
+        const uint16_t ADCRaw = pt1FilterApply4(&feedbackFilter, adcGetChannel(tailServo.ADCChannel), 70, dT);
+        tailServo.angle = feedbackServoStep(gpTriMixerConfig, ADCRaw);
+        tailServo.ADCRaw = ADCRaw;
     }
 }
 

diff --git a/src/main/flight/mixer_tricopter.h b/src/main/flight/mixer_tricopter.h
@@ -166,7 +166,7 @@ typedef struct tailServo_s {
     uint16_t angleAtMin;
     uint16_t angleAtMax;
     uint16_t angle; //!< Current measured angle
-    uint16_t ADC;
+    uint16_t ADCRaw;
     _Bool saturated;
     uint8_t saturationRange; //!< Servo angle range around setpoint where servo is not saturated (one direction)
 } tailServo_t;

diff --git a/src/main/target/BETAFLIGHTF3/target.h b/src/main/target/BETAFLIGHTF3/target.h
@@ -60,8 +60,8 @@
 
 #define SERIAL_PORT_COUNT       6
 
-#define USE_ESCSERIAL
-#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
+//#define USE_ESCSERIAL
+//#define ESCSERIAL_TIMER_TX_HARDWARE 0 // PWM 1
 
 #define UART1_TX_PIN            PA9
 #define UART1_RX_PIN            PA10

diff --git a/src/main/target/CC3D/CC3D_OPBL.mk b/src/main/target/CC3D/CC3D_OPBL.mk
diff --git a/src/main/target/CJMCU/hardware_revision.c b/src/main/target/CJMCU/hardware_revision.c
diff --git a/src/main/target/CJMCU/hardware_revision.h b/src/main/target/CJMCU/hardware_revision.h
diff --git a/src/main/target/CJMCU/initialisation.c b/src/main/target/CJMCU/initialisation.c
diff --git a/src/main/target/CJMCU/target.c b/src/main/target/CJMCU/target.c
diff --git a/src/main/target/CJMCU/target.h b/src/main/target/CJMCU/target.h
diff --git a/src/main/target/CJMCU/target.mk b/src/main/target/CJMCU/target.mk