Small bump in the road

README.md

@@ -1,23 +1,23 @@
-# Xtreme-Apps
-Bundle of external apps tweaked for Xtreme.
+# Momentum-Apps
+Bundle of external apps tweaked for [Momentum Firmware](https://github.com/NextFlip/Momentum-Firmware).
 
 > [!IMPORTANT]
-> These apps are already included with all Xtreme Firmware releases.
+> These apps are already included with all Momentum Firmware releases.
 > This repository serves only as a way to keep them updated and maintained easier.
 
 ### Why?
-Apps we include in Xtreme are all modified (some lots more than others). This includes:
-- Removing duplicate icons that are part of firmware to **support our Asset Packs system**
+Many apps included in Momentum are modified (some lots more than others). This includes:
+- Removing/tweaking icons and/or their usages to **support our Asset Packs system**
 - Removing duplicate keyboard implementations to **use our extended system keyboard**
 - With our system keyboard also **support our CLI command `input keyboard`** to type with PC keyboard
-- **Moving location of save files** or changing how they are saved
-- **Changing application display names** to fit our scheme
+- **Moving location of save files** to a more appropriate location or changing how they are saved
+- **Changing application display names** to fit our naming scheme
 - **Changing how some menus work/look** or adding **new exclusive menus and features**
-- **Improving or extending functionality** and better integrating with Xtreme firmware
+- **Improving or extending functionality** and better integrating with the firmware
 - **Updating and fixing apps** that were abandoned by the original developers
 
 ### How?
-**Apps made by the Xtreme team are developed right here, the latest versions will always originate from this repository.**
+**Apps made by the our team are developed right here, the latest versions will always originate from this repository.**
 
 **For all other apps we use git subtrees to pull updates from the creator's repository / other sources such as [@xMasterX's pack](https://github.com/xMasterX/all-the-plugins), while also keeping our own tweaks and additions.**
 
@@ -26,7 +26,7 @@ We didn't want to have fork repos for each single app since it would get out of
 Subtrees work in a very peculiar way: they pull and compare commit history from a remote repo and apply it to a subdirectory of this repo.
 That's why the commit history for this repo is so huge, it contains all the commits for all the apps, plus our edits.
 
-To make updating more manageable, we have added another layer on top of subtrees:
+To make updating more manageable, we have added some scripts on top of subtrees:
 - add a new app with `.utils/add-subtree.sh <path> <repo url> <branch> [subdir]`, this will pull the history and create `path/.gitsubtree` to remember the url, branch and subdir
 - run `.utils/update-subtree.sh <path>` to pull updates for a subtree
 - or run `.utils/bulk-update-subtrees.sh` to do it for all subtrees

ble_spam/application.fam

@@ -7,7 +7,7 @@ App(
     fap_icon="ble_spam_10px.png",
     fap_category="Bluetooth",
     fap_author="@Willy-JL @ECTO-1A @Spooks4576",
-    fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/ble_spam",
+    fap_weburl="https://github.com/NextFlip/Momentum-Apps/tree/dev/ble_spam",
     fap_version="5.1",
     fap_description="Flood BLE advertisements to cause spammy and annoying popups/notifications",
     fap_icon_assets="icons",

ble_spam/ble_spam.c

@@ -387,7 +387,7 @@ static void draw_callback(Canvas* canvas, void* _ctx) {
             48,
             AlignLeft,
             AlignTop,
-            "App+Spam: \e#WillyJL\e# XFW\n"
+            "App+Spam: \e#WillyJL\e# MNTM\n"
             "Apple+Crash: \e#ECTO-1A\e#\n"
             "Android+Win: \e#Spooks4576\e#\n"
             "                                   Version \e#5.1\e#",

ble_spam/protocols/fastpair.c

@@ -538,8 +538,6 @@ static const struct {
     {0x87B25F, "Animated Rickroll"},
     {0xF38C02, "Boykisser"},
     {0x1448C9, "BLM"},
-    {0xD5AB33, "Xtreme"},
-    {0x0C0B67, "Xtreme Cta"},
     {0x13B39D, "Talking Sasquach"},
     {0xAA1FE1, "ClownMaster"},
     {0x7C6CDB, "Obama"},

camera_suite/views/camera_suite_view_camera.h

@@ -17,9 +17,9 @@
 
 #include "../helpers/camera_suite_custom_event.h"
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 
 #define BITMAP_HEADER_LENGTH 62
 #define FRAME_BIT_DEPTH 1

esp8266_deauth/esp8266_deauth.c

@@ -12,11 +12,11 @@
 //#include <notification/notification_messages.h>
 //#include <stdlib.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #include "FlipperZeroWiFiDeauthModuleDefines.h"
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 
 #define DEAUTH_APP_DEBUG 0
 

esp_flasher/esp_flasher_uart.h

@@ -2,9 +2,9 @@
 
 #include "furi_hal.h"
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 #define BAUDRATE (115200)
 #define FAST_BAUDRATE (921600)
 

evil_portal/evil_portal_app_i.h

@@ -16,12 +16,12 @@
 #include <gui/view_stack.h>
 #include <dialogs/dialogs.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #define NUM_MENU_ITEMS (6)
 
 #define EVIL_PORTAL_TEXT_BOX_STORE_SIZE (4096)
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 
 #define SET_HTML_CMD "sethtml"
 #define SET_AP_CMD "setap"

evil_portal/helpers/evil_portal_storage.c

@@ -38,10 +38,11 @@ void evil_portal_read_index_html(void* context) {
         storage_file_close(index_html);
         storage_file_free(index_html);
     } else {
-        char* html_error = "<b>Evil portal</b><br>Unable to read the html file.<br>"
-                           "Is the SD Card set up correctly? <br>See instructions @ "
-                           "github.com/bigbrodude6119/flipper-zero-evil-portal<br>"
-                           "Under the 'Install pre-built app on the flipper' section.";
+        char* html_error = "<b>Evil portal</b><br>"
+                           "Unable to read the html file.<br>"
+                           "Is the SD Card set up correctly?<br>"
+                           "Place HTML files in <code>apps_data/evil_portal/html<code><br>"
+                           "Then use <code>Select HTML<code> in app!";
         app->index_html = (uint8_t*)html_error;
     }
 

evil_portal/helpers/evil_portal_storage.h

@@ -9,7 +9,7 @@
 #define HTML_EXTENSION ".html"
 #define HTML_FOLDER PORTAL_FILE_DIRECTORY_PATH "/html"
 #define EVIL_PORTAL_INDEX_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/index.html"
-#define EVIL_PORTAL_INDEX_DEFAULT_PATH HTML_FOLDER "/xtreme.html"
+#define EVIL_PORTAL_INDEX_DEFAULT_PATH HTML_FOLDER "/example.html"
 #define EVIL_PORTAL_AP_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/ap.config.txt"
 #define EVIL_PORTAL_LOG_SAVE_PATH PORTAL_FILE_DIRECTORY_PATH "/logs"
 

evil_portal/resources/apps_data/evil_portal/html/example.html

@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html>
+<!-- Based on southwest_airline.html from https://github.com/bigbrodude6119/flipper-zero-evil-portal -->
+
+<head>
+  <style>
+    body {
+      font-family: Arial, sans-serif;
+      margin: 0;
+      padding: 0;
+      background: #f9f9f9;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 100vh;
+    }
+
+    .container {
+      background: #fff;
+      padding: 20px;
+      border-radius: 5px;
+      box-shadow: 0 0 10px #999;
+      max-width: 400px;
+    }
+
+    .logo {
+      text-align: center;
+    }
+
+    svg {
+      width: 80%;
+    }
+
+    .subtext {
+      text-align: center;
+      margin-bottom: 20px;
+    }
+
+    .form-group {
+      margin-bottom: 15px;
+      display: flex;
+      justify-content: center;
+    }
+
+    .form-control {
+      width: 100%;
+      padding: 10px;
+      border-radius: 5px;
+      border: 1px solid #ddd;
+      font-size: 1rem;
+    }
+
+    button {
+      width: 100%;
+      padding: 10px;
+      border: none;
+      border-radius: 5px;
+      background: #0066ff;
+      color: #fff;
+      font-size: 1.1rem;
+      cursor: pointer;
+    }
+
+    @media (max-width: 500px) {
+      .container {
+        max-width: 90%;
+      }
+    }
+  </style>
+</head>
+
+<body>
+
+  <div class="container">
+
+    <div class="logo">
+      <h1>Evil Portal</h1>
+    </div>
+    <p class="subtext">This is an example page for Evil Portal. Do not submit real information here.</p>
+
+    <form action="/get" method="GET">
+
+      <div class="form-group">
+        <input type="text" name="email" class="form-control" placeholder="Username" required>
+      </div>
+
+      <div class="form-group">
+        <input type="password" name="password" class="form-control" placeholder="Password" required>
+      </div>
+
+      <button type="submit">Submit</button>
+
+    </form>
+
+  </div>
+
+</body>
+
+</html>

gps_nmea/gps_uart.h

@@ -3,9 +3,9 @@
 #include <furi_hal.h>
 #include <notification/notification_messages.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_nmea_channel)
+#define UART_CH (momentum_settings.uart_nmea_channel)
 
 #define RX_BUF_SIZE 1024
 

nfc_maker/application.fam

@@ -7,7 +7,7 @@ App(
     fap_icon="nfc_maker_10px.png",
     fap_category="NFC",
     fap_author="@Willy-JL",
-    fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/nfc_maker",
+    fap_weburl="https://github.com/NextFlip/Momentum-Apps/tree/dev/nfc_maker",
     fap_version="1.1",
     fap_description="Create NFC files for BT MACs, Contacts, Links, Emails, Phones, Text and WiFis",
 )

nfc_maker/scenes/nfc_maker_scene_contact_url.c

@@ -16,7 +16,7 @@ void nfc_maker_scene_contact_url_on_enter(void* context) {
 
     text_input_set_header_text(text_input, "Enter URL Link:");
 
-    strlcpy(app->big_buf, "flipper-xtre.me", BIG_INPUT_LEN);
+    strlcpy(app->big_buf, "momentum-fw.dev", BIG_INPUT_LEN);
 
     text_input_set_result_callback(
         text_input,

nfc_maker/scenes/nfc_maker_scene_https.c

@@ -16,7 +16,7 @@ void nfc_maker_scene_https_on_enter(void* context) {
 
     text_input_set_header_text(text_input, "Enter Https Link:");
 
-    strlcpy(app->big_buf, "flipper-xtre.me", BIG_INPUT_LEN);
+    strlcpy(app->big_buf, "momentum-fw.dev", BIG_INPUT_LEN);
 
     text_input_set_result_callback(
         text_input,

nfc_maker/scenes/nfc_maker_scene_save_generate.c

@@ -30,7 +30,7 @@ size_t nfc_maker_scene_save_generate_populate_ndef_buffer(NfcMaker* app) {
 
         FuriString* vcard = furi_string_alloc_set("BEGIN:VCARD\r\nVERSION:3.0\r\n");
         furi_string_cat_printf(
-            vcard, "PRODID:-//Flipper Xtreme//%s//EN\r\n", version_get_version(NULL));
+            vcard, "PRODID:-//MomentumFW//%s//EN\r\n", version_get_version(NULL));
         furi_string_cat_printf(vcard, "N:%s;%s;;;\r\n", app->small_buf2, app->small_buf1);
         furi_string_cat_printf(
             vcard,

nfc_maker/scenes/nfc_maker_scene_url.c

@@ -16,7 +16,7 @@ void nfc_maker_scene_url_on_enter(void* context) {
 
     text_input_set_header_text(text_input, "Enter Plain URL:");
 
-    strlcpy(app->big_buf, "https://flipper-xtre.me", BIG_INPUT_LEN);
+    strlcpy(app->big_buf, "https://momentum-fw.dev", BIG_INPUT_LEN);
 
     text_input_set_result_callback(
         text_input,

nrf24batch/lib/nrf24/nrf24.c

@@ -9,10 +9,10 @@
 
 void nrf24_init() {
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
@@ -30,18 +30,14 @@ void nrf24_deinit() {
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
     // resetting the CS pins to floating
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 }
 
-void nrf24_spi_trx(
-    FuriHalSpiBusHandle* handle,
-    uint8_t* tx,
-    uint8_t* rx,
-    uint8_t size) {
+void nrf24_spi_trx(FuriHalSpiBusHandle* handle, uint8_t* tx, uint8_t* rx, uint8_t size) {
     furi_hal_gpio_write(handle->cs, false);
     furi_hal_spi_bus_trx(handle, tx, rx, size, nrf24_TIMEOUT);
     furi_hal_gpio_write(handle->cs, true);
@@ -54,7 +50,8 @@ uint8_t nrf24_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t data)
     return buf[0];
 }
 
-uint8_t nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
+uint8_t
+    nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
     uint8_t buf[size + 1];
     buf[0] = W_REGISTER | (REGISTER_MASK & reg);
     memcpy(&buf[1], data, size);
@@ -73,7 +70,7 @@ uint8_t nrf24_read_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data,
 }
 
 uint8_t nrf24_read_register(FuriHalSpiBusHandle* handle, uint8_t reg) {
-    uint8_t buf[] = { R_REGISTER | (REGISTER_MASK & reg), 0 };
+    uint8_t buf[] = {R_REGISTER | (REGISTER_MASK & reg), 0};
     nrf24_spi_trx(handle, buf, buf, 2);
     return buf[1];
 }
@@ -206,7 +203,11 @@ uint8_t nrf24_set_packetlen(FuriHalSpiBusHandle* handle, uint8_t len) {
 
 // packet_size: 0 - dyn payload (read from PL_WID), 1 - read from pipe size, >1 - override
 // Return STATUS reg + additional: RX_DR - new data available, 0x80 - NRF24 hardware error
-uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* ret_packetsize, uint8_t packet_size) {
+uint8_t nrf24_rxpacket(
+    FuriHalSpiBusHandle* handle,
+    uint8_t* packet,
+    uint8_t* ret_packetsize,
+    uint8_t packet_size) {
     uint8_t status = 0;
     uint8_t buf[33]; // 32 max payload size + 1 for command
 
@@ -223,8 +224,9 @@ uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* re
         if(status & 0x80) return 0x80; // hardware error
         if(packet_size == 1)
             packet_size = nrf24_get_packetlen(handle, (status >> 1) & 7);
-        else if(packet_size == 0){
-            buf[0] = R_RX_PL_WID; buf[1] = 0xFF;
+        else if(packet_size == 0) {
+            buf[0] = R_RX_PL_WID;
+            buf[1] = 0xFF;
             nrf24_spi_trx(handle, buf, buf, 2);
             packet_size = buf[1];
         }
@@ -257,7 +259,9 @@ uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t si
         status = nrf24_status(handle);
     } while(!(status & (TX_DS | MAX_RT)) && furi_get_tick() - start_time < 100UL);
     if(status & MAX_RT) {
-        if(furi_log_get_level() == FuriLogLevelDebug) FURI_LOG_D("NRF", "MAX RT: %X (%X)", nrf24_read_register(handle, REG_OBSERVE_TX), status);
+        if(furi_log_get_level() == FuriLogLevelDebug)
+            FURI_LOG_D(
+                "NRF", "MAX RT: %X (%X)", nrf24_read_register(handle, REG_OBSERVE_TX), status);
         nrf24_flush_tx(handle);
     }
     furi_hal_gpio_write(nrf24_CE_PIN, false);
@@ -373,9 +377,8 @@ void int16_to_bytes(uint16_t val, uint8_t* out, bool bigendian) {
     }
 }
 
-uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t *mac, uint8_t mlen)
-{
+uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t* mac, uint8_t mlen) {
     uint8_t addr[5];
-	for(int i = 0; i < mlen; i++) addr[i] = mac[mlen - i - 1];
-	return nrf24_write_buf_reg(nrf24_HANDLE, mac_addr, addr, mlen);
+    for(int i = 0; i < mlen; i++) addr[i] = mac[mlen - i - 1];
+    return nrf24_write_buf_reg(nrf24_HANDLE, mac_addr, addr, mlen);
 }

nrf24batch/lib/nrf24/nrf24.h

@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <furi_hal_spi.h>
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,16 +48,16 @@ extern "C" {
 #define RX_PW_P3 0x14
 #define RX_PW_P4 0x15
 #define RX_PW_P5 0x16
-#define RX_DR    0x40
-#define TX_DS    0x20
-#define MAX_RT   0x10
+#define RX_DR 0x40
+#define TX_DS 0x20
+#define MAX_RT 0x10
 #define NRF24_EN_DYN_ACK 0x01
 
 #define nrf24_TIMEOUT 500
 #define nrf24_CE_PIN &gpio_ext_pb2
-#define nrf24_HANDLE                                                                         \
-    (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
-                                                         &furi_hal_spi_bus_handle_external_extra)
+#define nrf24_HANDLE                                                                        \
+    (momentum_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
+                                                        &furi_hal_spi_bus_handle_external_extra)
 
 /* Low level API */
 
@@ -281,8 +281,11 @@ uint8_t nrf24_set_dst_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t siz
  * 
  * @return     device status
  */
-uint8_t
-    nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* ret_packetsize, uint8_t packet_size_flag);
+uint8_t nrf24_rxpacket(
+    FuriHalSpiBusHandle* handle,
+    uint8_t* packet,
+    uint8_t* ret_packetsize,
+    uint8_t packet_size_flag);
 
 /** Sends TX packet
  *
@@ -318,7 +321,7 @@ void nrf24_configure(
     bool disable_aa);
 
 // Set mac address (MSB first), Return: Status
-uint8_t  nrf24_set_mac(uint8_t mac_addr, uint8_t *mac, uint8_t mlen);
+uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t* mac, uint8_t mlen);
 
 /** Configures the radio for "promiscuous mode" and primes it for rx
  * This is not an actual mode of the nrf24, but this function exploits a few bugs in the chip that allows it to act as if it were.

nrf24channelscanner/lib/nrf24/nrf24.c

@@ -6,20 +6,20 @@
 #include <string.h>
 
 void nrf24_init() {
-    // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-	#ifdef XTREME_SETTINGS_PATH
-	
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+// this is needed if multiple SPI devices are connected to the same bus but with different CS pins
+#ifdef MOMENTUM_SETTINGS_PATH
+
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
-	#else
-		furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
-		furi_hal_gpio_write(&gpio_ext_pc3, true);
-	#endif
+#else
+    furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
+    furi_hal_gpio_write(&gpio_ext_pc3, true);
+#endif
     furi_hal_spi_bus_handle_init(nrf24_HANDLE);
     furi_hal_spi_acquire(nrf24_HANDLE);
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeOutputPushPull, GpioPullUp, GpioSpeedVeryHigh);
@@ -32,16 +32,16 @@ void nrf24_deinit() {
     furi_hal_gpio_write(nrf24_CE_PIN, false);
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
-	#ifdef XTREME_SETTINGS_PATH
-		// resetting the CS pins to floating
-		if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
-			furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-		} else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
-			furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
-		}
-	#else
-		furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-	#endif
+#ifdef MOMENTUM_SETTINGS_PATH
+    // resetting the CS pins to floating
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
+        furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
+        furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
+    }
+#else
+    furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
+#endif
 }
 
 void nrf24_spi_trx(

nrf24channelscanner/lib/nrf24/nrf24.h

@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <furi_hal_spi.h>
-#if __has_include("xtreme.h") 
-#include <xtreme/xtreme.h>
+#if __has_include("momentum.h")
+#include <momentum/momentum.h>
 #endif
 
 #ifdef __cplusplus
@@ -44,10 +44,10 @@ extern "C" {
 
 #define nrf24_TIMEOUT 500
 #define nrf24_CE_PIN &gpio_ext_pb2
-#ifdef XTREME_SETTINGS_PATH
-#define nrf24_HANDLE                                                                         \
-    (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
-                                                         &furi_hal_spi_bus_handle_external_extra)
+#ifdef MOMENTUM_SETTINGS_PATH
+#define nrf24_HANDLE                                                                        \
+    (momentum_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
+                                                        &furi_hal_spi_bus_handle_external_extra)
 #else
 #define nrf24_HANDLE &furi_hal_spi_bus_handle_external
 #endif

nrf24mousejacker/lib/nrf24/nrf24.c

@@ -7,10 +7,10 @@
 
 void nrf24_init() {
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
@@ -28,9 +28,9 @@ void nrf24_deinit() {
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
     // resetting the CS pins to floating
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 }

nrf24mousejacker/lib/nrf24/nrf24.h

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <furi_hal_spi.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,9 +42,9 @@ extern "C" {
 
 #define nrf24_TIMEOUT 500
 #define nrf24_CE_PIN &gpio_ext_pb2
-#define nrf24_HANDLE                                                                         \
-    (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
-                                                         &furi_hal_spi_bus_handle_external_extra)
+#define nrf24_HANDLE                                                                        \
+    (momentum_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
+                                                        &furi_hal_spi_bus_handle_external_extra)
 
 /* Low level API */
 

nrf24scan/lib/nrf24/nrf24.c

@@ -9,10 +9,10 @@
 
 void nrf24_init() {
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
@@ -30,9 +30,9 @@ void nrf24_deinit() {
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
     // resetting the CS pins to floating
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 }
@@ -57,7 +57,8 @@ uint8_t nrf24_write_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t data)
     return rx[0];
 }
 
-uint8_t nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
+uint8_t
+    nrf24_write_buf_reg(FuriHalSpiBusHandle* handle, uint8_t reg, uint8_t* data, uint8_t size) {
     uint8_t tx[size + 1];
     uint8_t rx[size + 1];
     memset(rx, 0, size + 1);
@@ -206,7 +207,11 @@ uint8_t nrf24_set_packetlen(FuriHalSpiBusHandle* handle, uint8_t len) {
     return status;
 }
 
-uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* ret_packetsize, uint8_t packet_size) {
+uint8_t nrf24_rxpacket(
+    FuriHalSpiBusHandle* handle,
+    uint8_t* packet,
+    uint8_t* ret_packetsize,
+    uint8_t packet_size) {
     uint8_t status = 0;
     uint8_t tx_cmd[33] = {0}; // 32 max payload size + 1 for command
     uint8_t tmp_packet[33] = {0};
@@ -220,13 +225,15 @@ uint8_t nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* re
     if(status & RX_DR) {
         if(packet_size == 1)
             packet_size = nrf24_get_packetlen(handle, (status >> 1) & 7);
-        else if(packet_size == 0){
-            tx_cmd[0] = R_RX_PL_WID; tx_cmd[1] = 0;
+        else if(packet_size == 0) {
+            tx_cmd[0] = R_RX_PL_WID;
+            tx_cmd[1] = 0;
             nrf24_spi_trx(handle, tx_cmd, tmp_packet, 2, nrf24_TIMEOUT);
             packet_size = tmp_packet[1];
         }
         if(packet_size > 32 || packet_size == 0) packet_size = 32;
-        tx_cmd[0] = R_RX_PAYLOAD; tx_cmd[1] = 0;
+        tx_cmd[0] = R_RX_PAYLOAD;
+        tx_cmd[1] = 0;
         nrf24_spi_trx(handle, tx_cmd, tmp_packet, packet_size + 1, nrf24_TIMEOUT);
         memcpy(packet, &tmp_packet[1], packet_size);
         nrf24_write_reg(handle, REG_STATUS, RX_DR); // clear RX_DR
@@ -256,7 +263,8 @@ uint8_t nrf24_txpacket(FuriHalSpiBusHandle* handle, uint8_t* payload, uint8_t si
     nrf24_set_tx_mode(handle);
 
     uint32_t start_time = furi_get_tick();
-    while(!(status & (TX_DS | MAX_RT)) && furi_get_tick() - start_time < 2000UL) status = nrf24_status(handle);
+    while(!(status & (TX_DS | MAX_RT)) && furi_get_tick() - start_time < 2000UL)
+        status = nrf24_status(handle);
 
     if(status & MAX_RT) nrf24_flush_tx(handle);
 
@@ -541,9 +549,8 @@ uint8_t nrf24_find_channel(
     return ch;
 }
 
-uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t *mac, uint8_t mlen)
-{
+uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t* mac, uint8_t mlen) {
     uint8_t addr[5];
-	for(int i = 0; i < mlen; i++) addr[i] = mac[mlen - i - 1];
-	return nrf24_write_buf_reg(nrf24_HANDLE, mac_addr, addr, mlen);
+    for(int i = 0; i < mlen; i++) addr[i] = mac[mlen - i - 1];
+    return nrf24_write_buf_reg(nrf24_HANDLE, mac_addr, addr, mlen);
 }

nrf24scan/lib/nrf24/nrf24.h

@@ -2,7 +2,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <furi_hal_spi.h>
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -47,15 +47,15 @@ extern "C" {
 #define RX_PW_P3 0x14
 #define RX_PW_P4 0x15
 #define RX_PW_P5 0x16
-#define RX_DR    0x40
-#define TX_DS    0x20
-#define MAX_RT   0x10
+#define RX_DR 0x40
+#define TX_DS 0x20
+#define MAX_RT 0x10
 
 #define nrf24_TIMEOUT 500
 #define nrf24_CE_PIN &gpio_ext_pb2
-#define nrf24_HANDLE                                                                         \
-    (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
-                                                         &furi_hal_spi_bus_handle_external_extra)
+#define nrf24_HANDLE                                                                        \
+    (momentum_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
+                                                        &furi_hal_spi_bus_handle_external_extra)
 
 /* Low level API */
 
@@ -276,8 +276,11 @@ uint8_t nrf24_set_dst_mac(FuriHalSpiBusHandle* handle, uint8_t* mac, uint8_t siz
  * 
  * @return     device status
  */
-uint8_t
-    nrf24_rxpacket(FuriHalSpiBusHandle* handle, uint8_t* packet, uint8_t* ret_packetsize, uint8_t packet_size_flag);
+uint8_t nrf24_rxpacket(
+    FuriHalSpiBusHandle* handle,
+    uint8_t* packet,
+    uint8_t* ret_packetsize,
+    uint8_t packet_size_flag);
 
 /** Sends TX packet
  *
@@ -313,7 +316,7 @@ void nrf24_configure(
     bool disable_aa);
 
 // Set mac address (MSB first), Return: Status
-uint8_t  nrf24_set_mac(uint8_t mac_addr, uint8_t *mac, uint8_t mlen);
+uint8_t nrf24_set_mac(uint8_t mac_addr, uint8_t* mac, uint8_t mlen);
 
 /** Configures the radio for "promiscuous mode" and primes it for rx
  * This is not an actual mode of the nrf24, but this function exploits a few bugs in the chip that allows it to act as if it were.

nrf24sniff/lib/nrf24/nrf24.c

@@ -7,10 +7,10 @@
 
 void nrf24_init() {
     // this is needed if multiple SPI devices are connected to the same bus but with different CS pins
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pc3, true);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeOutputPushPull);
         furi_hal_gpio_write(&gpio_ext_pa4, true);
     }
@@ -28,9 +28,9 @@ void nrf24_deinit() {
     furi_hal_gpio_init(nrf24_CE_PIN, GpioModeAnalog, GpioPullNo, GpioSpeedLow);
 
     // resetting the CS pins to floating
-    if(xtreme_settings.spi_nrf24_handle == SpiDefault) {
+    if(momentum_settings.spi_nrf24_handle == SpiDefault) {
         furi_hal_gpio_init_simple(&gpio_ext_pc3, GpioModeAnalog);
-    } else if(xtreme_settings.spi_nrf24_handle == SpiExtra) {
+    } else if(momentum_settings.spi_nrf24_handle == SpiExtra) {
         furi_hal_gpio_init_simple(&gpio_ext_pa4, GpioModeAnalog);
     }
 }

nrf24sniff/lib/nrf24/nrf24.h

@@ -3,7 +3,7 @@
 #include <stdint.h>
 #include <furi_hal_spi.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -42,9 +42,9 @@ extern "C" {
 
 #define nrf24_TIMEOUT 500
 #define nrf24_CE_PIN &gpio_ext_pb2
-#define nrf24_HANDLE                                                                         \
-    (xtreme_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
-                                                         &furi_hal_spi_bus_handle_external_extra)
+#define nrf24_HANDLE                                                                        \
+    (momentum_settings.spi_nrf24_handle == SpiDefault ? &furi_hal_spi_bus_handle_external : \
+                                                        &furi_hal_spi_bus_handle_external_extra)
 
 /* Low level API */
 

totp/config/app/config.h

@@ -1,25 +1,7 @@
-// List of compatible firmwares
-#define TOTP_FIRMWARE_OFFICIAL_STABLE (1)
-#define TOTP_FIRMWARE_OFFICIAL_DEV (2)
-#define TOTP_FIRMWARE_XTREME_UL (3)
-// End of list
-
 #if __has_include("ufbt_def.h")
 #include "ufbt_def.h"
 #endif
 
-#ifndef TOTP_TARGET_FIRMWARE
-#if defined(TARGET_FIRMWARE_OFFICIAL) || defined(FW_ORIGIN_Official)
-#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_OFFICIAL_STABLE
-#elif defined(TARGET_FIRMWARE_UNLEASHED) || defined(FW_ORIGIN_Unleashed)
-#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_XTREME_UL
-#elif defined(TARGET_FIRMWARE_XTREME) || defined(FW_ORIGIN_Xtreme)
-#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_XTREME_UL
-#else
-#define TOTP_TARGET_FIRMWARE TOTP_FIRMWARE_OFFICIAL_STABLE
-#endif
-#endif
-
 // Application automatic lock timeout if user IDLE. (ticks)
 #ifndef TOTP_AUTO_LOCK_IDLE_TIMEOUT_SEC
 #define TOTP_AUTO_LOCK_IDLE_TIMEOUT_SEC (60)

wardriver/application.fam

@@ -7,7 +7,7 @@ App(
     fap_icon="lookingglass.png",
     fap_category="WiFi",
     fap_author="@Sil333033",
-    fap_weburl="https://github.com/Flipper-XFW/Xtreme-Apps/tree/dev/wardriver",
+    fap_weburl="https://github.com/NextFlip/Momentum-Apps/tree/dev/wardriver",
     fap_version="1.0",
     fap_description="Sniff WiFi access points with GPS location coordinates",
     fap_icon_assets="icons",

wardriver/wardriver.c

@@ -48,7 +48,7 @@ void save_file(Context* ctx) {
         "WigleWifi-1.4",
         "appRelease=v2.0",
         "model=S33",
-        "release=XtremeFW",
+        "release=MomentumFW",
         "Flipper Zero",
         "",
         "Wardriver",
@@ -175,7 +175,7 @@ static void render_callback(Canvas* canvas, void* context) {
             canvas_draw_str(canvas, 0, 10, "GPS channel invalid!");
             canvas_draw_str(canvas, 0, 20, "Change UART");
             canvas_draw_str(canvas, 0, 30, "channel");
-            canvas_draw_str(canvas, 0, 40, "in the Xtreme");
+            canvas_draw_str(canvas, 0, 40, "in the Momentum");
             canvas_draw_str(canvas, 0, 50, "app");
         } else {
             furi_string_printf(

wardriver/wardriver.h

@@ -6,7 +6,7 @@
 #include <notification/notification_messages.h>
 #include <assets_icons.h>
 #include <toolbox/stream/file_stream.h>
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
 #include "helpers/minmea.h"
 #include "wardriver_icons.h"

wardriver/wardriver_uart.h

@@ -1,8 +1,8 @@
 #include "wardriver.h"
 
-#define UART_CH_ESP (xtreme_settings.uart_esp_channel)
+#define UART_CH_ESP (momentum_settings.uart_esp_channel)
 
-#define UART_CH_GPS (xtreme_settings.uart_nmea_channel)
+#define UART_CH_GPS (momentum_settings.uart_nmea_channel)
 
 #define WORKER_ALL_RX_EVENTS (WorkerEvtStop | WorkerEvtRxDone)
 

wifi_deauther/wifi_deauther_app_i.h

@@ -12,9 +12,9 @@
 #include <gui/modules/text_input.h>
 #include <gui/modules/variable_item_list.h>
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 
 #define NUM_MENU_ITEMS (11)
 

wifi_marauder_companion/wifi_marauder_uart.c

@@ -1,9 +1,9 @@
 #include "wifi_marauder_app_i.h"
 #include "wifi_marauder_uart.h"
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)
 #define BAUDRATE (115200)
 
 struct WifiMarauderUart {

wifi_scanner/FlipperZeroWiFiModuleDefines.h

@@ -16,6 +16,6 @@
 
 #define NA 0
 
-#include <xtreme/xtreme.h>
+#include <momentum/momentum.h>
 
-#define UART_CH (xtreme_settings.uart_esp_channel)
+#define UART_CH (momentum_settings.uart_esp_channel)