| /trunk/main.h |
|---|
| 14,7 → 14,7 |
| #define VERSION_MAJOR 2 |
| #define VERSION_MINOR 17 |
| #define VERSION_PATCH 0 |
| #define VERSION_PATCH 1 |
| // 0 = A |
| // 1 = B |
| // 2 = C |
| /trunk/settings.c |
|---|
| 90,7 → 90,7 |
| // {PID_ABSOLUTE_FLYING_ALT , "MAX_FLYING_ALT \0" ,"max. altitude in m ", 1, 0, 0, 0, 30000}, // in [m] |
| // {PID_ABSOLUTE_FLYING_RANGE , "MAX_FLYING_RANGE\0" ,"max. range in m ", 1, 0, 0, 0, 60000}, // in [m] |
| // {PID_AUTO_DESCEND_RANGE , "DESCEND_RANGE \0" ,"Auto-descend range in m (0 = disabled) (only comm. License) ", 1, 0, 0, 0, 60000}, // in [m] |
| {PID_GPS_SYSTEM_CFG , "GPS_SYSTEM_CFG \0" ,"1:GPS+GLNAS 2:GPS+BEIDOU 3:GPS 4:GLNAS 5:BEIDOU ", 1, 1, 1, 0, 5}, |
| {PID_GPS_SYSTEM_CFG , "GPS_SYSTEM_CFG \0" ,"1:GPS+GLO+GAL 2:GPS+BDS 3:GPS 4:GLO 5:BDS 6:GPS+GLO 7:GAL ", 1, 1, 1, 0, 99}, |
| {PID_GPS_SBAS_CONFIG , "GPS_SBAS_DGPS_ON\0" ,"GPS SBAS mode (0 = off, 1 = on) ", 1, 1, 1, 0, 1}, |
| {PID_GPS_QZSS_CONFIG , "GPS_QZSS_DGPS_ON\0" ,"GPS QZSS mode (0 = off, 1 = on) (Japan) ", 1, 1, 0, 0, 1}, |
| {PID_AUTO_WP_EVENT_VALUE , "AUTO_WP_EVENT \0" ,"value for the WP-Event Trigger at Auto-Distance [10ms] ", 1, 10, 10, 1, 200}, // in 0,1sek |
| /trunk/uart0.c |
|---|
| 502,7 → 502,7 |
| u8 UART0_GetUBXVersion(void) |
| { |
| u32 timeout; |
| u8 msg[64]; |
| u8 msg[220]; |
| u8 retval = 0xFF; |
| u8 ubxmsg[]={0x0A, 0x04, 0x00, 0x00}; //MON-VER |
| // prepare rx msg filter |
| 524,9 → 524,27 |
| retval = UbxVersionParser(); |
| if(retval != 0xff) |
| { |
| UbxMsg.Data[4] = 0; //Only the first 4 characters |
| sprintf(msg, " V%d.%d SW:%s", retval/10,retval%10, (u8*)&UbxMsg.Data[0]); |
| /* |
| unsigned int i; |
| for(i=0;i< sizeof(UbxMsg.Data);i++) |
| { |
| if(UbxMsg.Data[i] == 0) UbxMsg.Data[i] = '°'; |
| } |
| //UbxMsg.Data[30] = 0; |
| UbxMsg.Data[sizeof(UbxMsg.Data)-1] = 0; |
| // UbxMsg.Data[4] = 0; //Only the first 4 characters |
| */ |
| sprintf(msg, " V%d.%d (%d) SW:%s", retval/10,retval%10, GPS_Version, (u8*)&UbxMsg.Data[0]); |
| UART1_PutString(msg); |
| sprintf(msg, "|%s|%s",(u8*)&UbxMsg.Data[40],(u8*)&UbxMsg.Data[40+30]); |
| UART1_PutString(msg); |
| if(UbxMsg.Data[40+60]) |
| { |
| sprintf(msg, "\n\r %s|%s|%s",(u8*)&UbxMsg.Data[40+60],(u8*)&UbxMsg.Data[40+90],(u8*)&UbxMsg.Data[40+120]); |
| UART1_PutString(msg); |
| } |
| } |
| else UART1_PutString(" ! -> UNKNOWN <- ! "); |
| } |
| /trunk/ubx.c |
|---|
| 402,16 → 402,19 |
| // HW:00000040: Antaris |
| // HW:00040001: Antaris-4 |
| // HW:80040001: Antaris-4 |
| // HW:00040005: u-blox 5 |
| // HW:00040005: u-blox 5 (nicht von uns verbaut) |
| // HW:00040006: u-blox 6 |
| // HW:00040007: u-blox 6 |
| // HW:00070000: u-blox 7 |
| // HW:00070000: u-blox 7 (nicht von uns verbaut) |
| // HW:00080000: u-blox M8 |
| // MKGPS V1 -> 1500 -> LEA-4H-0-000 -> ubxsw == 5.00 HW:00040001 |
| // MKGPS V2 -> 2602 -> LEA-6S-0-000 -> ubxsw == 6.02 HW:00040007 |
| // MKGPS V2 -> 2703 -> LEA-6S-0-001 -> ubxsw == 7.03 HW:00040007 |
| // MKGPS V3 -> 3201 -> NEO-M8Q-0-00 -> ubxsw == 2.01 HW:00080000 (Flash-oder ROM Variante) |
| // MKGPS V10 -> 1500 -> LEA-4H-0-000 -> ubxsw == 5.00 HW:00040001 |
| // MKGPS V20 -> 2602 -> LEA-6S-0-000 -> ubxsw == 6.02 HW:00040007 |
| // MKGPS V20 -> 2703 -> LEA-6S-0-001 -> ubxsw == 7.03 HW:00040007 |
| // MKGPS V30 -> 3101 -> NEO-M8N-0-01 -> ubxsw == 2.01 HW:00080000 (Flash- Variante) kann nur 5Hz bei MAX-Sat:15 |
| // MKGPS V31 -> 3201 -> NEO-M8Q-0-00 -> ubxsw == 2.01 HW:00080000 (ROM Variante) |
| // MKGPS V40 -> 4301 -> NEO-M8Q-0-10 -> ubxsw == 3.01 HW:00080000 (Message:"ROM CORE 3.01 (107888)) |
| u8 retval = 0xFF; |
| if(UbxMsg.Data[33] == '4' && UbxMsg.Data[37] == '1') // LEA-4 |
| { |
| 427,8 → 430,24 |
| else |
| if(UbxMsg.Data[33] == '8' && UbxMsg.Data[37] == '0') // NEO-8 |
| { |
| GPS_Version = 3000 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
| retval = 30; // MKGPS V3 |
| if(UbxMsg.Data[100] == 'F') // Message[100]:"FIS 0xEF4015 (73171)" bei der Flash-Variante |
| { |
| GPS_Version = 3000 - 100 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
| retval = 30; // MKGPS V3 Flash |
| } |
| else |
| if(UbxMsg.Data[0] >= '0' && UbxMsg.Data[0] <= '9') // Steht da gleich zu Anfang eine Zahl? |
| { |
| GPS_Version = 3000 + (UbxMsg.Data[0] - '0') * 100 + (UbxMsg.Data[2] - '0') * 10 + (UbxMsg.Data[3] - '0'); |
| retval = 31; // MKGPS V3 ROM |
| } |
| else |
| if(UbxMsg.Data[9] >= '0' && UbxMsg.Data[9] <= '9') // Message:"ROM CORE 3.01 (107888)" |
| { |
| GPS_Version = 4000 + (UbxMsg.Data[9] - '0') * 100 + (UbxMsg.Data[11] - '0') * 10 + (UbxMsg.Data[12] - '0'); |
| retval = 40; // MKGPS V4 (Galileo) |
| } |
| } |
| return(retval); |
| } |