Rev 304 | Rev 492 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 304 | Rev 395 | ||
|---|---|---|---|
| Line 17... | Line 17... | ||
| 17 | unsigned volatile char NeueKoordinateEmpfangen = 0; |
17 | unsigned volatile char NeueKoordinateEmpfangen = 0; |
| 18 | unsigned volatile char UebertragungAbgeschlossen = 1; |
18 | unsigned volatile char UebertragungAbgeschlossen = 1; |
| 19 | unsigned volatile char CntCrcError = 0; |
19 | unsigned volatile char CntCrcError = 0; |
| 20 | unsigned volatile char AnzahlEmpfangsBytes = 0; |
20 | unsigned volatile char AnzahlEmpfangsBytes = 0; |
| 21 | unsigned volatile char PC_DebugTimeout = 0; |
21 | unsigned volatile char PC_DebugTimeout = 0; |
| - | 22 | unsigned char NurKanalAnforderung = 0; |
|
| 22 | unsigned char PcZugriff = 100; |
23 | unsigned char PcZugriff = 100; |
| 23 | unsigned char MotorTest[4] = {0,0,0,0}; |
24 | unsigned char MotorTest[4] = {0,0,0,0}; |
| 24 | unsigned char MeineSlaveAdresse; |
25 | unsigned char MeineSlaveAdresse; |
| 25 | struct str_DebugOut DebugOut; |
26 | struct str_DebugOut DebugOut; |
| 26 | struct str_Debug DebugIn; |
27 | struct str_Debug DebugIn; |
| Line 193... | Line 194... | ||
| 193 | /* for(unsigned char i=0; i<4;i++) |
194 | /* for(unsigned char i=0; i<4;i++) |
| 194 | { |
195 | { |
| 195 | EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2], DebugIn.Analog[i]); |
196 | EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2], DebugIn.Analog[i]); |
| 196 | EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2 + 1], DebugIn.Analog[i] >> 8); |
197 | EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2 + 1], DebugIn.Analog[i] >> 8); |
| 197 | }*/ |
198 | }*/ |
| 198 | //RemoteTasten |= DebugIn.RemoteTasten; |
199 | RemoteTasten |= DebugIn.RemoteTasten; |
| 199 | DebugDataAnforderung = 1; |
200 | DebugDataAnforderung = 1; |
| 200 | break; |
201 | break; |
| 201 | - | ||
| 202 | case 'h':// x-1 Displayzeilen |
202 | case 'h':// x-1 Displayzeilen |
| 203 | Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes); |
203 | Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes); |
| 204 | RemoteTasten |= tmp_char_arr2[0]; |
204 | RemoteTasten |= tmp_char_arr2[0]; |
| - | 205 | if(tmp_char_arr2[1] == 255) NurKanalAnforderung = 1; else NurKanalAnforderung = 0; // keine Displaydaten |
|
| 205 | DebugDisplayAnforderung = 1; |
206 | DebugDisplayAnforderung = 1; |
| 206 | break; |
207 | break; |
| 207 | case 't':// Motortest |
208 | case 't':// Motortest |
| 208 | Decode64((unsigned char *) &MotorTest[0],sizeof(MotorTest),3,AnzahlEmpfangsBytes); |
209 | Decode64((unsigned char *) &MotorTest[0],sizeof(MotorTest),3,AnzahlEmpfangsBytes); |
| 209 | break; |
210 | break; |
| Line 234... | Line 235... | ||
| 234 | case 'o': |
235 | case 'o': |
| 235 | case 'p': // Parametersatz speichern |
236 | case 'p': // Parametersatz speichern |
| 236 | Decode64((unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE,3,AnzahlEmpfangsBytes); |
237 | Decode64((unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE,3,AnzahlEmpfangsBytes); |
| 237 | WriteParameterSet(RxdBuffer[2] - 'l' + 1, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE); |
238 | WriteParameterSet(RxdBuffer[2] - 'l' + 1, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE); |
| 238 | eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], RxdBuffer[2] - 'l' + 1); // aktiven Datensatz merken |
239 | eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], RxdBuffer[2] - 'l' + 1); // aktiven Datensatz merken |
| - | 240 | Umschlag180Nick = (long) EE_Parameter.WinkelUmschlagNick * 2500L; |
|
| - | 241 | Umschlag180Roll = (long) EE_Parameter.WinkelUmschlagRoll * 2500L; |
|
| 239 | Piep(GetActiveParamSetNumber()); |
242 | Piep(GetActiveParamSetNumber()); |
| 240 | break; |
243 | break; |
| Line 241... | Line 244... | ||
| 241 | 244 | ||
| Line 313... | Line 316... | ||
| 313 | 316 | ||
| 314 | if(DebugDisplayAnforderung && UebertragungAbgeschlossen) |
317 | if(DebugDisplayAnforderung && UebertragungAbgeschlossen) |
| 315 | { |
318 | { |
| 316 | Menu(); |
319 | Menu(); |
| 317 | DebugDisplayAnforderung = 0; |
320 | DebugDisplayAnforderung = 0; |
| 318 | if(++dis_zeile == 4) |
321 | if(++dis_zeile == 4 || NurKanalAnforderung) |
| 319 | { |
322 | { |
| 320 | SendOutData('4',0,(unsigned char *)&PPM_in,sizeof(PPM_in)); // DisplayZeile übertragen |
323 | SendOutData('4',0,(unsigned char *)&PPM_in,sizeof(PPM_in)); // DisplayZeile übertragen |
| 321 | dis_zeile = -1; |
324 | dis_zeile = -1; |
| 322 | } |
325 | } |