Subversion Repositories NaviCtrl

Compare Revisions

Ignore whitespace Rev 38 → Rev 39

/trunk/GPS.h
27,6 → 27,10
 
extern u8 Navigation(void);
extern void GPS_Init(void);
extern s32 TargetListeLong[20];
extern s32 TargetListeLat[20];
extern u32 ActualTargetNumber;
extern u32 StoreTargetNumber;
 
 
#endif
/trunk/main.c
283,7 → 283,7
 
 
// ----------- KML Timing -------------------------
if(CheckDelay(KmlAddPointDelay))
if(CheckDelay(KmlAddPointDelay) && 0)
{
KmlAddPointDelay = SetDelay(500);
switch(kml_state)
/trunk/main.h
21,13 → 21,10
#include "string.h"
#include "settings.h"
 
 
 
 
//#include "hw_config.h"
 
#define VERSION_HAUPTVERSION 0
#define VERSION_NEBENVERSION 1
#define VERSION_NEBENVERSION 4
#define VERSION_KOMPATIBEL 7
 
#define GPIO_ToggleBit(GPIO, Pin) if (GPIO_ReadBit(GPIO, Pin)) GPIO_WriteBit(GPIO, Pin, Bit_RESET); else GPIO_WriteBit(GPIO, Pin, Bit_SET);
/trunk/uart.c
113,10 → 113,8
"I2C_ReadByte ",
"ACC_Speed_N ",
"ACC_Speed_E ",
" ",
" ", // 20
// "Distance_N ",
// "Distance_E ", //20
"StoredTargets ",
"ActualTarget ", // 20
"N_Speed ",
"E_Speed ",
"I_North ",
369,9 → 367,20
break;
case 's':// neue PCTargetGPSPosition
Decode64((unsigned char *) &tmp_long_arr2[0],sizeof(tmp_long_arr2),3,AnzahlEmpfangsBytes);
PCTargetGPSPosition.Longitude = tmp_long_arr2[0];
PCTargetGPSPosition.Latitude = tmp_long_arr2[1];
PCTargetGPSPosition.Latitude = tmp_long_arr2[0];
PCTargetGPSPosition.Longitude = tmp_long_arr2[1];
NewPCTargetGPSPosition = 1;
TargetListeLong[StoreTargetNumber] = PCTargetGPSPosition.Longitude;
TargetListeLat[StoreTargetNumber] = PCTargetGPSPosition.Latitude;
if(StoreTargetNumber<20) StoreTargetNumber++;
 
 
/*
s32 TargetListeLong[20] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
s32 TargetListeLat[20] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
u32 ActualTargetNumber = 0;
u32 StoreTargetNumber = 0;
*/
break;
case 'k':// Keys von DubWise
// Decode64((unsigned char *) &DubWiseKeys[0],sizeof(DubWiseKeys),3,AnzahlEmpfangsBytes);