Skip to content

Commit 0682dd9

Browse files
jgauchiajgauchia
committed
feat(satinfo): Change PDOP HDOP VDOP and ALT labels
1 parent 6d3f062 commit 0682dd9

File tree

3 files changed

+33
-32
lines changed

3 files changed

+33
-32
lines changed

‎lib/gui/src/mainScr.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ void getActTile(lv_event_t *event)
8888

8989
if (activeTile == SATTRACK)
9090
{
91-
createSatSprite(spriteSat);
92-
createConstelSprite(constelSprite);
91+
// createSatSprite(spriteSat);
92+
// createConstelSprite(constelSprite);
9393
}
9494
if (activeTile == MAP)
9595
{
@@ -270,11 +270,11 @@ void updateMap(lv_event_t *event)
270270
*/
271271
void updateSatTrack(lv_event_t *event)
272272
{
273-
lv_label_set_text_fmt(pdopLabel, "PDOP:\n%.1f", gpsData.pdop);
274-
lv_label_set_text_fmt(hdopLabel, "HDOP:\n%.1f", gpsData.hdop);
275-
lv_label_set_text_fmt(vdopLabel, "VDOP:\n%.1f", gpsData.vdop);
273+
lv_label_set_text_fmt(pdopLabel, "PDOP: %.1f", gpsData.pdop);
274+
lv_label_set_text_fmt(hdopLabel, "HDOP: %.1f", gpsData.hdop);
275+
lv_label_set_text_fmt(vdopLabel, "VDOP: %.1f", gpsData.vdop);
276276

277-
lv_label_set_text_fmt(altLabel, "ALT:\n%4dm.", gpsData.altitude);
277+
lv_label_set_text_fmt(altLabel, "ALT: %4dm.", gpsData.altitude);
278278

279279
fillSatInView();
280280
}

‎lib/gui/src/satInfo.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void drawSNRBar(lv_obj_t *bar, lv_chart_series_t *barSer, uint8_t id, uint8_t sa
106106
*/
107107
void clearSatInView()
108108
{
109-
createConstelSprite(constelSprite);
109+
// createConstelSprite(constelSprite);
110110
}
111111

112112
/**
@@ -132,22 +132,22 @@ void fillSatInView()
132132

133133
satPos = getSatPos(satTracker[i].elev, satTracker[i].azim);
134134

135-
spriteSat.fillCircle(6, 4, 2, TFT_GREEN);
136-
spriteSat.setCursor(0 , 8);
137-
spriteSat.print(satTracker[i].satNum);
138-
spriteSat.pushSprite(&constelSprite,satPos.x, satPos.y, TFT_TRANSPARENT);
135+
// spriteSat.fillCircle(6, 4, 2, TFT_GREEN);
136+
// spriteSat.setCursor(0 , 8);
137+
// spriteSat.print(satTracker[i].satNum);
138+
// spriteSat.pushSprite(&constelSprite,satPos.x, satPos.y, TFT_TRANSPARENT);
139139

140-
if ( satTracker[i].posX != satPos.x || satTracker[i].posY != satPos.y)
141-
{
142-
spriteSat.fillScreen(TFT_TRANSPARENT);
143-
spriteSat.pushSprite(&constelSprite, satTracker[i].posX, satTracker[i].posY, TFT_TRANSPARENT);
144-
}
140+
// if ( satTracker[i].posX != satPos.x || satTracker[i].posY != satPos.y)
141+
// {
142+
// spriteSat.fillScreen(TFT_TRANSPARENT);
143+
// spriteSat.pushSprite(&constelSprite, satTracker[i].posX, satTracker[i].posY, TFT_TRANSPARENT);
144+
// }
145145

146146
satTracker[i].posX = satPos.x;
147147
satTracker[i].posY = satPos.y;
148148

149-
spriteSat.fillScreen(TFT_TRANSPARENT);
150-
spriteSat.pushSprite(&constelSprite, satTracker[i].posX, satTracker[i].posY, TFT_TRANSPARENT);
149+
// spriteSat.fillScreen(TFT_TRANSPARENT);
150+
// spriteSat.pushSprite(&constelSprite, satTracker[i].posX, satTracker[i].posY, TFT_TRANSPARENT);
151151
}
152152

153153
lv_chart_refresh(satelliteBar);

‎lib/gui/src/satInfoScr.cpp‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -116,37 +116,38 @@ void satelliteBarDrawEvent(lv_event_t * event)
116116
void satelliteScr(_lv_obj_t *screen)
117117
{
118118
lv_obj_t *infoGrid = lv_obj_create(screen);
119-
lv_obj_set_size(infoGrid, 90, 175);
119+
lv_obj_set_width(infoGrid,TFT_WIDTH);
120+
lv_obj_set_height(infoGrid,35);
120121
lv_obj_set_flex_align(infoGrid, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
121-
lv_obj_set_style_pad_row(infoGrid, 5 * scale, 0);
122122
lv_obj_clear_flag(infoGrid, LV_OBJ_FLAG_SCROLLABLE);
123-
lv_obj_set_flex_flow(infoGrid, LV_FLEX_FLOW_COLUMN);
123+
lv_obj_set_flex_flow(infoGrid, LV_FLEX_FLOW_ROW_WRAP);
124+
lv_obj_set_pos(infoGrid,0,190);
125+
124126
static lv_style_t styleGrid;
125127
lv_style_init(&styleGrid);
126128
lv_style_set_bg_opa(&styleGrid, LV_OPA_0);
127129
lv_style_set_border_opa(&styleGrid, LV_OPA_0);
128130
lv_obj_add_style(infoGrid, &styleGrid, LV_PART_MAIN);
129-
lv_obj_set_y(infoGrid,0);
130-
131+
131132
pdopLabel = lv_label_create(infoGrid);
132-
lv_obj_set_style_text_font(pdopLabel, fontSatInfo, 0);
133-
lv_label_set_text_fmt(pdopLabel, "PDOP:\n%.1f", 0);
133+
lv_obj_set_style_text_font(pdopLabel, fontDefault, 0);
134+
lv_label_set_text_fmt(pdopLabel, "PDOP: %.1f", 0);
134135

135136
hdopLabel = lv_label_create(infoGrid);
136-
lv_obj_set_style_text_font(hdopLabel, fontSatInfo, 0);
137-
lv_label_set_text_fmt(hdopLabel, "HDOP:\n%.1f", 0);
137+
lv_obj_set_style_text_font(hdopLabel, fontDefault, 0);
138+
lv_label_set_text_fmt(hdopLabel, "HDOP: %.1f", 0);
138139

139140
vdopLabel = lv_label_create(infoGrid);
140-
lv_obj_set_style_text_font(vdopLabel, fontSatInfo, 0);
141-
lv_label_set_text_fmt(vdopLabel, "VDOP:\n%.1f", 0);
141+
lv_obj_set_style_text_font(vdopLabel, fontDefault, 0);
142+
lv_label_set_text_fmt(vdopLabel, "VDOP: %.1f", 0);
142143

143144
altLabel = lv_label_create(infoGrid);
144-
lv_obj_set_style_text_font(altLabel, fontSatInfo, 0);
145-
lv_label_set_text_fmt(altLabel, "ALT:\n%4dm.", 0);
145+
lv_obj_set_style_text_font(altLabel, fontDefault, 0);
146+
lv_label_set_text_fmt(altLabel, "ALT: %4dm.", 0);
146147

147148
lv_obj_t * barCont = lv_obj_create(screen);
148149
lv_obj_set_size(barCont, TFT_WIDTH, 180 * scale);
149-
lv_obj_set_pos(barCont, 0, 200 * scale);
150+
lv_obj_set_pos(barCont, 0, 5);
150151
lv_obj_t * wrapper = lv_obj_create(barCont);
151152
lv_obj_remove_style_all(wrapper);
152153
lv_obj_set_size(wrapper, TFT_WIDTH * 2, 150);

0 commit comments

Comments
 (0)