Rev 664 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 664 | Rev 701 | ||
---|---|---|---|
Line 519... | Line 519... | ||
519 | { |
519 | { |
520 | if(UbxMsg.Status == NEWDATA) break; |
520 | if(UbxMsg.Status == NEWDATA) break; |
521 | }while(!CheckDelay(timeout)); |
521 | }while(!CheckDelay(timeout)); |
522 | if((UbxMsg.Hdr.Length >= 40) && (UbxMsg.Status == NEWDATA)) |
522 | if((UbxMsg.Hdr.Length >= 40) && (UbxMsg.Status == NEWDATA)) |
523 | { |
523 | { |
524 | /* |
- | |
525 | UART1_PutString(" V"); |
- | |
526 | UbxMsg.Data[4] = 0; //Only the first 4 characters |
- | |
527 | UART1_PutString((u8*)&UbxMsg.Data); |
- | |
528 | UART1_PutString(" HW:"); |
- | |
529 | UbxMsg.Data[39] = 0; |
- | |
530 | UART1_PutString((u8*)&UbxMsg.Data[30]); |
- | |
531 | */ |
- | |
532 | if(UbxMsg.Data[33] == '4' && UbxMsg.Data[37] == '1') // LEA-4 |
- | |
533 | { |
- | |
534 | GPS_Version = 1000 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
- | |
535 | retval = 10; // MKGPS V1 |
524 | retval = UbxVersionParser(); |
536 | } |
- | |
537 | else |
- | |
538 | if(UbxMsg.Data[33] == '4' && UbxMsg.Data[37] == '7') // LEA-6 |
- | |
539 | { |
- | |
540 | GPS_Version = 2000 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
- | |
541 | retval = 20; // MKGPS V2 |
525 | if(retval != 0xff) |
542 | } |
- | |
543 | else |
- | |
544 | if(UbxMsg.Data[33] == '8' && UbxMsg.Data[37] == '0') // NEO-8 |
- | |
545 | { |
526 | { |
546 | GPS_Version = 3000 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
- | |
547 | retval = 30; // MKGPS V3 |
- | |
548 | } |
- | |
549 | else |
- | |
550 | UART1_PutString(" ! -> UNKNOWN <- ! "); |
- | |
551 | // HW:00000040: Antaris |
- | |
552 | // HW:00040001: Antaris-4 |
- | |
553 | // HW:80040001: Antaris-4 |
- | |
554 | // HW:00040005: u-blox 5 |
- | |
555 | // HW:00040006: u-blox 6 |
- | |
556 | // HW:00040007: u-blox 6 |
- | |
557 | // HW:00070000: u-blox 7 |
- | |
558 | // HW:00080000: u-blox M8 |
- | |
559 | // MKGPS V1 -> 1500 -> LEA-4H-0-000 -> ubxsw == 5.00 HW:00040001 |
- | |
560 | // MKGPS V2 -> 2602 -> LEA-6S-0-000 -> ubxsw == 6.02 HW:00040007 |
- | |
561 | // MKGPS V2 -> 2703 -> LEA-6S-0-001 -> ubxsw == 7.03 HW:00040007 |
- | |
562 | // MKGPS V3 -> 3201 -> NEO-M8Q-0-00 -> ubxsw == 2.00 HW:00080000 (Flash-oder ROM Variante) |
- | |
563 | UbxMsg.Data[4] = 0; //Only the first 4 characters |
527 | UbxMsg.Data[4] = 0; //Only the first 4 characters |
564 | sprintf(msg, " V%d.%d SW:%s", retval/10,retval%10, (u8*)&UbxMsg.Data[0]); |
528 | sprintf(msg, " V%d.%d SW:%s", retval/10,retval%10, (u8*)&UbxMsg.Data[0]); |
565 | UART1_PutString(msg); |
529 | UART1_PutString(msg); |
- | 530 | } |
|
- | 531 | else UART1_PutString(" ! -> UNKNOWN <- ! "); |
|
566 | } |
532 | } |
567 | UbxMsg.Status = INVALID; |
533 | UbxMsg.Status = INVALID; |
568 | return(retval); |
534 | return(retval); |
569 | } |
535 | } |