• MikroKopter.de
• Wiki
• SHOP
• Datenschutz
• Impressum

NaviCtrlBL-CtrlFlightCtrlMK3MagProjects

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → / @ 290

  → / @ 291

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 290 → Rev 291

/trunk/main.h
7,7 → 7,7
#define VERSION_MAJOR 0
#define VERSION_MINOR 23
#define VERSION_PATCH 10
#define VERSION_PATCH 11
// 0 = A
// 1 = B
// 2 = C
19,6 → 19,7
// 8 = I
// 9 = J
// 10 = k
// 11 = L
#define VERSION_SERIAL_MAJOR 11
#define VERSION_SERIAL_MINOR 0

/trunk/uart1.c
402,13 → 402,47
case 's':// new target position
pPoint = (Point_t*)SerialMsg.pData;
BeepTime = 300;
if(pPoint->Position.Status == NEWDATA)
{
PointList_Clear(); // empty List
pPoint->Index = 1; // must be one after empty list
PointList_Append(pPoint);
GPS_pWaypoint = PointList_WPBegin();
if(pPoint->Type == POINT_TYPE_POI)
{
PointList_Clear(); // empty List
pPoint->Index = 1; // must be one after empty list
POICount = 0;
PointList_Append(pPoint);
PointCount = 2;
BeepTime = 50;
}
else
if(pPoint->Type == POINT_TYPE_WP)
{
PointList_Clear(); // empty List
PointCount = 1;
pPoint->Index = 2; // No. 1 could be the POI
WPCount = 0;
PointList_Append(pPoint);
PointCount = 2;
BeepTime = 50;
GPS_pWaypoint = PointList_WPBegin();
}
else
if(pPoint->Type == POINT_TYPE_BOTH)
{
PointList_Clear(); // empty List
pPoint->Index = 1;
pPoint->Type = POINT_TYPE_POI;
PointList_Append(pPoint);
pPoint->Index = 2;
pPoint->Type = POINT_TYPE_WP;
PointList_Append(pPoint);
BeepTime = 50;
GPS_pWaypoint = PointList_WPBegin();
}
else
{
PointList_Clear(); // empty List
GPS_pWaypoint = PointList_WPBegin();
}
}
break;

/trunk/waypoints.h
6,8 → 6,13
#define POINT_TYPE_INVALID 255
#define POINT_TYPE_WP 0
#define POINT_TYPE_POI 1
#define POINT_TYPE_BOTH 2 // only command 's'
extern u8 WPIndex; // list index of GPS point representig the current WP, can be maximal WPCount
extern u8 POIIndex; // list index of GPS Point representing the current POI, can be maximal WPCount
extern u8 WPCount; // number of waypoints
extern u8 PointCount; // number of wp in the list can be maximal equal to MAX_LIST_LEN
extern u8 POICount;
typedef struct
{