WebSVN - FlightCtrl - Path Comparison - /branches/V0.69k_J16J17 Rev 894 and /branches/V0.69k

Ignore whitespace Rev 894 → Rev 895

 /branches/V0.69k_J16J17/fc.c
 ,7 → 630,13
 */
     GyroFaktor     = ((float)Parameter_Gyro_P + 10.0) / (256.0/STICK_GAIN);
     IntegralFaktor = ((float) Parameter_Gyro_I) / (44000 / STICK_GAIN);
+// [Harrie:] switch output J16 (PortC output2 on ATMEGA):
+   if(PPM_in[EE_Parameter.Kanalbelegung[K_POTI2]] > 75) J16_ON; else J16_OFF;
+// [Harrie:] switch output J17 (PortC output3 on ATMEGA) (PC3 output on ATMEGA):
+   if(PPM_in[EE_Parameter.Kanalbelegung[K_POTI3]] > 75) J17_ON; else J17_OFF;
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 //+ Digitale Steuerung per DubWise
 //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

 /branches/V0.69k_J16J17/main.c
 ,7 → 116,7
     PORTB = 0x00;
     for(timer = 0; timer < 1000; timer++); // verzögern
     if(PINB & 0x01) PlatinenVersion = 11; else PlatinenVersion = 10;
-    DDRC  = 0x81; // SCL
+    DDRC  = 0x8D; // SCL
     PORTC = 0xff; // Pullup SDA
     DDRB  = 0x1B; // LEDs und Druckoffset
     PORTB = 0x01; // LED_Rot

 /branches/V0.69k_J16J17/main.h
 ,6 → 18,11
 #define GRN_OFF   PORTB &=~0x02
 #define GRN_ON    PORTB |= 0x02
 #define GRN_FLASH PORTB ^= 0x02
+// [Harrie:] define J16 and J17:
+#define J16_ON   PORTC |= 0x04
+#define J16_OFF  PORTC &=~0x04
+#define J17_ON   PORTC |= 0x08
+#define J17_OFF  PORTC &=~0x08
 #define F_CPU SYSCLK
 //#ifndef F_CPU