Rev 2452 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2452 | Rev 2466 | ||
|---|---|---|---|
| Line 656... | Line 656... | ||
| 656 | PcZugriff = 255; |
656 | PcZugriff = 255; |
| 657 | MenuePunkt = pRxData[0]; |
657 | MenuePunkt = pRxData[0]; |
| 658 | DebugDisplayAnforderung1 = 1; |
658 | DebugDisplayAnforderung1 = 1; |
| 659 | break; |
659 | break; |
| 660 | case 'v': // Version-Anforderung und Ausbaustufe |
660 | case 'v': // Version-Anforderung und Ausbaustufe |
| - | 661 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
|
| - | 662 | if(RxDataLen > 0 && pRxData[0] == 2) GetVersionAnforderung = 2; |
|
| - | 663 | else |
|
| - | 664 | #endif |
|
| 661 | GetVersionAnforderung = 1; |
665 | GetVersionAnforderung = 1; |
| 662 | break; |
666 | break; |
| 663 | - | ||
| 664 | case 'g':// |
667 | case 'g':// |
| 665 | GetExternalControl = 1; |
668 | GetExternalControl = 1; |
| 666 | break; |
669 | break; |
| Line 667... | Line 670... | ||
| 667 | 670 | ||
| Line 714... | Line 717... | ||
| 714 | VersionInfo.SWMajor = VERSION_MAJOR; |
717 | VersionInfo.SWMajor = VERSION_MAJOR; |
| 715 | VersionInfo.SWMinor = VERSION_MINOR; |
718 | VersionInfo.SWMinor = VERSION_MINOR; |
| 716 | VersionInfo.SWPatch = VERSION_PATCH; |
719 | VersionInfo.SWPatch = VERSION_PATCH; |
| 717 | VersionInfo.ProtoMajor = VERSION_SERIAL_MAJOR; |
720 | VersionInfo.ProtoMajor = VERSION_SERIAL_MAJOR; |
| 718 | VersionInfo.reserved1 = 0; |
721 | VersionInfo.reserved1 = 0; |
| 719 | VersionInfo.reserved2 = 0; |
722 | VersionInfo.BL_Firmware = 255; |
| 720 | VersionInfo.HWMajor = PlatinenVersion; |
723 | VersionInfo.HWMajor = PlatinenVersion; |
| 721 | pRxData = 0; |
724 | pRxData = 0; |
| 722 | RxDataLen = 0; |
725 | RxDataLen = 0; |
| 723 | } |
726 | } |
| Line 757... | Line 760... | ||
| 757 | SendOutData('L', FC_ADDRESS, 3, &MenuePunkt, sizeof(MenuePunkt), &MaxMenue, sizeof(MaxMenue), DisplayBuff, sizeof(DisplayBuff)); |
760 | SendOutData('L', FC_ADDRESS, 3, &MenuePunkt, sizeof(MenuePunkt), &MaxMenue, sizeof(MaxMenue), DisplayBuff, sizeof(DisplayBuff)); |
| 758 | DebugDisplayAnforderung1 = 0; |
761 | DebugDisplayAnforderung1 = 0; |
| 759 | } |
762 | } |
| 760 | if(GetVersionAnforderung && UebertragungAbgeschlossen) |
763 | if(GetVersionAnforderung && UebertragungAbgeschlossen) |
| 761 | { |
764 | { |
| - | 765 | #if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__)) |
|
| - | 766 | if(GetVersionAnforderung == 2) // poll version of NC |
|
| - | 767 | { |
|
| - | 768 | struct str_VersionInfo nc; |
|
| - | 769 | nc.SWMajor = NC_Version.Major; |
|
| - | 770 | nc.SWMinor = NC_Version.Minor; |
|
| - | 771 | nc.SWPatch = NC_Version.Patch; |
|
| - | 772 | nc.HWMajor = NC_Version.Hardware; |
|
| - | 773 | nc.HardwareError[0] = 0xff; |
|
| - | 774 | nc.HardwareError[1] = 0xff; |
|
| - | 775 | nc.ProtoMajor = VersionInfo.ProtoMajor; |
|
| - | 776 | nc.BL_Firmware = VersionInfo.BL_Firmware; |
|
| - | 777 | nc.Flags = VersionInfo.Flags; |
|
| - | 778 | nc.reserved1 = 0; |
|
| - | 779 | SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &nc, sizeof(nc)); |
|
| - | 780 | } |
|
| - | 781 | else |
|
| - | 782 | #endif |
|
| - | 783 | { |
|
| 762 | SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &VersionInfo, sizeof(VersionInfo)); |
784 | SendOutData('V', FC_ADDRESS, 1, (unsigned char *) &VersionInfo, sizeof(VersionInfo)); |
| - | 785 | } |
|
| 763 | GetVersionAnforderung = 0; |
786 | GetVersionAnforderung = 0; |
| 764 | Debug_OK("Version gesendet"); |
787 | Debug_OK("Version gesendet"); |
| 765 | } |
788 | } |
| Line 766... | Line 789... | ||
| 766 | 789 | ||