Skip to content

Commit 03f5828

Browse files
author
Wegmann Peter
committed
changed layout ili9341
1 parent 492e3e2 commit 03f5828

File tree

4 files changed

+68
-41
lines changed

4 files changed

+68
-41
lines changed

‎DispAdapter.c‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -200,13 +200,22 @@ void paint_string_row(char *text,ROW_NAME row,uint8_t update,char* unit,uint16_t
200200

201201
void paint_Main(void){
202202
#ifdef ili9341
203-
lcd_Print("Inf:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * INFO ,2,1,1,FGC,BGC);
204-
lcd_Print("Val:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VALUE ,2,1,1,FGC,BGC);
205-
lcd_Print("Vol:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VOLUME ,2,1,1,FGC,BGC);
206-
lcd_Print("Cor:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CORRVOL,2,1,1,FGC,BGC);
207-
lcd_Print("Tmp:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * TEMP ,2,1,1,FGC,BGC);
208-
lcd_Print("Prs:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * PRESS ,2,1,1,FGC,BGC);
209-
lcd_Print("Con:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CONN ,2,1,1,FGC,BGC);
203+
//lcd_Print("Inf:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * DATETIME ,2,1,1,FGC,BGC);
204+
205+
sprintf(strBuff,"HZB-GCM v%i.%i",version.Branch_id,version.Fw_version);
206+
paint_string_row_col(strBuff,VERSION,0,FGC);
207+
208+
if(Time.tm_year != 0){
209+
sprintf(strBuff,"%02i.%02i.%04i ", Time.tm_mday,Time.tm_mon,Time.tm_year);
210+
paint_string_row_col(strBuff,DATETIME,0,FGC);
211+
}
212+
213+
lcd_Print("Value :",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VALUE ,2,1,1,FGC,BGC);
214+
lcd_Print("Volume:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * VOLUME ,2,1,1,FGC,BGC);
215+
lcd_Print("CorVol:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CORRVOL,2,1,1,FGC,BGC);
216+
lcd_Print("Temp. :",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * TEMP ,2,1,1,FGC,BGC);
217+
lcd_Print("Press.:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * PRESS ,2,1,1,FGC,BGC);
218+
lcd_Print("Coord.:",X_LEFT_EDGE ,Y_VALUES_START + FONT2_H * CONN ,2,1,1,FGC,BGC);
210219

211220
#endif
212221
}
@@ -305,12 +314,12 @@ void paint_send_stored_meas(uint8_t meas_in_Buffer, uint8_t max_Number, uint8_t
305314
#ifdef ili9341
306315
if (!update)
307316
{
308-
paint_string_row(xbee_get_coordID(),CONN,0,"", green);
309-
paint_string_row_col("Sending Datasets",MULT1,0,green);
317+
//paint_string_row(xbee_get_coordID(),CONN,0,"", green);
318+
paint_string_row_col("Sending Datasets ",CONN,0,green);
310319
}
311320

312321
sprintf(strBuff,"Buffer: %03d/%03d",meas_in_Buffer,max_Number);
313-
paint_string_row_col(strBuff,MULT2,0,green);
322+
paint_string_row_col(strBuff,MULT1,0,green);
314323
#endif
315324

316325
#ifdef GCM_old_disp
@@ -420,50 +429,53 @@ void displayTemPreVol(void){
420429

421430
DS3231M_read_time();
422431

423-
424-
if (connected.TWI && connected.DS3231M)
425-
{
426-
sprintf(strBuff,"%02i:%02i", Time.tm_hour, Time.tm_min);
427432

428-
}
429-
else
430-
{
431-
sprintf(strBuff,"NoI2C");
432-
}
433-
434433

435-
436-
434+
437435

438436
uint8_t indicator = activity_indicator % 4;
437+
char indStr[30] = " ";
439438
switch (indicator)
440439
{
441440
case 0:
442-
strcat(strBuff,"|");
441+
sprintf(indStr, "|");
443442
break;
444443
case 1:
445-
strcat(strBuff,"/");
444+
sprintf(indStr, "/");
446445
break;
447446
case 2:
448-
strcat(strBuff,"-");
447+
sprintf(indStr, "-");
449448
break;
450449
case 3:
451-
strcat(strBuff,"\\");
450+
sprintf(indStr, "\\");
452451
break;
453452
}
454453

455-
char versionStr[10];
456-
sprintf(versionStr,"v%i.%i",version.Branch_id,version.Fw_version);
454+
457455

458-
strcat(strBuff,versionStr);
456+
if (connected.TWI && connected.DS3231M)
457+
{
458+
sprintf(strBuff," %02i:%02i",Time.tm_hour, Time.tm_min);
459+
}
460+
else
461+
{
462+
sprintf(strBuff," NoI2C");
463+
}
459464

465+
strcat(indStr,strBuff);
466+
467+
paint_string_row_col(indStr,DATETIME,11, FGC);
460468

461-
paint_string_row_col(strBuff,INFO,4, FGC);
469+
470+
471+
472+
473+
462474

463475
xbee_get_DB();
464476

465-
uint16_t x = X_LEFT_EDGE + (DESCRUPTOR_LEN+ 12) * FONT2_W+FONT2_W/2;
466-
uint16_t y = Y_VALUES_START + FONT2_H * INFO;
477+
uint16_t x = X_LEFT_EDGE + 16 * FONT2_W+FONT2_W/2;
478+
uint16_t y = Y_VALUES_START + FONT2_H * VERSION;
467479

468480
if (ex_mode == online)
469481
{
@@ -480,6 +492,8 @@ void displayTemPreVol(void){
480492
}
481493
if(xbee.netstat == NO_NETWORK){
482494
paint_string_row(xbee_get_coordID(),CONN,0,"", red);
495+
496+
LCD_conn_Stregth(1,xbee.RSSI,x, y, dark_red);
483497
}
484498
}
485499

@@ -677,7 +691,7 @@ void I2C_Clear_view(uint8_t i2cState,uint8_t DS3231State, uint8_t BMPSate){
677691

678692
#ifdef ili9341
679693
sprintf(twiStr,"clearBUS:%d",i2cState);
680-
paint_string_row_col("I2C Bus Recovery",INFO,0,white);
694+
paint_string_row_col("I2C Bus Recovery",DATETIME,0,white);
681695
paint_string_row(twiStr,VALUE,1,"",FGC);
682696

683697
if (!DS3231State)
@@ -789,4 +803,10 @@ void reset_display(uint8_t clear)
789803
#endif
790804

791805

806+
}
807+
808+
void paint_Date(void){
809+
sprintf(strBuff,"%02i.%02i.%04i ", Time.tm_mday,Time.tm_mon,Time.tm_year+2000);
810+
paint_string_row_col(strBuff,DATETIME,0,FGC);
811+
792812
}

‎DispAdapter.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
#define HZB_Cyan 0b0000010011111100
4040

4141
typedef enum {
42-
INFO,
42+
VERSION,
43+
DATETIME,
4344
VALUE,
4445
VOLUME,
4546
CORRVOL,
@@ -93,5 +94,6 @@ void paint_send_stored_meas(uint8_t meas_in_Buffer, uint8_t max_Number, uint8_t
9394
void displayTemPreVol(void);
9495
void reset_display(uint8_t clear);
9596
void I2C_Clear_view(uint8_t i2cState,uint8_t DS3231State, uint8_t BMPSate);
97+
void paint_Date(void);
9698

9799
#endif /* DISPADAPTER_H_ */

‎Gascounter_main.c‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,8 @@ uint8_t ping_server(void)
12501250
}
12511251

12521252
}
1253+
1254+
paint_Date();
12531255
return 1;
12541256
}
12551257

@@ -1644,8 +1646,7 @@ int main(void)
16441646

16451647
_Bool CoordActive = false;
16461648

1647-
// set default sc mask
1648-
xbee_Set_Scan_Channels(xbee.ScanChannels);
1649+
16491650
// main part
16501651
while(1)
16511652
{
@@ -1694,7 +1695,11 @@ int main(void)
16941695
#endif
16951696

16961697
#ifdef USE_XBEE
1698+
// set default sc mask
1699+
xbee_Set_Scan_Channels(xbee.ScanChannels);
16971700

1701+
sprintf(print_temp,"SC:%#04x",xbee_Scan_Channels());
1702+
Print_add_Line(print_temp,2);
16981703

16991704
if(xbee_reset_connection(0))
17001705
{
@@ -2028,7 +2033,7 @@ int main(void)
20282033
{
20292034

20302035
uint8_t i2cState = I2C_ClearBus();
2031-
uint8_t DS3231Mstate = 0;
2036+
uint8_t DS3231Mstate = 0;
20322037
uint8_t BMPState = 0;
20332038

20342039
connected.TWI = 1;
@@ -2042,11 +2047,11 @@ int main(void)
20422047
DS3231M_read_time();
20432048

20442049
DS3231Mstate = CHECK_ERROR(TIMER_ERROR);
2045-
2050+
20462051
if(!DS3231Mstate)
20472052
{
20482053
CLEAR_ERROR(I2C_BUS_ERROR);
2049-
2054+
20502055
}
20512056

20522057

@@ -2071,7 +2076,7 @@ int main(void)
20712076
connected.TWI = 1;
20722077
}
20732078

2074-
I2C_Clear_view(i2cState,DS3231Mstate,BMPState);
2079+
I2C_Clear_view(i2cState,DS3231Mstate,BMPState);
20752080

20762081
}
20772082

‎StringPixelCoordTable_ili9341.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
//======================================================================================
7171
#define X_LEFT_EDGE (BORDER_OFFSET+3)
7272
#define Y_VALUES_START 60
73-
#define DESCRUPTOR_LEN 4
73+
#define DESCRUPTOR_LEN 8
7474

7575

7676

0 commit comments

Comments
 (0)