Skip to content

Commit f7c04a6

Browse files
NaejELNaejEL
committed
Better Menu organisation
1 parent d34e267 commit f7c04a6

12 files changed

+348
-330
lines changed

‎i2csender.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma once
2+
13
#include <furi.h>
24
#include <furi_hal.h>
35
#include "i2cscanner.h"

‎i2csniffer.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#pragma once
2+
13
#include <furi.h>
24
#include <furi_hal.h>
35

‎i2ctools.c

+36-316
Large diffs are not rendered by default.

‎i2ctools_i.h

+5-14
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,15 @@
66
#include "i2csniffer.h"
77
#include "i2cscanner.h"
88
#include "i2csender.h"
9-
10-
// Menu
11-
typedef enum {
12-
MAIN_VIEW,
13-
SCAN_VIEW,
14-
SNIFF_VIEW,
15-
SEND_VIEW,
16-
PLAY_VIEW,
17-
18-
/* Know menu Size*/
19-
MENU_SIZE
20-
} i2cToolsMainMenu;
9+
#include "views/main_view.h"
10+
#include "views/sniffer_view.h"
11+
#include "views/scanner_view.h"
12+
#include "views/sender_view.h"
2113

2214
// App datas
2315
typedef struct {
2416
ViewPort* view_port;
25-
i2cToolsMainMenu current_menu;
26-
uint8_t main_menu_index;
17+
i2cMainView* main_view;
2718

2819
i2cScanner* scanner;
2920
i2cSniffer* sniffer;

‎views/main_view.c

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#include "main_view.h"
2+
3+
void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
4+
canvas_clear(canvas);
5+
canvas_set_color(canvas, ColorBlack);
6+
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
7+
canvas_draw_icon(canvas, 2, 13, &I_passport_bad3_46x49);
8+
canvas_set_font(canvas, FontPrimary);
9+
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, APP_NAME);
10+
11+
switch(main_view->menu_index) {
12+
case SCAN_VIEW:
13+
canvas_set_color(canvas, ColorBlack);
14+
canvas_draw_str_aligned(
15+
canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
16+
canvas_draw_str_aligned(
17+
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);
19+
canvas_set_color(canvas, ColorWhite);
20+
canvas_draw_str_aligned(
21+
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
22+
break;
23+
24+
case SNIFF_VIEW:
25+
canvas_set_color(canvas, ColorBlack);
26+
canvas_draw_str_aligned(
27+
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
28+
canvas_draw_str_aligned(
29+
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);
31+
canvas_set_color(canvas, ColorWhite);
32+
canvas_draw_str_aligned(
33+
canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
34+
break;
35+
36+
case SEND_VIEW:
37+
canvas_set_color(canvas, ColorBlack);
38+
canvas_draw_str_aligned(
39+
canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
40+
canvas_draw_str_aligned(
41+
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);
43+
canvas_set_color(canvas, ColorWhite);
44+
canvas_draw_str_aligned(
45+
canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
46+
break;
47+
48+
default:
49+
break;
50+
}
51+
}
52+
53+
i2cMainView* i2c_main_view_alloc() {
54+
i2cMainView* main_view = malloc(sizeof(i2cMainView));
55+
main_view->menu_index = SCAN_VIEW;
56+
main_view->current_view = MAIN_VIEW;
57+
return main_view;
58+
}
59+
60+
void i2c_main_view_free(i2cMainView* main_view) {
61+
furi_assert(main_view);
62+
free(main_view);
63+
}

‎views/main_view.h

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#include <furi.h>
2+
#include <furi_hal.h>
3+
#include <gui/gui.h>
4+
5+
#define APP_NAME "I2C Tools"
6+
7+
#define SCAN_MENU_TEXT "Scan"
8+
#define SCAN_MENU_X 75
9+
#define SCAN_MENU_Y 6
10+
11+
#define SNIFF_MENU_TEXT "Sniff"
12+
#define SNIFF_MENU_X 75
13+
#define SNIFF_MENU_Y 20
14+
15+
#define SEND_MENU_TEXT "Send"
16+
#define SEND_MENU_X 75
17+
#define SEND_MENU_Y 34
18+
19+
// Menu
20+
typedef enum {
21+
MAIN_VIEW,
22+
SCAN_VIEW,
23+
SNIFF_VIEW,
24+
SEND_VIEW,
25+
26+
/* Know menu Size*/
27+
MENU_SIZE
28+
} i2cToolsViews;
29+
30+
typedef struct {
31+
i2cToolsViews current_view;
32+
i2cToolsViews menu_index;
33+
} i2cMainView;
34+
35+
void draw_main_view(Canvas* canvas, i2cMainView* main_view);
36+
37+
i2cMainView* i2c_main_view_alloc();
38+
void i2c_main_view_free(i2cMainView* main_view);

‎views/scanner_view.c

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
#include "scanner_view.h"
2+
3+
void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner) {
4+
canvas_clear(canvas);
5+
canvas_set_color(canvas, ColorBlack);
6+
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);
10+
11+
char count_text[46];
12+
char count_text_fmt[] = "Found: %d";
13+
canvas_set_font(canvas, FontSecondary);
14+
snprintf(count_text, sizeof(count_text), count_text_fmt, (int)i2c_scanner->nb_found);
15+
canvas_draw_str_aligned(canvas, 50, 3, AlignLeft, AlignTop, count_text);
16+
uint8_t x_pos = 0;
17+
uint8_t y_pos = 0;
18+
uint8_t idx_to_print = 0;
19+
for(uint8_t i = 0; i < (int)i2c_scanner->nb_found; i++) {
20+
idx_to_print = i + i2c_scanner->menu_index * 3;
21+
if(idx_to_print >= MAX_I2C_ADDR) {
22+
break;
23+
}
24+
snprintf(
25+
count_text, sizeof(count_text), "0x%02x ", (int)i2c_scanner->addresses[idx_to_print]);
26+
if(i < 3) {
27+
x_pos = 50 + (i * 26);
28+
y_pos = 15;
29+
} else if(i < 6) {
30+
x_pos = 50 + ((i - 3) * 26);
31+
y_pos = 25;
32+
} else if(i < 9) {
33+
x_pos = 50 + ((i - 6) * 26);
34+
y_pos = 35;
35+
} 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;
41+
} else {
42+
break;
43+
}
44+
canvas_draw_str_aligned(canvas, x_pos, y_pos, AlignLeft, AlignTop, count_text);
45+
}
46+
// Right cursor
47+
y_pos = 14 + i2c_scanner->menu_index;
48+
canvas_draw_rbox(canvas, 125, y_pos, 3, 10, 1);
49+
50+
// Button
51+
canvas_draw_rbox(canvas, 70, 48, 45, 13, 3);
52+
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");
55+
}

‎views/scanner_view.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#include <furi.h>
2+
#include <furi_hal.h>
3+
#include <gui/gui.h>
4+
5+
#include "../i2cscanner.h"
6+
7+
#define SCAN_MENU_TEXT "Scan"
8+
#define SCAN_MENU_X 75
9+
#define SCAN_MENU_Y 6
10+
11+
void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);

‎views/sender_view.c

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
#include "sender_view.h"
2+
3+
void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender) {
4+
canvas_clear(canvas);
5+
canvas_set_color(canvas, ColorBlack);
6+
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
7+
canvas_draw_icon(canvas, 2, 13, &I_passport_happy2_46x49);
8+
canvas_set_font(canvas, FontPrimary);
9+
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SEND_MENU_TEXT);
10+
11+
if(!i2c_sender->scanner->scanned) {
12+
scan_i2c_bus(i2c_sender->scanner);
13+
}
14+
15+
canvas_set_font(canvas, FontSecondary);
16+
if(i2c_sender->scanner->nb_found <= 0) {
17+
canvas_draw_str_aligned(canvas, 60, 5, AlignLeft, AlignTop, "No peripherals");
18+
canvas_draw_str_aligned(canvas, 60, 15, AlignLeft, AlignTop, "Found");
19+
return;
20+
}
21+
canvas_draw_rbox(canvas, 70, 48, 45, 13, 3);
22+
canvas_set_color(canvas, ColorWhite);
23+
canvas_draw_icon(canvas, 75, 50, &I_Ok_btn_9x9);
24+
canvas_draw_str_aligned(canvas, 85, 51, AlignLeft, AlignTop, "Send");
25+
canvas_set_color(canvas, ColorBlack);
26+
canvas_draw_str_aligned(canvas, 50, 5, AlignLeft, AlignTop, "Addr: ");
27+
canvas_draw_icon(canvas, 80, 5, &I_ButtonLeft_4x7);
28+
canvas_draw_icon(canvas, 115, 5, &I_ButtonRight_4x7);
29+
char addr_text[8];
30+
snprintf(
31+
addr_text,
32+
sizeof(addr_text),
33+
"0x%02x",
34+
(int)i2c_sender->scanner->addresses[i2c_sender->address_idx]);
35+
canvas_draw_str_aligned(canvas, 90, 5, AlignLeft, AlignTop, addr_text);
36+
canvas_draw_str_aligned(canvas, 50, 15, AlignLeft, AlignTop, "Value: ");
37+
38+
canvas_draw_icon(canvas, 80, 17, &I_ButtonUp_7x4);
39+
canvas_draw_icon(canvas, 115, 17, &I_ButtonDown_7x4);
40+
snprintf(addr_text, sizeof(addr_text), "0x%02x", (int)i2c_sender->value);
41+
canvas_draw_str_aligned(canvas, 90, 15, AlignLeft, AlignTop, addr_text);
42+
if(i2c_sender->must_send) {
43+
i2c_send(i2c_sender);
44+
}
45+
canvas_draw_str_aligned(canvas, 50, 25, AlignLeft, AlignTop, "Result: ");
46+
if(i2c_sender->sended) {
47+
for(uint8_t i = 0; i < sizeof(i2c_sender->recv); i++) {
48+
snprintf(addr_text, sizeof(addr_text), "0x%02x", (int)i2c_sender->recv[i]);
49+
canvas_draw_str_aligned(canvas, 90, 25 + (i * 10), AlignLeft, AlignTop, addr_text);
50+
}
51+
}
52+
}

‎views/sender_view.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#include <furi.h>
2+
#include <furi_hal.h>
3+
#include <gui/gui.h>
4+
5+
#include "../i2csender.h"
6+
7+
#define SEND_MENU_TEXT "Send"
8+
#define SEND_MENU_X 75
9+
#define SEND_MENU_Y 34
10+
11+
void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);

‎views/sniffer_view.c

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#include "sniffer_view.h"
2+
3+
void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer) {
4+
canvas_clear(canvas);
5+
canvas_set_color(canvas, ColorBlack);
6+
canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
7+
canvas_draw_icon(canvas, 2, 13, &I_passport_happy2_46x49);
8+
9+
canvas_set_font(canvas, FontPrimary);
10+
canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
11+
canvas_set_font(canvas, FontSecondary);
12+
13+
// Button
14+
canvas_draw_rbox(canvas, 70, 48, 45, 13, 3);
15+
canvas_set_color(canvas, ColorWhite);
16+
canvas_draw_icon(canvas, 75, 50, &I_Ok_btn_9x9);
17+
if(!i2c_sniffer->started) {
18+
canvas_draw_str_aligned(canvas, 85, 51, AlignLeft, AlignTop, "Start");
19+
} else {
20+
canvas_draw_str_aligned(canvas, 85, 51, AlignLeft, AlignTop, "Stop");
21+
}
22+
canvas_set_color(canvas, ColorBlack);
23+
// Address text
24+
char addr_text[8];
25+
snprintf(
26+
addr_text,
27+
sizeof(addr_text),
28+
"0x%02x",
29+
(int)(i2c_sniffer->frames[i2c_sniffer->menu_index].data[0] >> 1));
30+
canvas_draw_str_aligned(canvas, 50, 3, AlignLeft, AlignTop, "Addr: ");
31+
canvas_draw_str_aligned(canvas, 75, 3, AlignLeft, AlignTop, addr_text);
32+
// R/W
33+
if((int)(i2c_sniffer->frames[i2c_sniffer->menu_index].data[0]) % 2 == 0) {
34+
canvas_draw_str_aligned(canvas, 105, 3, AlignLeft, AlignTop, "W");
35+
} else {
36+
canvas_draw_str_aligned(canvas, 105, 3, AlignLeft, AlignTop, "R");
37+
}
38+
// nbFrame text
39+
canvas_draw_str_aligned(canvas, 50, 13, AlignLeft, AlignTop, "Frames: ");
40+
snprintf(addr_text, sizeof(addr_text), "%d", (int)i2c_sniffer->menu_index + 1);
41+
canvas_draw_str_aligned(canvas, 90, 13, AlignLeft, AlignTop, addr_text);
42+
canvas_draw_str_aligned(canvas, 100, 13, AlignLeft, AlignTop, "/");
43+
snprintf(addr_text, sizeof(addr_text), "%d", (int)i2c_sniffer->frame_index + 1);
44+
canvas_draw_str_aligned(canvas, 110, 13, AlignLeft, AlignTop, addr_text);
45+
// Frames content
46+
uint8_t x_pos = 0;
47+
uint8_t y_pos = 23;
48+
for(uint8_t i = 1; i < i2c_sniffer->frames[i2c_sniffer->menu_index].data_index; i++) {
49+
snprintf(
50+
addr_text,
51+
sizeof(addr_text),
52+
"0x%02x",
53+
(int)i2c_sniffer->frames[i2c_sniffer->menu_index].data[i]);
54+
x_pos = 50 + (i - 1) * 35;
55+
canvas_draw_str_aligned(canvas, x_pos, y_pos, AlignLeft, AlignTop, addr_text);
56+
if(i2c_sniffer->frames[i2c_sniffer->menu_index].ack[i]) {
57+
canvas_draw_str_aligned(canvas, x_pos + 24, y_pos, AlignLeft, AlignTop, "A");
58+
} else {
59+
canvas_draw_str_aligned(canvas, x_pos + 24, y_pos, AlignLeft, AlignTop, "N");
60+
}
61+
}
62+
}

‎views/sniffer_view.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#include <furi.h>
2+
#include <furi_hal.h>
3+
#include <gui/gui.h>
4+
5+
#include "../i2csniffer.h"
6+
7+
#define SNIFF_MENU_TEXT "Sniff"
8+
#define SNIFF_MENU_X 75
9+
#define SNIFF_MENU_Y 20
10+
11+
void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);

0 commit comments

Comments
 (0)