feat: qr added on AboutUs option

ElectronicCats · Oct 29, 2024 · 99b4702 · 99b4702
1 parent dbec1e4
commit 99b4702
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 23 deletions.
diff --git a/Canbus_app/app_user.h b/Canbus_app/app_user.h
@@ -20,6 +20,8 @@
 #include "libraries/mcp_can_2515.h"
 #include "libraries/pid_library.h"
 
+#include "canbus_app_icons.h"
+
 #define PATHAPP    "apps_data/canbus"
 #define PATHAPPEXT EXT_PATH(PATHAPP)
 #define PATHLOGS   PATHAPPEXT "/logs"

diff --git a/Canbus_app/application.fam b/Canbus_app/application.fam
@@ -7,4 +7,5 @@ App(
     stack_size=30 * 1024,
     fap_icon="icon.png",
     fap_category="ElectronicCats",
+    fap_icon_assets="assets",
 )
diff --git a/Canbus_app/assets/qrcode.png b/Canbus_app/assets/qrcode.png
diff --git a/Canbus_app/dist/canbus_app.fap b/Canbus_app/dist/canbus_app.fap
diff --git a/Canbus_app/dist/debug/canbus_app_d.elf b/Canbus_app/dist/debug/canbus_app_d.elf
diff --git a/Canbus_app/libraries/pid_library.c b/Canbus_app/libraries/pid_library.c
@@ -201,7 +201,7 @@ bool clear_dtc(OBDII* obdii) {
 
     ERROR_CAN ret = ERROR_OK;
 
-    frame.buffer[0] = 2;
+    frame.buffer[0] = 1;
     frame.buffer[1] = CLEAR_STORAGE_DTC;
     frame.buffer[2] = 0;
 

diff --git a/Canbus_app/scenes/AboutUs.c b/Canbus_app/scenes/AboutUs.c
@@ -32,22 +32,12 @@ static void draw_can_app_view(App* app) {
     widget_add_string_element(
         app->widget, 65, 20, AlignCenter, AlignCenter, FontPrimary, "CANBUS APP");
     widget_add_string_element(
-        app->widget, 65, 35, AlignCenter, AlignCenter, FontSecondary, "By: Adonai Diaz");
+        app->widget, 65, 35, AlignCenter, AlignCenter, FontSecondary, "v1.2");
 
     widget_add_button_element(app->widget, GuiButtonTypeRight, "Next", button_callback, app);
     widget_add_button_element(app->widget, GuiButtonTypeLeft, "Prev", button_callback, app);
 }
 
-static void draw_version_view(App* app) {
-    widget_reset(app->widget);
-    widget_add_string_element(
-        app->widget, 65, 20, AlignCenter, AlignCenter, FontPrimary, "Version:");
-    widget_add_string_element(
-        app->widget, 65, 35, AlignCenter, AlignCenter, FontSecondary, "CANBUS APP V1.1.0.0");
-    widget_add_button_element(app->widget, GuiButtonTypeRight, "Next", button_callback, app);
-    widget_add_button_element(app->widget, GuiButtonTypeLeft, "Prev", button_callback, app);
-}
-
 static void draw_license_view(App* app) {
     widget_reset(app->widget);
     widget_add_string_element(
@@ -61,15 +51,10 @@ static void draw_license_view(App* app) {
 void draw_more_info_view(App* app) {
     widget_reset(app->widget);
     widget_add_string_element(
-        app->widget, 65, 10, AlignCenter, AlignCenter, FontPrimary, "More info:");
-    widget_add_string_element(
-        app->widget, 65, 25, AlignCenter, AlignCenter, FontSecondary, "https://github.com");
+        app->widget, 10, 5, AlignLeft, AlignCenter, FontPrimary, "More info:");
 
-    widget_add_string_element(
-        app->widget, 65, 35, AlignCenter, AlignCenter, FontSecondary, "/ElectronicCats");
+    widget_add_icon_element(app->widget, 48, 15, &I_qr_code);
 
-    widget_add_string_element(
-        app->widget, 65, 45, AlignCenter, AlignCenter, FontSecondary, "/flipper-MCP2515-CANBUS");
     widget_add_button_element(app->widget, GuiButtonTypeLeft, "Prev", button_callback, app);
 }
 
@@ -95,12 +80,9 @@ bool app_scene_about_us_on_event(void* context, SceneManagerEvent event) {
             draw_can_app_view(app);
             break;
         case 2:
-            draw_version_view(app);
-            break;
-        case 3:
             draw_license_view(app);
             break;
-        case 4:
+        case 3:
             draw_more_info_view(app);
             break;
         default: