Merge branch 'dev' into pocsagsender

Flipper-XFW · Oct 30, 2023 · f819af2 · f819af2
2 parents 72b048b + f28ba09
commit f819af2
Show file tree

Hide file tree

Showing 98 changed files with 1,191 additions and 613 deletions.
diff --git a/.github/workflow_data/devbuild.py b/.github/workflow_data/devbuild.py
@@ -12,6 +12,12 @@
         event = json.load(f)
 
     client = nextcloud_client.Client(os.environ["NC_HOST"])
+    _session = requests.session
+    def session(*args, **kwargs):
+        s = _session(*args, **kwargs)
+        s.headers["User-Agent"] = os.environ["NC_USERAGENT"]
+        return s
+    requests.session = session
     client.login(os.environ["NC_USER"], os.environ["NC_PASS"])
 
     for file in (

diff --git a/.github/workflow_data/webhook.py b/.github/workflow_data/webhook.py
@@ -36,7 +36,7 @@
             for i, commit in enumerate(event["commits"]):
                 msg = commit['message'].splitlines()[0].replace("`", "")
                 msg = msg[:50] + ("..." if len(msg) > 50 else "")
-                desc += f"\n[`{commit['id'][:7]}`]({commit['url']}): {msg} - [__{commit['author']['username']}__](https://github.com/{commit['author']['username']})"
+                desc += f"\n[`{commit['id'][:7]}`]({commit['url']}): {msg} - [__{commit['author'].get('username')}__](https://github.com/{commit['author'].get('username')})"
                 if len(desc) > 2020:
                     desc = desc.rsplit("\n", 1)[0] + f"\n+ {count - i} more commits"
                     break

diff --git a/.github/workflow_data/webupdater.py b/.github/workflow_data/webupdater.py
@@ -1,9 +1,16 @@
 import nextcloud_client
+import requests
 import json
 import os
 
 if __name__ == "__main__":
     client = nextcloud_client.Client(os.environ["NC_HOST"])
+    _session = requests.session
+    def session(*args, **kwargs):
+        s = _session(*args, **kwargs)
+        s.headers["User-Agent"] = os.environ["NC_USERAGENT"]
+        return s
+    requests.session = session
     client.login(os.environ["NC_USER"], os.environ["NC_PASS"])
 
     file = os.environ["ARTIFACT_TGZ"]

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,7 @@ concurrency:
 env:
   TARGETS: f7
   DEFAULT_TARGET: f7
+  FBT_GIT_SUBMODULE_SHALLOW: 1
 
 jobs:
   build:
@@ -57,6 +58,7 @@ jobs:
         if: "github.event_name == 'push' && github.ref_name == 'dev' && !contains(github.event.head_commit.message, '--nobuild')"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
           BUILD_WEBHOOK: ${{ secrets.BUILD_WEBHOOK }}

diff --git a/.github/workflows/hotfix.yml b/.github/workflows/hotfix.yml
@@ -59,6 +59,7 @@ jobs:
       - name: "Upload to webupdater"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -55,6 +55,7 @@ jobs:
       - name: "Upload to webupdater"
         env:
           NC_HOST: "https://cloud.cynthialabs.net/"
+          NC_USERAGENT: "${{ secrets.NC_USERAGENT }}"
           NC_USER: "${{ secrets.NC_USER }}"
           NC_PASS: "${{ secrets.NC_PASS }}"
         run: |

diff --git a/applications/drivers/subghz/cc1101_ext/cc1101_ext.c b/applications/drivers/subghz/cc1101_ext/cc1101_ext.c
@@ -214,16 +214,15 @@ bool subghz_device_cc1101_ext_alloc(SubGhzDeviceConf* conf) {
     subghz_device_cc1101_ext->async_rx.capture_delta_duration = 0;
 
     subghz_device_cc1101_ext->spi_bus_handle =
-        (XTREME_SETTINGS()->spi_cc1101_handle == SpiDefault ?
+        (xtreme_settings.spi_cc1101_handle == SpiDefault ?
              &furi_hal_spi_bus_handle_external :
              &furi_hal_spi_bus_handle_external_extra);
 
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(XTREME_SETTINGS()->spi_cc1101_handle == SpiDefault &&
-       !furi_hal_subghz_get_ext_power_amp()) {
+    if(xtreme_settings.spi_cc1101_handle == SpiDefault && !furi_hal_subghz_get_ext_power_amp()) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(XTREME_SETTINGS()->spi_cc1101_handle == SpiExtra) {
+    } else if(xtreme_settings.spi_cc1101_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
@@ -245,9 +244,9 @@ void subghz_device_cc1101_ext_free() {
     free(subghz_device_cc1101_ext);
 
     // resetting the CS pins to floating
-    if(XTREME_SETTINGS()->spi_nrf24_handle == SpiDefault || subghz_device_cc1101_ext->power_amp) {
+    if(xtreme_settings.spi_nrf24_handle == SpiDefault || subghz_device_cc1101_ext->power_amp) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-    } else if(XTREME_SETTINGS()->spi_nrf24_handle == SpiExtra) {
+    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 

diff --git a/applications/external/advanced_wifisniff/sniffer.c b/applications/external/advanced_wifisniff/sniffer.c
@@ -17,13 +17,11 @@
 #define MAX_SSID_LENGTH 32
 #define MAX_BSSID_LENGTH 18
 
-#define UART_CH_ESP                                                             \
-    (XTREME_SETTINGS()->uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : \
-                                                          FuriHalUartIdLPUART1)
+#define UART_CH_ESP \
+    (xtreme_settings.uart_esp_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
 
-#define UART_CH_GPS                                                              \
-    (XTREME_SETTINGS()->uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : \
-                                                           FuriHalUartIdLPUART1)
+#define UART_CH_GPS \
+    (xtreme_settings.uart_nmea_channel == UARTDefault ? FuriHalUartIdUSART1 : FuriHalUartIdLPUART1)
 
 #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
 

diff --git a/applications/external/ble_spam/application.fam b/applications/external/ble_spam/application.fam
@@ -8,7 +8,7 @@ App(
     fap_category="Bluetooth",
     fap_author="@Willy-JL @ECTO-1A @Spooks4576",
     fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/ble_spam",
-    fap_version="3.3",
+    fap_version="4.1",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
     fap_icon_assets="icons",
     fap_icon_assets_symbol="ble_spam",