WebSVN - FlightCtrl - Diff - Rev 1799 and 1802 - /branches/v0.82a MartinW


#include <inttypes.h>
#include "main.h"
 
uint16_t LED1_Timing = 0;
uint16_t LED2_Timing = 0;
unsigned char J16Blinkcount = 0, J16Mask = 1;
unsigned char J17Blinkcount = 0, J17Mask = 1;
 
// initializes the LED control outputs J16, J17
void LED_Init(void)
{
        // set PC2 & PC3 as output (control of J16 & J17)
        DDRC |= (1<<DDC2)|(1<<DDC3);
        J16_OFF;
        J17_OFF;
        J16Blinkcount = 0; J16Mask = 128;
        J17Blinkcount = 0; J17Mask = 128;
}
 
// called in UpdateMotors() every 2ms
void LED_Update(void)
{
        static char delay = 0;
        static unsigned char J16Bitmask = 0;
        static unsigned char J17Bitmask = 0;
        static unsigned char J16Warn = 0, J17Warn = 0;
        if(!delay--)  // 10ms Intervall
        {
        delay = 4;
 
 
 
//MartinW: added        
        if(EE_Parameter.UserParam8 >0)  // 2ms Intervall ///
        {
        delay = 0;
        }
//MartinW
 
 
 
        if(FC_StatusFlags & (FC_STATUS_LOWBAT | FC_STATUS_EMERGENCY_LANDING) || (VersionInfo.HardwareError[1] & FC_ERROR1_I2C))
        {
                if(EE_Parameter.WARN_J16_Bitmask)
                 {
          if(!J16Warn) J16Blinkcount = 4;
          J16Warn = 1;
                 }
                if(EE_Parameter.WARN_J17_Bitmask)
                 {
          if(!J17Warn) J17Blinkcount = 4;
          J17Warn = 1;
                 }
        }
        else
        {
        J16Warn = 0;
        J17Warn = 0;
                J16Bitmask = EE_Parameter.J16Bitmask;
                J17Bitmask = EE_Parameter.J17Bitmask;
        }
 
 if(!J16Warn)
  {
  if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}
  else
  if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;}
  else
 
   if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 10))  {if(J16Bitmask & 128) J16_OFF; else J16_ON;} //original
  //if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 2))  {if(J16Bitmask & 128) J16_OFF; else J16_ON;} // MartinW; um die LEDs so schnell wie möglich blinken zu lassen, bei <10 reagiert gar nicht mehr, bei mir ist "2" i.o.
 
  else
  if(!J16Blinkcount--)
   {
     J16Blinkcount = Parameter_J16Timing-1;
     if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
     if(J16Mask & J16Bitmask) J16_ON; else J16_OFF;
   }
  }
  else
  if(!J16Blinkcount--)
   {
     J16Blinkcount = 10-1;
     if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
     if(J16Mask & EE_Parameter.WARN_J16_Bitmask) J16_ON; else J16_OFF;
   }
 
 if(!J17Warn)
  {
  if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}
  else
  if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_ON; else J17_OFF;}
  else
  if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing < 10))  {if(J17Bitmask & 128) J17_OFF; else J17_ON;}
  else
  if(!J17Blinkcount--)
   {
     J17Blinkcount = Parameter_J17Timing-1;
     if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
     if(J17Mask & J17Bitmask) J17_ON; else J17_OFF;
   }
  }
  else
  if(!J17Blinkcount--)
   {
     J17Blinkcount = 10-1;
     if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
     if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF;
   }
 }
}
 
 

Rev 1799	Rev 1802
1	#include <inttypes.h>	1	#include <inttypes.h>
2	#include "main.h"	2	#include "main.h"
3		3
4	uint16_t LED1_Timing = 0;	4	uint16_t LED1_Timing = 0;
5	uint16_t LED2_Timing = 0;	5	uint16_t LED2_Timing = 0;
6	unsigned char J16Blinkcount = 0, J16Mask = 1;	6	unsigned char J16Blinkcount = 0, J16Mask = 1;
7	unsigned char J17Blinkcount = 0, J17Mask = 1;	7	unsigned char J17Blinkcount = 0, J17Mask = 1;
8		8
9	// initializes the LED control outputs J16, J17	9	// initializes the LED control outputs J16, J17
10	void LED_Init(void)	10	void LED_Init(void)
11	{	11	{
12	// set PC2 & PC3 as output (control of J16 & J17)	12	// set PC2 & PC3 as output (control of J16 & J17)
13	DDRC \|= (1<<DDC2)\|(1<<DDC3);	13	DDRC \|= (1<<DDC2)\|(1<<DDC3);
14	J16_OFF;	14	J16_OFF;
15	J17_OFF;	15	J17_OFF;
16	J16Blinkcount = 0; J16Mask = 128;	16	J16Blinkcount = 0; J16Mask = 128;
17	J17Blinkcount = 0; J17Mask = 128;	17	J17Blinkcount = 0; J17Mask = 128;
18	}	18	}
19		19
20	// called in UpdateMotors() every 2ms	20	// called in UpdateMotors() every 2ms
21	void LED_Update(void)	21	void LED_Update(void)
22	{	22	{
23	static char delay = 0;	23	static char delay = 0;
24	static unsigned char J16Bitmask = 0;	24	static unsigned char J16Bitmask = 0;
25	static unsigned char J17Bitmask = 0;	25	static unsigned char J17Bitmask = 0;
26	static unsigned char J16Warn = 0, J17Warn = 0;	26	static unsigned char J16Warn = 0, J17Warn = 0;
27	if(!delay--) // 10ms Intervall	27	if(!delay--) // 10ms Intervall
28	{	28	{
29	delay = 4;	29	delay = 4;
30		30
31		31
32		32
33	//MartinW: added	33	//MartinW: added
34	if(EE_Parameter.UserParam8 >0) // 2ms Intervall ///	34	if(EE_Parameter.UserParam8 >0) // 2ms Intervall ///
35	{	35	{
36	delay = 0;	36	delay = 0;
37	}	37	}
38	//MartinW	38	//MartinW
39		39
40		40
41		41
42	if(FC_StatusFlags & (FC_STATUS_LOWBAT \| FC_STATUS_EMERGENCY_LANDING) \|\| (VersionInfo.HardwareError[1] & FC_ERROR1_I2C))	42	if(FC_StatusFlags & (FC_STATUS_LOWBAT \| FC_STATUS_EMERGENCY_LANDING) \|\| (VersionInfo.HardwareError[1] & FC_ERROR1_I2C))
43	{	43	{
44	if(EE_Parameter.WARN_J16_Bitmask)	44	if(EE_Parameter.WARN_J16_Bitmask)
45	{	45	{
46	if(!J16Warn) J16Blinkcount = 4;	46	if(!J16Warn) J16Blinkcount = 4;
47	J16Warn = 1;	47	J16Warn = 1;
48	}	48	}
49	if(EE_Parameter.WARN_J17_Bitmask)	49	if(EE_Parameter.WARN_J17_Bitmask)
50	{	50	{
51	if(!J17Warn) J17Blinkcount = 4;	51	if(!J17Warn) J17Blinkcount = 4;
52	J17Warn = 1;	52	J17Warn = 1;
53	}	53	}
54	}	54	}
55	else	55	else
56	{	56	{
57	J16Warn = 0;	57	J16Warn = 0;
58	J17Warn = 0;	58	J17Warn = 0;
59	J16Bitmask = EE_Parameter.J16Bitmask;	59	J16Bitmask = EE_Parameter.J16Bitmask;
60	J17Bitmask = EE_Parameter.J17Bitmask;	60	J17Bitmask = EE_Parameter.J17Bitmask;
61	}	61	}
62		62
63	if(!J16Warn)	63	if(!J16Warn)
64	{	64	{
65	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}	65	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}
66	else	66	else
67	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;}	67	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;}
68	else	68	else
-		69
69	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 10)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;}	70	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 10)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} //original
-		71	//if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 2)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} // MartinW; um die LEDs so schnell wie möglich blinken zu lassen, bei <10 reagiert gar nicht mehr, bei mir ist "2" i.o.
-		72
70	else	73	else
71	if(!J16Blinkcount--)	74	if(!J16Blinkcount--)
72	{	75	{
73	J16Blinkcount = Parameter_J16Timing-1;	76	J16Blinkcount = Parameter_J16Timing-1;
74	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;	77	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
75	if(J16Mask & J16Bitmask) J16_ON; else J16_OFF;	78	if(J16Mask & J16Bitmask) J16_ON; else J16_OFF;
76	}	79	}
77	}	80	}
78	else	81	else
79	if(!J16Blinkcount--)	82	if(!J16Blinkcount--)
80	{	83	{
81	J16Blinkcount = 10-1;	84	J16Blinkcount = 10-1;
82	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;	85	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
83	if(J16Mask & EE_Parameter.WARN_J16_Bitmask) J16_ON; else J16_OFF;	86	if(J16Mask & EE_Parameter.WARN_J16_Bitmask) J16_ON; else J16_OFF;
84	}	87	}
85		88
86	if(!J17Warn)	89	if(!J17Warn)
87	{	90	{
88	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}	91	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}
89	else	92	else
90	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_ON; else J17_OFF;}	93	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_ON; else J17_OFF;}
91	else	94	else
92	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing < 10)) {if(J17Bitmask & 128) J17_OFF; else J17_ON;}	95	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing < 10)) {if(J17Bitmask & 128) J17_OFF; else J17_ON;}
93	else	96	else
94	if(!J17Blinkcount--)	97	if(!J17Blinkcount--)
95	{	98	{
96	J17Blinkcount = Parameter_J17Timing-1;	99	J17Blinkcount = Parameter_J17Timing-1;
97	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;	100	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
98	if(J17Mask & J17Bitmask) J17_ON; else J17_OFF;	101	if(J17Mask & J17Bitmask) J17_ON; else J17_OFF;
99	}	102	}
100	}	103	}
101	else	104	else
102	if(!J17Blinkcount--)	105	if(!J17Blinkcount--)
103	{	106	{
104	J17Blinkcount = 10-1;	107	J17Blinkcount = 10-1;
105	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;	108	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
106	if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF;	109	if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF;
107	}	110	}
108	}	111	}
109	}	112	}
110		113
111		114

Subversion Repositories FlightCtrl

(root)/branches/v0.82a MartinW_Jeti+/led.c @ 2758 - Rev 1799 → 1802