Sfoglia il codice sorgente

Merge flip_wifi from https://github.com/jblanked/FlipWiFi

# Conflicts:
#	flip_wifi/alloc/flip_wifi_alloc.c
#	flip_wifi/callback/flip_wifi_callback.c
Willy-JL 1 anno fa
parent
commit
3c5518fd9c

+ 1 - 0
flip_wifi/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## v1.2
 - Updated scan loading and parsing.
 - Added connectivity check on startup. (thanks to Derek Jamison)
+- Fixed crash when saving networks manually.
 
 ## v1.1
 - Fixed a freeze issue when configurations did not exist (thanks to WillyJL).  

+ 1 - 1
flip_wifi/README.md

@@ -4,7 +4,7 @@ FlipWiFi is the companion app for the popular FlipperHTTP flash, originally intr
 
 ## Requirements
 
-- WiFi Dev Board or Raspberry Pi Pico W for Flipper Zero with FlipperHTTP Flash: https://github.com/jblanked/FlipperHTTP
+- WiFi Developer Board, Raspberry Pi, or ESP32 Device with FlipperHTTP Flash: https://github.com/jblanked/FlipperHTTP
 - WiFi Access Point
 
 ## Features

+ 2 - 2
flip_wifi/alloc/flip_wifi_alloc.c

@@ -88,7 +88,7 @@ FlipWiFiApp* flip_wifi_app_alloc() {
     if(!easy_flipper_set_widget(
            &app->widget_info,
            FlipWiFiViewAbout,
-           "FlipWiFi v1.2\n-----\nFlipperHTTP companion app.\nScan and save WiFi networks.\n-----\nwww.github.com/jblanked",
+           "FlipWiFi v1.2.1\n-----\nFlipperHTTP companion app.\nScan and save WiFi networks.\n-----\nwww.github.com/jblanked",
            callback_to_submenu_main,
            &app->view_dispatcher)) {
         return NULL;
@@ -148,7 +148,7 @@ FlipWiFiApp* flip_wifi_app_alloc() {
     if(!easy_flipper_set_submenu(
            &app->submenu_main,
            FlipWiFiViewSubmenuMain,
-           "FlipWiFi v1.2",
+           "FlipWiFi v1.2.1",
            easy_flipper_callback_exit_app,
            &app->view_dispatcher)) {
         return NULL;

+ 1 - 1
flip_wifi/application.fam

@@ -9,6 +9,6 @@ App(
     fap_icon_assets="assets",
     fap_author="JBlanked",
     fap_weburl="https://github.com/jblanked/FlipWiFi",
-    fap_version="1.2",
+    fap_version="1.2.1",
     fap_description="FlipperHTTP companion app.",
 )

BIN
flip_wifi/assets/01-home.png


+ 17 - 0
flip_wifi/callback/flip_wifi_callback.c

@@ -130,6 +130,23 @@ bool flip_wifi_view_input_callback_saved(InputEvent* event, void* context) {
            app->wifi_playlist.passwords[ssid_index] == NULL) {
             return false;
         }
+        if(!app->popup) {
+            if(!easy_flipper_set_popup(
+                   &app->popup,
+                   FlipWiFiViewPopup,
+                   "[SUCCESS]",
+                   0,
+                   0,
+                   "All FlipperHTTP apps will now\nuse the selected network.",
+                   0,
+                   40,
+                   popup_callback_saved,
+                   callback_to_submenu_saved,
+                   &app->view_dispatcher,
+                   app)) {
+                return false;
+            }
+        }
         save_settings(
             app->wifi_playlist.ssids[ssid_index], app->wifi_playlist.passwords[ssid_index]);