Merge remote-tracking branch 'origin/dev' into hedger/bt_rework

flipperdevices · Dec 26, 2023 · 5264df8 · 5264df8
2 parents 0c05ca4 + c9e3f20
commit 5264df8
Show file tree

Hide file tree

Showing 12 changed files with 172 additions and 79 deletions.
diff --git a/applications/services/rpc/rpc_gui.c b/applications/services/rpc/rpc_gui.c
@@ -5,6 +5,41 @@
 #include <flipper.pb.h>
 #include <gui.pb.h>
 
+// Contract assertion
+_Static_assert(InputKeyMAX == 6, "InputKeyMAX");
+_Static_assert(InputTypeMAX == 5, "InputTypeMAX");
+
+_Static_assert(InputKeyUp == (int32_t)PB_Gui_InputKey_UP, "InputKeyUp != PB_Gui_InputKey_UP");
+_Static_assert(
+    InputKeyDown == (int32_t)PB_Gui_InputKey_DOWN,
+    "InputKeyDown != PB_Gui_InputKey_DOWN");
+_Static_assert(
+    InputKeyRight == (int32_t)PB_Gui_InputKey_RIGHT,
+    "InputKeyRight != PB_Gui_InputKey_RIGHT");
+_Static_assert(
+    InputKeyLeft == (int32_t)PB_Gui_InputKey_LEFT,
+    "InputKeyLeft != PB_Gui_InputKey_LEFT");
+_Static_assert(InputKeyOk == (int32_t)PB_Gui_InputKey_OK, "InputKeyOk != PB_Gui_InputKey_OK");
+_Static_assert(
+    InputKeyBack == (int32_t)PB_Gui_InputKey_BACK,
+    "InputKeyBack != PB_Gui_InputKey_BACK");
+
+_Static_assert(
+    InputTypePress == (int32_t)PB_Gui_InputType_PRESS,
+    "InputTypePress != PB_Gui_InputType_PRESS");
+_Static_assert(
+    InputTypeRelease == (int32_t)PB_Gui_InputType_RELEASE,
+    "InputTypeRelease != PB_Gui_InputType_RELEASE");
+_Static_assert(
+    InputTypeShort == (int32_t)PB_Gui_InputType_SHORT,
+    "InputTypeShort != PB_Gui_InputType_SHORT");
+_Static_assert(
+    InputTypeLong == (int32_t)PB_Gui_InputType_LONG,
+    "InputTypeLong != PB_Gui_InputType_LONG");
+_Static_assert(
+    InputTypeRepeat == (int32_t)PB_Gui_InputType_REPEAT,
+    "InputTypeRepeat != PB_Gui_InputType_REPEAT");
+
 #define TAG "RpcGui"
 
 typedef enum {
@@ -168,63 +203,20 @@ static void
     RpcSession* session = rpc_gui->session;
     furi_assert(session);
 
-    InputEvent event;
-
-    bool invalid = false;
-
-    switch(request->content.gui_send_input_event_request.key) {
-    case PB_Gui_InputKey_UP:
-        event.key = InputKeyUp;
-        break;
-    case PB_Gui_InputKey_DOWN:
-        event.key = InputKeyDown;
-        break;
-    case PB_Gui_InputKey_RIGHT:
-        event.key = InputKeyRight;
-        break;
-    case PB_Gui_InputKey_LEFT:
-        event.key = InputKeyLeft;
-        break;
-    case PB_Gui_InputKey_OK:
-        event.key = InputKeyOk;
-        break;
-    case PB_Gui_InputKey_BACK:
-        event.key = InputKeyBack;
-        break;
-    default:
-        // Invalid key
-        invalid = true;
-        break;
-    }
+    bool is_valid = (request->content.gui_send_input_event_request.key < (int32_t)InputKeyMAX) &&
+                    (request->content.gui_send_input_event_request.type < (int32_t)InputTypeMAX);
 
-    switch(request->content.gui_send_input_event_request.type) {
-    case PB_Gui_InputType_PRESS:
-        event.type = InputTypePress;
-        break;
-    case PB_Gui_InputType_RELEASE:
-        event.type = InputTypeRelease;
-        break;
-    case PB_Gui_InputType_SHORT:
-        event.type = InputTypeShort;
-        break;
-    case PB_Gui_InputType_LONG:
-        event.type = InputTypeLong;
-        break;
-    case PB_Gui_InputType_REPEAT:
-        event.type = InputTypeRepeat;
-        break;
-    default:
-        // Invalid type
-        invalid = true;
-        break;
-    }
-
-    if(invalid) {
+    if(!is_valid) {
         rpc_send_and_release_empty(
             session, request->command_id, PB_CommandStatus_ERROR_INVALID_PARAMETERS);
         return;
     }
 
+    InputEvent event = {
+        .key = (int32_t)request->content.gui_send_input_event_request.key,
+        .type = (int32_t)request->content.gui_send_input_event_request.type,
+    };
+
     // Event sequence shenanigans
     event.sequence_source = INPUT_SEQUENCE_SOURCE_SOFTWARE;
     if(event.type == InputTypePress) {
@@ -264,6 +256,29 @@ static void rpc_system_gui_virtual_display_render_callback(Canvas* canvas, void*
     canvas_draw_xbm(canvas, 0, 0, canvas->width, canvas->height, rpc_gui->virtual_display_buffer);
 }
 
+static void rpc_system_gui_virtual_display_input_callback(InputEvent* event, void* context) {
+    furi_assert(event);
+    furi_assert(event->key < InputKeyMAX);
+    furi_assert(event->type < InputTypeMAX);
+    furi_assert(context);
+
+    RpcGuiSystem* rpc_gui = context;
+    RpcSession* session = rpc_gui->session;
+
+    FURI_LOG_D(TAG, "VirtulDisplay: SendInputEvent");
+
+    PB_Main rpc_message = {
+        .command_id = 0,
+        .command_status = PB_CommandStatus_OK,
+        .has_next = false,
+        .which_content = PB_Main_gui_send_input_event_request_tag,
+        .content.gui_send_input_event_request.key = (int32_t)event->key,
+        .content.gui_send_input_event_request.type = (int32_t)event->type,
+    };
+
+    rpc_send_and_release(session, &rpc_message);
+}
+
 static void rpc_system_gui_start_virtual_display_process(const PB_Main* request, void* context) {
     furi_assert(request);
     furi_assert(context);
@@ -300,6 +315,15 @@ static void rpc_system_gui_start_virtual_display_process(const PB_Main* request,
         rpc_gui->virtual_display_view_port,
         rpc_system_gui_virtual_display_render_callback,
         rpc_gui);
+
+    if(request->content.gui_start_virtual_display_request.send_input) {
+        FURI_LOG_D(TAG, "VirtulDisplay: input forwarding requested");
+        view_port_input_callback_set(
+            rpc_gui->virtual_display_view_port,
+            rpc_system_gui_virtual_display_input_callback,
+            rpc_gui);
+    }
+
     gui_add_view_port(rpc_gui->gui, rpc_gui->virtual_display_view_port, GuiLayerFullscreen);
 
     rpc_send_and_release_empty(session, request->command_id, PB_CommandStatus_OK);

diff --git a/applications/settings/about/about.c b/applications/settings/about/about.c
@@ -11,7 +11,7 @@
 
 typedef DialogMessageButton (*AboutDialogScreen)(DialogsApp* dialogs, DialogMessage* message);
 
-static DialogMessageButton product_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_product(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
     FuriString* screen_header = furi_string_alloc_printf(
@@ -31,16 +31,14 @@ static DialogMessageButton product_screen(DialogsApp* dialogs, DialogMessage* me
     dialog_message_set_text(
         message, furi_string_get_cstr(screen_text), 0, 26, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
 
     furi_string_free(screen_header);
     furi_string_free(screen_text);
 
     return result;
 }
 
-static DialogMessageButton address_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_address(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
     const char* screen_text = "Flipper Devices Inc\n"
@@ -50,12 +48,11 @@ static DialogMessageButton address_screen(DialogsApp* dialogs, DialogMessage* me
 
     dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
 
     return result;
 }
 
-static DialogMessageButton compliance_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_compliance(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
     const char* screen_text = "For all compliance\n"
@@ -64,35 +61,71 @@ static DialogMessageButton compliance_screen(DialogsApp* dialogs, DialogMessage*
 
     dialog_message_set_text(message, screen_text, 0, 0, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
 
     return result;
 }
 
-static DialogMessageButton icon1_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_icon1(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
     dialog_message_set_icon(message, &I_Certification1_103x56, 13, 0);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_icon(message, NULL, 0, 0);
 
     return result;
 }
 
-static DialogMessageButton icon2_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_icon2(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
 
     dialog_message_set_icon(message, &I_Certification2_46x33, 15, 10);
     dialog_message_set_text(
         message, furi_hal_version_get_mic_id(), 63, 27, AlignLeft, AlignCenter);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_icon(message, NULL, 0, 0);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
 
     return result;
 }
 
-static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_cert_china_0(DialogsApp* dialogs, DialogMessage* message) {
+    DialogMessageButton result;
+
+    dialog_message_set_icon(message, &I_CertificationChina0_121x41, 3, 3);
+    result = dialog_message_show(dialogs, message);
+
+    return result;
+}
+
+static DialogMessageButton about_screen_cert_china_1(DialogsApp* dialogs, DialogMessage* message) {
+    DialogMessageButton result;
+
+    dialog_message_set_icon(message, &I_CertificationChina1_122x47, 3, 3);
+    dialog_message_set_text(
+        message, furi_hal_version_get_srrc_id(), 55, 11, AlignLeft, AlignBottom);
+    result = dialog_message_show(dialogs, message);
+
+    return result;
+}
+
+static DialogMessageButton about_screen_cert_taiwan(DialogsApp* dialogs, DialogMessage* message) {
+    DialogMessageButton result;
+
+    dialog_message_set_icon(message, &I_CertificationTaiwan_33x32, 3, 10);
+    dialog_message_set_text(
+        message, furi_hal_version_get_ncc_id(), 39, 30, AlignLeft, AlignBottom);
+    result = dialog_message_show(dialogs, message);
+
+    return result;
+}
+
+static DialogMessageButton about_screen_cert_mexico(DialogsApp* dialogs, DialogMessage* message) {
+    DialogMessageButton result;
+
+    dialog_message_set_icon(message, &I_CertificationMexico_98x41, 17, 4);
+    result = dialog_message_show(dialogs, message);
+
+    return result;
+}
+
+static DialogMessageButton about_screen_hw_version(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
     FuriString* buffer;
     buffer = furi_string_alloc();
@@ -118,14 +151,12 @@ static DialogMessageButton hw_version_screen(DialogsApp* dialogs, DialogMessage*
     dialog_message_set_header(message, "HW Version Info:", 0, 0, AlignLeft, AlignTop);
     dialog_message_set_text(message, furi_string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
     furi_string_free(buffer);
 
     return result;
 }
 
-static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage* message) {
+static DialogMessageButton about_screen_fw_version(DialogsApp* dialogs, DialogMessage* message) {
     DialogMessageButton result;
     FuriString* buffer;
     buffer = furi_string_alloc();
@@ -157,21 +188,23 @@ static DialogMessageButton fw_version_screen(DialogsApp* dialogs, DialogMessage*
     dialog_message_set_header(message, "FW Version Info:", 0, 0, AlignLeft, AlignTop);
     dialog_message_set_text(message, furi_string_get_cstr(buffer), 0, 13, AlignLeft, AlignTop);
     result = dialog_message_show(dialogs, message);
-    dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
-    dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
     furi_string_free(buffer);
 
     return result;
 }
 
 const AboutDialogScreen about_screens[] = {
-    product_screen,
-    compliance_screen,
-    address_screen,
-    icon1_screen,
-    icon2_screen,
-    hw_version_screen,
-    fw_version_screen};
+    about_screen_product,
+    about_screen_compliance,
+    about_screen_address,
+    about_screen_icon1,
+    about_screen_icon2,
+    about_screen_cert_china_0,
+    about_screen_cert_china_1,
+    about_screen_cert_taiwan,
+    about_screen_cert_mexico,
+    about_screen_hw_version,
+    about_screen_fw_version};
 
 int32_t about_settings_app(void* p) {
     UNUSED(p);
@@ -201,6 +234,10 @@ int32_t about_settings_app(void* p) {
 
         screen_result = about_screens[screen_index](dialogs, message);
 
+        dialog_message_set_icon(message, NULL, 0, 0);
+        dialog_message_set_header(message, NULL, 0, 0, AlignLeft, AlignTop);
+        dialog_message_set_text(message, NULL, 0, 0, AlignLeft, AlignTop);
+
         if(screen_result == DialogMessageButtonLeft) {
             if(screen_index <= 0) {
                 break;

diff --git a/assets/icons/About/CertificationChina0_121x41.png b/assets/icons/About/CertificationChina0_121x41.png
diff --git a/assets/icons/About/CertificationChina1_122x47.png b/assets/icons/About/CertificationChina1_122x47.png
diff --git a/assets/icons/About/CertificationMexico_98x41.png b/assets/icons/About/CertificationMexico_98x41.png
diff --git a/assets/icons/About/CertificationTaiwan_33x32.png b/assets/icons/About/CertificationTaiwan_33x32.png
diff --git a/assets/protobuf b/assets/protobuf
diff --git a/targets/f18/api_symbols.csv b/targets/f18/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,50.0,,
+Version,+,50.1,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
 Header,+,applications/services/cli/cli_vcp.h,,
@@ -1370,7 +1370,9 @@ Function,+,furi_hal_version_get_mic_id,const char*,
 Function,+,furi_hal_version_get_model_code,const char*,
 Function,+,furi_hal_version_get_model_name,const char*,
 Function,+,furi_hal_version_get_name_ptr,const char*,
+Function,+,furi_hal_version_get_ncc_id,const char*,
 Function,+,furi_hal_version_get_otp_version,FuriHalVersionOtpVersion,
+Function,+,furi_hal_version_get_srrc_id,const char*,
 Function,-,furi_hal_version_init,void,
 Function,+,furi_hal_version_uid,const uint8_t*,
 Function,+,furi_hal_version_uid_size,size_t,

diff --git a/targets/f18/furi_hal/furi_hal_version_device.c b/targets/f18/furi_hal/furi_hal_version_device.c
@@ -23,3 +23,11 @@ const char* furi_hal_version_get_ic_id() {
 const char* furi_hal_version_get_mic_id() {
     return "Pending";
 }
+
+const char* furi_hal_version_get_srrc_id() {
+    return "Pending";
+}
+
+const char* furi_hal_version_get_ncc_id() {
+    return "Pending";
+}
diff --git a/targets/f7/api_symbols.csv b/targets/f7/api_symbols.csv
@@ -1,5 +1,5 @@
 entry,status,name,type,params
-Version,+,50.0,,
+Version,+,50.1,,
 Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
 Header,+,applications/services/bt/bt_service/bt.h,,
 Header,+,applications/services/cli/cli.h,,
@@ -1566,7 +1566,9 @@ Function,+,furi_hal_version_get_mic_id,const char*,
 Function,+,furi_hal_version_get_model_code,const char*,
 Function,+,furi_hal_version_get_model_name,const char*,
 Function,+,furi_hal_version_get_name_ptr,const char*,
+Function,+,furi_hal_version_get_ncc_id,const char*,
 Function,+,furi_hal_version_get_otp_version,FuriHalVersionOtpVersion,
+Function,+,furi_hal_version_get_srrc_id,const char*,
 Function,-,furi_hal_version_init,void,
 Function,+,furi_hal_version_uid,const uint8_t*,
 Function,+,furi_hal_version_uid_size,size_t,