Temporarily backport app updates from apps repo

applications/external/i2ctools/views/infos_view.c

@@ -0,0 +1,15 @@
+#include "infos_view.h"
+
+void draw_infos_view(Canvas* canvas) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
+    canvas_set_font(canvas, FontSecondary);
+
+    canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, "Wiring: ");
+    canvas_draw_str_aligned(canvas, 43, 3, AlignLeft, AlignTop, "C0->SCL");
+    canvas_draw_str_aligned(canvas, 43, 13, AlignLeft, AlignTop, "C1->SDA");
+    canvas_draw_str_aligned(canvas, 43, 23, AlignLeft, AlignTop, "GND->GND");
+    canvas_draw_icon(canvas, 15, 33, &I_Voltage_16x16);
+    canvas_draw_str_aligned(canvas, 30, 38, AlignLeft, AlignTop, "Only use 3v3 levels");
+}

applications/external/i2ctools/views/infos_view.h

@@ -0,0 +1,10 @@
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <i2ctools_icons.h>
+
+#include <assets_icons.h>
+
+#define INFOS_TEXT "INFOS"
+
+void draw_infos_view(Canvas* canvas);

applications/external/i2ctools/views/main_view.c

@@ -0,0 +1,82 @@
+#include "main_view.h"
+
+void draw_main_view(Canvas* canvas, i2cMainView* main_view) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
+    canvas_draw_icon(canvas, 2, 2, &I_i2ctools_main_76x59);
+    canvas_set_font(canvas, FontPrimary);
+
+    switch(main_view->menu_index) {
+    case SCAN_VIEW:
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_str_aligned(
+            canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, INFOS_MENU_X, INFOS_MENU_Y, AlignLeft, AlignTop, INFOS_MENU_TEXT);
+        canvas_draw_rbox(canvas, 80, SCAN_MENU_Y - 2, 43, 13, 3);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_str_aligned(
+            canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
+        break;
+
+    case SNIFF_VIEW:
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_str_aligned(
+            canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, INFOS_MENU_X, INFOS_MENU_Y, AlignLeft, AlignTop, INFOS_MENU_TEXT);
+        canvas_draw_rbox(canvas, 80, SNIFF_MENU_Y - 2, 43, 13, 3);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_str_aligned(
+            canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
+        break;
+
+    case SEND_VIEW:
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_str_aligned(
+            canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, INFOS_MENU_X, INFOS_MENU_Y, AlignLeft, AlignTop, INFOS_MENU_TEXT);
+        canvas_draw_rbox(canvas, 80, SEND_MENU_Y - 2, 43, 13, 3);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_str_aligned(
+            canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
+        break;
+
+    case INFOS_VIEW:
+        canvas_set_color(canvas, ColorBlack);
+        canvas_draw_str_aligned(
+            canvas, SCAN_MENU_X, SCAN_MENU_Y, AlignLeft, AlignTop, SCAN_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, SNIFF_MENU_X, SNIFF_MENU_Y, AlignLeft, AlignTop, SNIFF_MENU_TEXT);
+        canvas_draw_str_aligned(
+            canvas, SEND_MENU_X, SEND_MENU_Y, AlignLeft, AlignTop, SEND_MENU_TEXT);
+        canvas_draw_rbox(canvas, 80, INFOS_MENU_Y - 2, 43, 13, 3);
+        canvas_set_color(canvas, ColorWhite);
+        canvas_draw_str_aligned(
+            canvas, INFOS_MENU_X, INFOS_MENU_Y, AlignLeft, AlignTop, INFOS_MENU_TEXT);
+        break;
+
+    default:
+        break;
+    }
+}
+
+i2cMainView* i2c_main_view_alloc() {
+    i2cMainView* main_view = malloc(sizeof(i2cMainView));
+    main_view->menu_index = SCAN_VIEW;
+    main_view->current_view = MAIN_VIEW;
+    return main_view;
+}
+
+void i2c_main_view_free(i2cMainView* main_view) {
+    furi_assert(main_view);
+    free(main_view);
+}

applications/external/i2ctools/views/main_view.h

@@ -0,0 +1,45 @@
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <i2ctools_icons.h>
+#define APP_NAME "I2C Tools"
+
+#include <assets_icons.h>
+
+#define SCAN_MENU_TEXT "Scan"
+#define SCAN_MENU_X 90
+#define SCAN_MENU_Y 7
+
+#define SNIFF_MENU_TEXT "Sniff"
+#define SNIFF_MENU_X 90
+#define SNIFF_MENU_Y 21
+
+#define SEND_MENU_TEXT "Send"
+#define SEND_MENU_X 90
+#define SEND_MENU_Y 35
+
+#define INFOS_MENU_TEXT "Infos"
+#define INFOS_MENU_X 90
+#define INFOS_MENU_Y 49
+
+// Menu
+typedef enum {
+    MAIN_VIEW,
+    SCAN_VIEW,
+    SNIFF_VIEW,
+    SEND_VIEW,
+    INFOS_VIEW,
+
+    /* Know menu Size*/
+    MENU_SIZE
+} i2cToolsViews;
+
+typedef struct {
+    i2cToolsViews current_view;
+    i2cToolsViews menu_index;
+} i2cMainView;
+
+void draw_main_view(Canvas* canvas, i2cMainView* main_view);
+
+i2cMainView* i2c_main_view_alloc();
+void i2c_main_view_free(i2cMainView* main_view);

applications/external/i2ctools/views/scanner_view.c

@@ -0,0 +1,47 @@
+#include "scanner_view.h"
+
+void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
+
+    char count_text[46];
+    char count_text_fmt[] = "Peripherals Found: %d";
+    canvas_set_font(canvas, FontSecondary);
+    snprintf(count_text, sizeof(count_text), count_text_fmt, (int)i2c_scanner->nb_found);
+    canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, count_text);
+    uint8_t x_pos = 0;
+    uint8_t y_pos = 0;
+    uint8_t idx_to_print = 0;
+    for(uint8_t i = 0; i < (int)i2c_scanner->nb_found; i++) {
+        idx_to_print = i + i2c_scanner->menu_index * 3;
+        if(idx_to_print >= MAX_I2C_ADDR) {
+            break;
+        }
+        snprintf(
+            count_text, sizeof(count_text), "0x%02x ", (int)i2c_scanner->addresses[idx_to_print]);
+        const uint8_t x_start = 3;
+        if(i < 4) {
+            x_pos = x_start + (i * 26);
+            y_pos = 15;
+        } else if(i < 8) {
+            x_pos = x_start + ((i - 4) * 26);
+            y_pos = 25;
+        } else if(i < 12) {
+            x_pos = x_start + ((i - 8) * 26);
+            y_pos = 35;
+        } else {
+            break;
+        }
+        canvas_draw_str_aligned(canvas, x_pos, y_pos, AlignLeft, AlignTop, count_text);
+    }
+    // Right cursor
+    y_pos = 14 + i2c_scanner->menu_index;
+    canvas_draw_rbox(canvas, 125, y_pos, 3, 10, 1);
+
+    // Button
+    canvas_draw_rbox(canvas, 45, 48, 45, 13, 3);
+    canvas_set_color(canvas, ColorWhite);
+    canvas_draw_icon(canvas, 50, 50, &I_Ok_btn_9x9);
+    canvas_draw_str_aligned(canvas, 62, 51, AlignLeft, AlignTop, "Scan");
+}

applications/external/i2ctools/views/scanner_view.h

@@ -0,0 +1,11 @@
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <i2ctools_icons.h>
+#include "../i2cscanner.h"
+
+#include <assets_icons.h>
+
+#define SCAN_TEXT "SCAN"
+
+void draw_scanner_view(Canvas* canvas, i2cScanner* i2c_scanner);

applications/external/i2ctools/views/sender_view.c

@@ -0,0 +1,70 @@
+#include "sender_view.h"
+
+void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
+
+    if(!i2c_sender->scanner->scanned) {
+        scan_i2c_bus(i2c_sender->scanner);
+    }
+
+    canvas_set_font(canvas, FontSecondary);
+    if(i2c_sender->scanner->nb_found <= 0) {
+        canvas_draw_str_aligned(canvas, 20, 5, AlignLeft, AlignTop, "No peripherals found");
+        return;
+    }
+    // Send Button
+    canvas_draw_rbox(canvas, 45, 48, 45, 13, 3);
+    canvas_set_color(canvas, ColorWhite);
+    canvas_draw_icon(canvas, 50, 50, &I_Ok_btn_9x9);
+    canvas_draw_str_aligned(canvas, 62, 51, AlignLeft, AlignTop, "Send");
+    // Addr
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_str_aligned(canvas, 3, 5, AlignLeft, AlignTop, "Addr: ");
+    canvas_draw_icon(canvas, 33, 5, &I_ButtonLeft_4x7);
+    canvas_draw_icon(canvas, 68, 5, &I_ButtonRight_4x7);
+    char addr_text[8];
+    snprintf(
+        addr_text,
+        sizeof(addr_text),
+        "0x%02x",
+        (int)i2c_sender->scanner->addresses[i2c_sender->address_idx]);
+    canvas_draw_str_aligned(canvas, 43, 5, AlignLeft, AlignTop, addr_text);
+    // Value
+    canvas_draw_str_aligned(canvas, 3, 15, AlignLeft, AlignTop, "Value: ");
+    canvas_draw_icon(canvas, 33, 17, &I_ButtonUp_7x4);
+    canvas_draw_icon(canvas, 68, 17, &I_ButtonDown_7x4);
+    snprintf(addr_text, sizeof(addr_text), "0x%02x", (int)i2c_sender->value);
+    canvas_draw_str_aligned(canvas, 43, 15, AlignLeft, AlignTop, addr_text);
+    if(i2c_sender->must_send) {
+        i2c_send(i2c_sender);
+    }
+    // Result
+    canvas_draw_str_aligned(canvas, 3, 25, AlignLeft, AlignTop, "Result: ");
+    if(i2c_sender->sended) {
+        uint8_t row = 1;
+        uint8_t column = 1;
+        const uint8_t x_min = 3;
+        const uint8_t y_min = 25;
+        uint8_t x_pos = 0;
+        uint8_t y_pos = 0;
+        for(uint8_t i = 0; i < sizeof(i2c_sender->recv); i++) {
+            x_pos = x_min + (column - 1) * 35;
+            if(row == 1) {
+                x_pos += 40;
+            }
+            y_pos = y_min + (row - 1) * 10;
+            snprintf(addr_text, sizeof(addr_text), "0x%02x", (int)i2c_sender->recv[i]);
+            canvas_draw_str_aligned(canvas, x_pos, y_pos, AlignLeft, AlignTop, addr_text);
+            column++;
+            if((row > 1 && column > 3) || (row == 1 && column > 2)) {
+                column = 1;
+                row++;
+            }
+            if(row > 2) {
+                break;
+            }
+        }
+    }
+}

applications/external/i2ctools/views/sender_view.h

@@ -0,0 +1,11 @@
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <i2ctools_icons.h>
+#include "../i2csender.h"
+
+#include <assets_icons.h>
+
+#define SEND_TEXT "SEND"
+
+void draw_sender_view(Canvas* canvas, i2cSender* i2c_sender);

applications/external/i2ctools/views/sniffer_view.c

@@ -0,0 +1,92 @@
+#include "sniffer_view.h"
+
+void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer) {
+    canvas_clear(canvas);
+    canvas_set_color(canvas, ColorBlack);
+    canvas_draw_rframe(canvas, 0, 0, 128, 64, 3);
+    canvas_set_font(canvas, FontSecondary);
+
+    // Button
+    canvas_draw_rbox(canvas, 40, 48, 45, 13, 3);
+    canvas_set_color(canvas, ColorWhite);
+    canvas_draw_icon(canvas, 45, 50, &I_Ok_btn_9x9);
+    if(!i2c_sniffer->started) {
+        canvas_draw_str_aligned(canvas, 57, 51, AlignLeft, AlignTop, "Start");
+    } else {
+        canvas_draw_str_aligned(canvas, 57, 51, AlignLeft, AlignTop, "Stop");
+    }
+    canvas_set_color(canvas, ColorBlack);
+    if(i2c_sniffer->first) {
+        canvas_draw_str_aligned(canvas, 30, 3, AlignLeft, AlignTop, "Nothing Recorded");
+        return;
+    }
+    char text_buffer[10];
+    // nbFrame text
+    canvas_draw_str_aligned(canvas, 3, 3, AlignLeft, AlignTop, "Frame: ");
+    snprintf(
+        text_buffer,
+        sizeof(text_buffer),
+        "%d/%d",
+        (int)i2c_sniffer->menu_index + 1,
+        (int)i2c_sniffer->frame_index + 1);
+    canvas_draw_str_aligned(canvas, 38, 3, AlignLeft, AlignTop, text_buffer);
+    // Address text
+    snprintf(
+        text_buffer,
+        sizeof(text_buffer),
+        "0x%02x",
+        (int)(i2c_sniffer->frames[i2c_sniffer->menu_index].data[0] >> 1));
+    canvas_draw_str_aligned(canvas, 3, 13, AlignLeft, AlignTop, "Addr: ");
+    canvas_draw_str_aligned(canvas, 30, 13, AlignLeft, AlignTop, text_buffer);
+    // R/W
+    if((int)(i2c_sniffer->frames[i2c_sniffer->menu_index].data[0]) % 2 == 0) {
+        canvas_draw_str_aligned(canvas, 58, 13, AlignLeft, AlignTop, "Write");
+    } else {
+        canvas_draw_str_aligned(canvas, 58, 13, AlignLeft, AlignTop, "Read");
+    }
+    // ACK
+    if(i2c_sniffer->frames[i2c_sniffer->menu_index].ack[0]) {
+        canvas_draw_str_aligned(canvas, 90, 13, AlignLeft, AlignTop, "ACK");
+    } else {
+        canvas_draw_str_aligned(canvas, 90, 13, AlignLeft, AlignTop, "NACK");
+    }
+    // Frames content
+    const uint8_t x_min = 3;
+    const uint8_t y_min = 23;
+    uint8_t x_pos = 0;
+    uint8_t y_pos = 0;
+    uint8_t row = 1;
+    uint8_t column = 1;
+    uint8_t frame_size = i2c_sniffer->frames[i2c_sniffer->menu_index].data_index;
+    uint8_t offset = i2c_sniffer->row_index;
+    if(i2c_sniffer->row_index > 0) {
+        offset += 1;
+    }
+    canvas_draw_str_aligned(canvas, x_min, y_min, AlignLeft, AlignTop, "Data:");
+    for(uint8_t i = 1 + offset; i < frame_size; i++) {
+        snprintf(
+            text_buffer,
+            sizeof(text_buffer),
+            "0x%02x",
+            (int)i2c_sniffer->frames[i2c_sniffer->menu_index].data[i]);
+        x_pos = x_min + (column - 1) * 35;
+        if(row == 1) {
+            x_pos += 30;
+        }
+        y_pos = y_min + (row - 1) * 10;
+        canvas_draw_str_aligned(canvas, x_pos, y_pos, AlignLeft, AlignTop, text_buffer);
+        if(i2c_sniffer->frames[i2c_sniffer->menu_index].ack[i]) {
+            canvas_draw_str_aligned(canvas, x_pos + 24, y_pos, AlignLeft, AlignTop, "A");
+        } else {
+            canvas_draw_str_aligned(canvas, x_pos + 24, y_pos, AlignLeft, AlignTop, "N");
+        }
+        column++;
+        if((row > 1 && column > 3) || (row == 1 && column > 2)) {
+            column = 1;
+            row++;
+        }
+        if(row > 2) {
+            break;
+        }
+    }
+}

applications/external/i2ctools/views/sniffer_view.h

@@ -0,0 +1,11 @@
+#include <furi.h>
+#include <furi_hal.h>
+#include <gui/gui.h>
+#include <i2ctools_icons.h>
+#include "../i2csniffer.h"
+
+#include <assets_icons.h>
+
+#define SNIFF_TEXT "SNIFF"
+
+void draw_sniffer_view(Canvas* canvas, i2cSniffer* i2c_sniffer);