Skip to content

Commit b3c662a

Browse files
NaejELNaejEL
committed
Improve UI
1 parent e12ba00 commit b3c662a

10 files changed

+25
-38
lines changed

‎i2ctools.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ int32_t i2ctools_app(void* p) {
105105
}
106106
} else if(event.key == InputKeyDown && event.type == InputTypeRelease) {
107107
if(i2ctools->main_view->current_view == MAIN_VIEW) {
108-
if(i2ctools->main_view->menu_index < MENU_SIZE) {
108+
if(i2ctools->main_view->menu_index < MENU_SIZE - 1) {
109109
i2ctools->main_view->menu_index++;
110110
}
111111
} else if(i2ctools->main_view->current_view == SCAN_VIEW) {

‎images/i2ctools_main_76x59.png

1.23 KB
Loading

‎views/main_view.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
44
canvas_clear(canvas);
55
canvas_set_color(canvas, ColorBlack);
66
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
7-
canvas_draw_icon(canvas, 2, 13, &I_passport_bad3_46x49);
7+
canvas_draw_icon(canvas, 2, 2, &I_i2ctools_main_76x59);
88
canvas_set_font(canvas, FontPrimary);
9-
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, APP_NAME);
9+
//canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, APP_NAME);
1010

1111
switch(main_view->menu_index) {
1212
case SCAN_VIEW:
@@ -15,7 +15,7 @@ void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
1515
canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
1616
canvas_draw_str_aligned(
1717
canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
18-
canvas_draw_rbox(canvas, 60, SCAN_MENU_Y - 2, 60, 13, 3);
18+
canvas_draw_rbox(canvas, 80, SCAN_MENU_Y - 2, 43, 13, 3);
1919
canvas_set_color(canvas, ColorWhite);
2020
canvas_draw_str_aligned(
2121
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
@@ -27,7 +27,7 @@ void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
2727
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
2828
canvas_draw_str_aligned(
2929
canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
30-
canvas_draw_rbox(canvas, 60, SNIFF_MENU_Y - 2, 60, 13, 3);
30+
canvas_draw_rbox(canvas, 80, SNIFF_MENU_Y - 2, 43, 13, 3);
3131
canvas_set_color(canvas, ColorWhite);
3232
canvas_draw_str_aligned(
3333
canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
@@ -39,7 +39,7 @@ void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
3939
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
4040
canvas_draw_str_aligned(
4141
canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
42-
canvas_draw_rbox(canvas, 60, SEND_MENU_Y - 2, 60, 13, 3);
42+
canvas_draw_rbox(canvas, 80, SEND_MENU_Y - 2, 43, 13, 3);
4343
canvas_set_color(canvas, ColorWhite);
4444
canvas_draw_str_aligned(
4545
canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);

‎views/main_view.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
#define APP_NAME "I2C Tools"
66

77
#define SCAN_MENU_TEXT "Scan"
8-
#define SCAN_MENU_X 75
8+
#define SCAN_MENU_X 90
99
#define SCAN_MENU_Y 6
1010

1111
#define SNIFF_MENU_TEXT "Sniff"
12-
#define SNIFF_MENU_X 75
12+
#define SNIFF_MENU_X 90
1313
#define SNIFF_MENU_Y 20
1414

1515
#define SEND_MENU_TEXT "Send"
16-
#define SEND_MENU_X 75
16+
#define SEND_MENU_X 90
1717
#define SEND_MENU_Y 34
1818

1919
// Menu

‎views/scanner_view.c

+11-18
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner) {
44
canvas_clear(canvas);
55
canvas_set_color(canvas, ColorBlack);
66
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
7-
canvas_draw_icon(canvas, 2, 13, &I_passport_happy3_46x49);
8-
canvas_set_font(canvas, FontPrimary);
9-
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SCAN_MENU_TEXT);
107

118
char count_text[46];
129
char count_text_fmt[] = "Found: %d";
@@ -23,21 +20,16 @@ void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner) {
2320
}
2421
snprintf(
2522
count_text, sizeof(count_text), "0x%02x ", (int)i2c_scanner->addresses[idx_to_print]);
26-
if(i < 3) {
27-
x_pos = 50 + (i * 26);
23+
const uint8_t x_start = 13;
24+
if(i < 4) {
25+
x_pos = x_start + (i * 26);
2826
y_pos = 15;
29-
} else if(i < 6) {
30-
x_pos = 50 + ((i - 3) * 26);
27+
} else if(i < 8) {
28+
x_pos = x_start + ((i - 4) * 26);
3129
y_pos = 25;
32-
} else if(i < 9) {
33-
x_pos = 50 + ((i - 6) * 26);
34-
y_pos = 35;
3530
} else if(i < 12) {
36-
x_pos = 50 + ((i - 9) * 26);
37-
y_pos = 45;
38-
} else if(i < 15) {
39-
x_pos = 50 + ((i - 12) * 26);
40-
y_pos = 55;
31+
x_pos = x_start + ((i - 8) * 26);
32+
y_pos = 35;
4133
} else {
4234
break;
4335
}
@@ -48,8 +40,9 @@ void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner) {
4840
canvas_draw_rbox(canvas, 125, y_pos, 3, 10, 1);
4941

5042
// Button
51-
canvas_draw_rbox(canvas, 70, 48, 45, 13, 3);
43+
canvas_draw_rbox(canvas, 45, 48, 45, 13, 3);
5244
canvas_set_color(canvas, ColorWhite);
53-
canvas_draw_icon(canvas, 75, 50, &I_Ok_btn_9x9);
54-
canvas_draw_str_aligned(canvas, 85, 51, AlignLeft, AlignTop, "Scan");
45+
canvas_draw_icon(canvas, 50, 50, &I_Ok_btn_9x9);
46+
canvas_set_font(canvas, FontPrimary);
47+
canvas_draw_str_aligned(canvas, 62, 50, AlignLeft, AlignTop, "Scan");
5548
}

‎views/scanner_view.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#include <i2cTools_icons.h>
55
#include "../i2cscanner.h"
66

7-
#define SCAN_MENU_TEXT "Scan"
8-
#define SCAN_MENU_X 75
9-
#define SCAN_MENU_Y 6
7+
#define SCAN_TEXT "SCAN"
108

119
void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);

‎views/sender_view.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender) {
66
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
77
canvas_draw_icon(canvas, 2, 13, &I_passport_happy2_46x49);
88
canvas_set_font(canvas, FontPrimary);
9-
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SEND_MENU_TEXT);
9+
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SEND_TEXT);
1010

1111
if(!i2c_sender->scanner->scanned) {
1212
scan_i2c_bus(i2c_sender->scanner);

‎views/sender_view.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#include <i2cTools_icons.h>
55
#include "../i2csender.h"
66

7-
#define SEND_MENU_TEXT "Send"
8-
#define SEND_MENU_X 75
9-
#define SEND_MENU_Y 34
7+
#define SEND_TEXT "SEND"
108

119
void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);

‎views/sniffer_view.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer) {
77
canvas_draw_icon(canvas, 2, 13, &I_passport_happy2_46x49);
88

99
canvas_set_font(canvas, FontPrimary);
10-
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
10+
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SNIFF_TEXT);
1111
canvas_set_font(canvas, FontSecondary);
1212

1313
// Button

‎views/sniffer_view.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
#include <i2cTools_icons.h>
55
#include "../i2csniffer.h"
66

7-
#define SNIFF_MENU_TEXT "Sniff"
8-
#define SNIFF_MENU_X 75
9-
#define SNIFF_MENU_Y 20
7+
#define SNIFF_TEXT "SNIFF"
108

119
void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);

0 commit comments

Comments
 (0)