WebSVN - FlightCtrl - Diff - Rev 1739 and 1756 - /branches/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;
       
       
        if(EE_Parameter.UserParam8 >0)  // 2ms Intervall ///
        {
        delay = 0;
        }
 
 
 
        if(FCFlags & (FCFLAG_LOWBAT | FCFLAG_NOTLANDUNG | FCFLAG_I2CERR))
        {
                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;} //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 1739	Rev 1756
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
-		31
-		32	if(EE_Parameter.UserParam8 >0) // 2ms Intervall ///
-		33	{
-		34	delay = 0;
-		35	}
-		36
-		37
30		38
31	if(FCFlags & (FCFLAG_LOWBAT \| FCFLAG_NOTLANDUNG \| FCFLAG_I2CERR))	39	if(FCFlags & (FCFLAG_LOWBAT \| FCFLAG_NOTLANDUNG \| FCFLAG_I2CERR))
32	{	40	{
33	if(EE_Parameter.WARN_J16_Bitmask)	41	if(EE_Parameter.WARN_J16_Bitmask)
34	{	42	{
35	if(!J16Warn) J16Blinkcount = 4;	43	if(!J16Warn) J16Blinkcount = 4;
36	J16Warn = 1;	44	J16Warn = 1;
37	}	45	}
38	if(EE_Parameter.WARN_J17_Bitmask)	46	if(EE_Parameter.WARN_J17_Bitmask)
39	{	47	{
40	if(!J17Warn) J17Blinkcount = 4;	48	if(!J17Warn) J17Blinkcount = 4;
41	J17Warn = 1;	49	J17Warn = 1;
42	}	50	}
43	}	51	}
44	else	52	else
45	{	53	{
46	J16Warn = 0;	54	J16Warn = 0;
47	J17Warn = 0;	55	J17Warn = 0;
48	J16Bitmask = EE_Parameter.J16Bitmask;	56	J16Bitmask = EE_Parameter.J16Bitmask;
49	J17Bitmask = EE_Parameter.J17Bitmask;	57	J17Bitmask = EE_Parameter.J17Bitmask;
50	}	58	}
51		59
52	if(!J16Warn)	60	if(!J16Warn)
53	{	61	{
54	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}	62	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}
55	else	63	else
56	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;}	64	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_ON; else J16_OFF;}
57	else	65	else
58	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 10)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;}	66	//if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 10)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} //original
-		67	if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing < 2)) {if(J16Bitmask & 128) J16_OFF; else J16_ON;} //bei <10 reagiert gar nicht mehr, bei mir ist "2" i.o.
59	else	68	else
60	if(!J16Blinkcount--)	69	if(!J16Blinkcount--)
61	{	70	{
62	J16Blinkcount = Parameter_J16Timing-1;	71	J16Blinkcount = Parameter_J16Timing-1;
63	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;	72	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
64	if(J16Mask & J16Bitmask) J16_ON; else J16_OFF;	73	if(J16Mask & J16Bitmask) J16_ON; else J16_OFF;
65	}	74	}
66	}	75	}
67	else	76	else
68	if(!J16Blinkcount--)	77	if(!J16Blinkcount--)
69	{	78	{
70	J16Blinkcount = 10-1;	79	J16Blinkcount = 10-1;
71	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;	80	if(J16Mask == 1) J16Mask = 128; else J16Mask /= 2;
72	if(J16Mask & EE_Parameter.WARN_J16_Bitmask) J16_ON; else J16_OFF;	81	if(J16Mask & EE_Parameter.WARN_J16_Bitmask) J16_ON; else J16_OFF;
73	}	82	}
74		83
75	if(!J17Warn)	84	if(!J17Warn)
76	{	85	{
77	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}	86	if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}
78	else	87	else
79	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_ON; else J17_OFF;}	88	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_ON; else J17_OFF;}
80	else	89	else
81	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing < 10)) {if(J17Bitmask & 128) J17_OFF; else J17_ON;}	90	if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing < 10)) {if(J17Bitmask & 128) J17_OFF; else J17_ON;}
82	else	91	else
83	if(!J17Blinkcount--)	92	if(!J17Blinkcount--)
84	{	93	{
85	J17Blinkcount = Parameter_J17Timing-1;	94	J17Blinkcount = Parameter_J17Timing-1;
86	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;	95	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
87	if(J17Mask & J17Bitmask) J17_ON; else J17_OFF;	96	if(J17Mask & J17Bitmask) J17_ON; else J17_OFF;
88	}	97	}
89	}	98	}
90	else	99	else
91	if(!J17Blinkcount--)	100	if(!J17Blinkcount--)
92	{	101	{
93	J17Blinkcount = 10-1;	102	J17Blinkcount = 10-1;
94	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;	103	if(J17Mask == 1) J17Mask = 128; else J17Mask /= 2;
95	if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF;	104	if(J17Mask & EE_Parameter.WARN_J17_Bitmask) J17_ON; else J17_OFF;
96	}	105	}
97	}	106	}
98	}	107	}
99		108
100		109

Subversion Repositories FlightCtrl

(root)/branches/MartinW_Jeti+/led.c - Rev 1739 → 1756