| 19,8 → 19,12 |
|---|
| unsigned volatile char CntCrcError = 0; |
| unsigned volatile char AnzahlEmpfangsBytes = 0; |
| unsigned volatile char PC_DebugTimeout = 0; |
| unsigned char RemotePollDisplayLine = 0; |
| unsigned char NurKanalAnforderung = 0; |
| unsigned char DebugTextAnforderung = 255; |
| unsigned char PcZugriff = 100; |
| unsigned char MotorTest[4] = {0,0,0,0}; |
| unsigned char DubWiseKeys[3] = {0,0,0}; |
| unsigned char MeineSlaveAdresse; |
| struct str_DebugOut DebugOut; |
| struct str_Debug DebugIn; |
| 29,6 → 33,46 |
|---|
| //Salvo 26.10.2007 |
| int dataset_cnt=0; //Zahelt die uebertragenen Debugdaten |
| //Salvo End |
| |
| const unsigned char ANALOG_TEXT[32][16] = |
| { |
| //1234567890123456 |
| "IntegralNick ", //0 |
| "IntegralRoll ", |
| "AccNick ", |
| "AccRoll ", |
| "GyroGier ", |
| "HoehenWert ", //5 |
| "AccZ ", |
| "Gas ", |
| "KompassValue ", |
| "Ersatzkompass ", |
| "Empfang ", //10 |
| "Analog11 ", |
| "Motor_Vorne ", |
| "Motor_Hinten ", |
| "Motor_Links ", |
| "Motor_Rechts ", //15 |
| "Index ", |
| "UBat ", |
| "Messwert_Nick ", |
| "Messwert_Roll ", |
| "Messwert_Gier ", //20 |
| "Stick_Nick ", |
| "Stick_Roll ", |
| "Stick_Gier ", |
| "RollOffset ", |
| "IntRoll*Faktor ", //25 |
| "utm_east ", |
| "utm_north ", |
| "utm_alt ", |
| "gps_state ", |
| "I-LageRoll ", //30 |
| "StickRoll " |
| }; |
| |
| |
| |
| //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| //++ Sende-Part der Datenübertragung |
| //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
| 183,16 → 227,20 |
|---|
| { |
| if(!NeuerDatensatzEmpfangen) return; |
| |
| unsigned int tmp_int_arr1[1]; |
| unsigned int tmp_int_arr2[2]; |
| unsigned int tmp_int_arr3[3]; |
| // unsigned int tmp_int_arr1[1]; |
| // unsigned int tmp_int_arr2[2]; |
| // unsigned int tmp_int_arr3[3]; |
| unsigned char tmp_char_arr2[2]; |
| unsigned char tmp_char_arr3[3]; |
| unsigned char tmp_char_arr4[4]; |
| // unsigned char tmp_char_arr3[3]; |
| // unsigned char tmp_char_arr4[4]; |
| //if(!MotorenEin) |
| PcZugriff = 255; |
| switch(RxdBuffer[2]) |
| { |
| case 'a':// Texte der Analogwerte |
| Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes); |
| DebugTextAnforderung = tmp_char_arr2[0]; |
| break; |
| case 'c':// Debugdaten incl. Externe IOs usw |
| Decode64((unsigned char *) &DebugIn,sizeof(DebugIn),3,AnzahlEmpfangsBytes); |
| /* for(unsigned char i=0; i<4;i++) |
| 200,18 → 248,21 |
|---|
| EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2], DebugIn.Analog[i]); |
| EE_CheckAndWrite(&EE_Buffer[EE_DEBUGWERTE + i*2 + 1], DebugIn.Analog[i] >> 8); |
| }*/ |
| //RemoteTasten |= DebugIn.RemoteTasten; |
| RemoteTasten |= DebugIn.RemoteTasten; |
| DebugDataAnforderung = 1; |
| break; |
| |
| case 'h':// x-1 Displayzeilen |
| Decode64((unsigned char *) &tmp_char_arr2[0],sizeof(tmp_char_arr2),3,AnzahlEmpfangsBytes); |
| RemoteTasten |= tmp_char_arr2[0]; |
| if(tmp_char_arr2[1] == 255) NurKanalAnforderung = 1; else NurKanalAnforderung = 0; // keine Displaydaten |
| DebugDisplayAnforderung = 1; |
| break; |
| case 't':// Motortest |
| Decode64((unsigned char *) &MotorTest[0],sizeof(MotorTest),3,AnzahlEmpfangsBytes); |
| break; |
| case 'k':// Keys von DubWise |
| Decode64((unsigned char *) &DubWiseKeys[0],sizeof(DubWiseKeys),3,AnzahlEmpfangsBytes); |
| break; |
| case 'v': // Version-Anforderung und Ausbaustufe |
| GetVersionAnforderung = 1; |
| break; |
| 241,6 → 292,8 |
|---|
| Decode64((unsigned char *) &EE_Parameter.Kanalbelegung[0],STRUCT_PARAM_LAENGE,3,AnzahlEmpfangsBytes); |
| WriteParameterSet(RxdBuffer[2] - 'l' + 1, (unsigned char *) &EE_Parameter.Kanalbelegung[0], STRUCT_PARAM_LAENGE); |
| eeprom_write_byte(&EEPromArray[EEPROM_ADR_ACTIVE_SET], RxdBuffer[2] - 'l' + 1); // aktiven Datensatz merken |
| Umschlag180Nick = (long) EE_Parameter.WinkelUmschlagNick * 2500L; |
| Umschlag180Roll = (long) EE_Parameter.WinkelUmschlagRoll * 2500L; |
| Piep(GetActiveParamSetNumber()); |
| break; |
| |
| 318,17 → 371,22 |
|---|
| // Salvo End |
| Debug_Timer = SetDelay(MIN_DEBUG_INTERVALL); |
| } |
| if(DebugTextAnforderung != 255) // Texte für die Analogdaten |
| { |
| SendOutData('A',DebugTextAnforderung + '0',(unsigned char *) ANALOG_TEXT[DebugTextAnforderung],16); |
| DebugTextAnforderung = 255; |
| } |
| |
| if(DebugDisplayAnforderung && UebertragungAbgeschlossen) |
| { |
| Menu(); |
| DebugDisplayAnforderung = 0; |
| if(++dis_zeile == 4) |
| if(++RemotePollDisplayLine == 4 || NurKanalAnforderung) |
| { |
| SendOutData('4',0,&PPM_in,sizeof(PPM_in)); // DisplayZeile übertragen |
| dis_zeile = -1; |
| SendOutData('4',0,(unsigned char *)&PPM_in,sizeof(PPM_in)); // DisplayZeile übertragen |
| RemotePollDisplayLine = -1; |
| } |
| else SendOutData('0' + dis_zeile,0,&DisplayBuff[20 * dis_zeile],20); // DisplayZeile übertragen |
| else SendOutData('0' + RemotePollDisplayLine,0,(unsigned char *)&DisplayBuff[20 * RemotePollDisplayLine],20); // DisplayZeile übertragen |
| } |
| if(GetVersionAnforderung && UebertragungAbgeschlossen) |
| { |