Diff: main.cpp

Revision:

5:8301960b3ae8

Parent:

3:25e3289b0411

--- a/main.cpp	Thu Apr 08 10:39:08 2021 +0000
+++ b/main.cpp	Fri Apr 23 12:01:30 2021 +0000
@@ -5,37 +5,48 @@
 
 Serial pc(USBTX, USBRX);
 GYSFDMAXB gps(PC_12, PD_2);
+DigitalOut led(LED1);
 
 void Display()
 {
     pc.printf("################################\r\n");
     pc.printf("%d h %d m %d s %d ms\r\n", gps.Hours, gps.Minutes, gps.Seconds, gps.Milliseconds);
     pc.printf("%d / %d / %d\r\n", gps.Year, gps.Month, gps.Day);
-    pc.printf("latitude  : %c %f\r\n", gps.N_S, gps.Latitude);
-    pc.printf("longitude : %c %f\r\n", gps.E_W, gps.Longitude);
-    pc.printf("elevation : %f\r\n", gps.Elevation);
+    pc.printf("Latitude  : %c %f\r\n", gps.N_S, gps.Latitude);
+    pc.printf("Longitude : %c %f\r\n", gps.E_W, gps.Longitude);
+    pc.printf("Elevation : %f\r\n", gps.Elevation);
     gps.Calcurate();
-    pc.printf("Local X : %f\r\n", gps.Position.x);
-    pc.printf("Local Y : %f\r\n", gps.Position.y);
-    pc.printf("Local Z : %f\r\n", gps.Position.z);
+    pc.printf("Local N : %f\r\n", gps.Position.x);
+    pc.printf("Local E : %f\r\n", gps.Position.y);
+    pc.printf("Local D : %f\r\n", gps.Position.z);
+    pc.printf("Satellites : %d\r\n", gps.Satellites);
+    /*
+    pc.printf("start_index : %d\r\n", gps.start_index);
+    pc.printf("uart_index : %d\r\n", gps.uart_index);
+    
     pc.printf("UniversalZero X : %f\r\n", gps.UniversalZeroPosition.x);
     pc.printf("UniversalZero Y : %f\r\n", gps.UniversalZeroPosition.y);
     pc.printf("UniversalZero Z : %f\r\n", gps.UniversalZeroPosition.z);
     pc.printf("Universal X : %f\r\n", gps.UniversalPosition.x);
     pc.printf("Universal Y : %f\r\n", gps.UniversalPosition.y);
     pc.printf("Universal Z : %f\r\n", gps.UniversalPosition.z);
+    */
 }
 
+
 int main()
 {
     pc.baud(115200);
     Ticker ticker;
+    
     ticker.attach(&Display, 0.3);
-    gps.CalcurateUnit();
+    
+    led = 1;
+    gps.Initialize();
+    led = 0;
     
     while (1)
     {
-        gps.Update();
     }
 }
 
@@ -53,7 +64,7 @@
 }
 
 
-/*
+
 $PMTK251,115200*1F\r\n
 $PMTK251,57600*2C\r\n
 $PMTK251,9600*17\r\n