Rev 1739 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 1739 | Rev 1749 | ||
|---|---|---|---|
| Line 77... | Line 77... | ||
| 77 | 77 | ||
| 78 | int Display_Timer, Debug_Timer,Kompass_Timer,Timer3D; |
78 | int Display_Timer, Debug_Timer,Kompass_Timer,Timer3D; |
| 79 | unsigned int DebugDataIntervall = 0, Intervall3D = 0, Display_Interval = 0; |
79 | unsigned int DebugDataIntervall = 0, Intervall3D = 0, Display_Interval = 0; |
| Line -... | Line 80... | ||
| - | 80 | unsigned int AboTimeOut = 0; |
|
| 80 | unsigned int AboTimeOut = 0; |
81 | |
| 81 | 82 | ||
| 82 | const unsigned char ANALOG_TEXT[32][16] PROGMEM = |
83 | const unsigned char ANALOG_TEXT[32][13] PROGMEM = |
| 83 | { |
84 | { |
| 84 | //1234567890123456 |
85 | //1234567890123456 |
| 85 | "AngleNick ", //0 |
86 | "AngleNick ", //0 |
| 86 | "AngleRoll ", |
87 | "AngleRoll ", |
| 87 | "AccNick ", |
88 | "AccNick ", |
| 88 | "AccRoll ", |
89 | "AccRoll ", |
| 89 | "YawGyro ", |
90 | "YawGyro ", |
| 90 | "Height Value ", //5 |
91 | "Height Value ", //5 |
| 91 | "AccZ ", |
92 | "AccZ ", |
| 92 | "Gas ", |
93 | "Gas ", |
| 93 | "Compass Value ", |
94 | "Compass Value", |
| 94 | "Voltage [0.1V] ", |
95 | "Voltage[0.1V]", |
| 95 | "Receiver Level ", //10 |
96 | "ReceiverLevel", //10 |
| 96 | "Gyro Compass ", |
97 | "Gyro Compass ", |
| 97 | "Motor 1 ", |
98 | "Motor 1 ", |
| 98 | "Motor 2 ", |
99 | "Motor 2 ", |
| 99 | "Motor 3 ", |
100 | "Motor 3 ", |
| 100 | "Motor 4 ", //15 |
101 | "Motor 4 ", //15 |
| 101 | "Motor 5 ", |
102 | "Motor 5 ", |
| 102 | "Motor 6 ", |
103 | "Motor 6 ", |
| 103 | "18 ", |
104 | "18 ", |
| 104 | "WoutCalcState ", |
105 | "WoutCalcState", |
| 105 | "Servo ", //20 |
106 | "Servo ", //20 |
| 106 | "Hovergas ", |
107 | "Hovergas ", |
| 107 | "Current [0.1A] ", |
108 | "Current[0.1A]", |
| 108 | "Capacity [mAh] ", |
109 | "Capacity[mAh]", |
| 109 | "Motor 7 ", |
110 | "Motor 7 ", |
| 110 | "Motor 8 ", //25 |
111 | "Motor 8 ", //25 |
| 111 | "Motor 9 ", |
112 | "Motor 9 ", |
| 112 | "Motor 10 ", |
113 | "Motor 10 ", |
| 113 | "I2C-Error ", |
114 | "I2C-Error ", |
| 114 | "BL Limit ", |
115 | "BL Limit ", |
| 115 | "GPS_Nick ", //30 |
116 | "GPS_Nick ", //30 |
| Line -... | Line 117... | ||
| - | 117 | "GPS_Roll " |
|
| 116 | "GPS_Roll " |
118 | }; |
| 117 | }; |
119 | |
| 118 | 120 | ||
| 119 | 121 | ||
| 120 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
122 | //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| Line 165... | Line 167... | ||
| 165 | NeuerDatensatzEmpfangen = 1; |
167 | NeuerDatensatzEmpfangen = 1; |
| 166 | AnzahlEmpfangsBytes = buf_ptr + 1; |
168 | AnzahlEmpfangsBytes = buf_ptr + 1; |
| 167 | RxdBuffer[buf_ptr] = '\r'; |
169 | RxdBuffer[buf_ptr] = '\r'; |
| 168 | if(RxdBuffer[2] == 'R') |
170 | if(RxdBuffer[2] == 'R') |
| 169 | { |
171 | { |
| - | 172 | #ifdef NODISPLAY // main.h |
|
| - | 173 | ||
| - | 174 | #warning : "### no MKTool Display ###" |
|
| 170 | LcdClear(); |
175 | LcdClear(); |
| - | 176 | #endif |
|
| 171 | wdt_enable(WDTO_250MS); // Reset-Commando |
177 | wdt_enable(WDTO_250MS); // Reset-Commando |
| 172 | ServoActive = 0; |
178 | ServoActive = 0; |
| Line 173... | Line 179... | ||
| 173 | 179 | ||
| 174 | } |
180 | } |
| Line 490... | Line 496... | ||
| 490 | if(DebugDataIntervall > 0) DebugDataAnforderung = 1; |
496 | if(DebugDataIntervall > 0) DebugDataAnforderung = 1; |
| 491 | AboTimeOut = SetDelay(ABO_TIMEOUT); |
497 | AboTimeOut = SetDelay(ABO_TIMEOUT); |
| 492 | break; |
498 | break; |
| Line 493... | Line 499... | ||
| 493 | 499 | ||
| - | 500 | case 'h':// x-1 Displayzeilen |
|
| - | 501 | ||
| - | 502 | #ifdef NODISPLAY // only include functions if DEBUG is defined in main.h |
|
| - | 503 | #warning : "### no MKTool Display ###" |
|
| 494 | case 'h':// x-1 Displayzeilen |
504 | |
| 495 | PcZugriff = 255; |
505 | PcZugriff = 255; |
| 496 | if((pRxData[0] & 0x80) == 0x00) // old format |
506 | if((pRxData[0] & 0x80) == 0x00) // old format |
| 497 | { |
507 | { |
| 498 | DisplayLine = 2; |
508 | DisplayLine = 2; |
| Line 511... | Line 521... | ||
| 511 | case 'l':// x-1 Displayzeilen |
521 | case 'l':// x-1 Displayzeilen |
| 512 | PcZugriff = 255; |
522 | PcZugriff = 255; |
| 513 | MenuePunkt = pRxData[0]; |
523 | MenuePunkt = pRxData[0]; |
| 514 | DebugDisplayAnforderung1 = 1; |
524 | DebugDisplayAnforderung1 = 1; |
| 515 | break; |
525 | break; |
| - | 526 | #endif |
|
| 516 | case 'v': // Version-Anforderung und Ausbaustufe |
527 | case 'v': // Version-Anforderung und Ausbaustufe |
| 517 | GetVersionAnforderung = 1; |
528 | GetVersionAnforderung = 1; |
| 518 | break; |
529 | break; |
| Line 519... | Line 530... | ||
| 519 | 530 | ||
| Line 586... | Line 597... | ||
| 586 | { |
597 | { |
| 587 | Display_Interval = 0; |
598 | Display_Interval = 0; |
| 588 | DebugDataIntervall = 0; |
599 | DebugDataIntervall = 0; |
| 589 | Intervall3D = 0; |
600 | Intervall3D = 0; |
| 590 | } |
601 | } |
| - | 602 | #ifdef NODISPLAY //main.h |
|
| - | 603 | #warning : "### no MKTool Display ###" |
|
| Line 591... | Line 604... | ||
| 591 | 604 | ||
| 592 | if(((Display_Interval>0 && CheckDelay(Display_Timer)) || DebugDisplayAnforderung) && UebertragungAbgeschlossen) |
605 | if(((Display_Interval>0 && CheckDelay(Display_Timer)) || DebugDisplayAnforderung) && UebertragungAbgeschlossen) |
| 593 | { |
606 | { |
| 594 | if(DisplayLine > 3)// new format |
607 | if(DisplayLine > 3)// new format |
| Line 609... | Line 622... | ||
| 609 | { |
622 | { |
| 610 | Menu(); |
623 | Menu(); |
| 611 | SendOutData('L', FC_ADDRESS, 3, &MenuePunkt, sizeof(MenuePunkt), &MaxMenue, sizeof(MaxMenue), DisplayBuff, sizeof(DisplayBuff)); |
624 | SendOutData('L', FC_ADDRESS, 3, &MenuePunkt, sizeof(MenuePunkt), &MaxMenue, sizeof(MaxMenue), DisplayBuff, sizeof(DisplayBuff)); |
| 612 | DebugDisplayAnforderung1 = 0; |
625 | DebugDisplayAnforderung1 = 0; |
| 613 | } |
626 | } |
| - | 627 | #endif |
|
| 614 | if(GetVersionAnforderung && UebertragungAbgeschlossen) |
628 | if(GetVersionAnforderung && UebertragungAbgeschlossen) |
| 615 | { |
629 | { |
| 616 | SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &VersionInfo, sizeof(VersionInfo)); |
630 | SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &VersionInfo, sizeof(VersionInfo)); |
| 617 | GetVersionAnforderung = 0; |
631 | GetVersionAnforderung = 0; |
| 618 | Debug_OK("Version gesendet"); |
632 | Debug_OK("Version gesendet"); |