Merge branch 'dev' into miniTTN

G4lile0 · Dec 8, 2019 · ebd14d5 · ebd14d5
2 parents 653f2a6 + 6ff4e89
commit ebd14d5
Show file tree

Hide file tree

Showing 3 changed files with 686 additions and 11 deletions.
diff --git a/src/Fossa_GroundStation/Fossa_GroundStation.ino b/src/Fossa_GroundStation/Fossa_GroundStation.ino
@@ -2,6 +2,7 @@
     Based on theRadioLib SX127x Receive with Interrupts Example
     For full API reference, see the GitHub Pages
      https://jgromes.github.io/RadioLib/
+     
   */
 
 // include the library
@@ -312,22 +313,22 @@ void drawFrame6(OLEDDisplay *display, OLEDDisplayUiState* state, int16_t x, int1
   display->setColor(BLACK);
   display->setTextAlignment(TEXT_ALIGN_CENTER);
   display->fillRect(83,0,128,11);
-  display->drawString( 65+x,  49+y+(x/2), "Waiting for FossaSat Pos" );
-  display->drawString( 63+x,  51+y+(x/2), "Waiting for FossaSat Pos" );
-  display->fillCircle(sat_pos_oled[0], sat_pos_oled[1], 6);
-
-
-  display->setColor(WHITE);
+  display->setFont(ArialMT_Plain_10);
+
   if (sat_pos_oled[0] == 0 && sat_pos_oled[1] == 0) {
-    display->setFont(ArialMT_Plain_10);
+    display->drawString( 65+x,  49+y+(x/2), "Waiting for FossaSat Pos" );
+    display->drawString( 63+x,  51+y+(x/2), "Waiting for FossaSat Pos" );
+    display->setColor(WHITE);
     display->drawString( 64+x,  50+y+(x/2), "Waiting for FossaSat Pos" );
   }
   else {
-    display->drawCircle(sat_pos_oled[0], sat_pos_oled[1], 5);
+    display->fillCircle(sat_pos_oled[0]+x, sat_pos_oled[1]+y, 6);
+    display->setColor(WHITE);
+    display->drawCircle(sat_pos_oled[0]+x, sat_pos_oled[1]+y, 5);
     display->setColor(BLACK);
-    display->drawCircle(sat_pos_oled[0], sat_pos_oled[1], 2);
+    display->drawCircle(sat_pos_oled[0]+x, sat_pos_oled[1]+y, 2);
     display->setColor(WHITE);
-    display->drawCircle(sat_pos_oled[0], sat_pos_oled[1], 1);
+    display->drawCircle(sat_pos_oled[0]+x, sat_pos_oled[1]+y, 1);
   }
 
 }

diff --git a/src/Fossa_GroundStation/config_manager.h b/src/Fossa_GroundStation/config_manager.h
@@ -29,7 +29,7 @@ constexpr auto TZ_LENGTH = 40;
 
 typedef struct {
 	uint32_t crc32;
-	char station[STATION_NAME_LENGTH];
+	char station[STATION_NAME_LENGTH] = "test_";
 	float latitude = 0.0;    // ** Beware this information is publically available use max 3 decimals 
 	float longitude = 0.0;    // ** Beware this information is publically available use max 3 decimals