subghz apps 2fsk12kdev support

xMasterX · xMasterX · commit fca96440a66c · 2026-01-05T21:17:14.000+03:00
diff --git a/apps_source_code/tpms_receiver/protocols/tpms_generic.c b/apps_source_code/tpms_receiver/protocols/tpms_generic.c
@@ -13,6 +13,8 @@ void tpms_block_generic_get_preset_name(const char* preset_name, FuriString* pre
         preset_name_temp = "FuriHalSubGhzPresetOok650Async";
     } else if(!strcmp(preset_name, "FM238")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev238Async";
+    } else if(!strcmp(preset_name, "FM12K")) {
+        preset_name_temp = "FuriHalSubGhzPreset2FSKDev12KAsync";
     } else if(!strcmp(preset_name, "FM476")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev476Async";
     } else {
diff --git a/apps_source_code/tpms_receiver/tpms_app_i.c b/apps_source_code/tpms_receiver/tpms_app_i.c
@@ -24,6 +24,8 @@ bool tpms_set_preset(TPMSApp* app, const char* preset) {
         furi_string_set(app->txrx->preset->name, "AM650");
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         furi_string_set(app->txrx->preset->name, "FM238");
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        furi_string_set(app->txrx->preset->name, "FM12K");
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         furi_string_set(app->txrx->preset->name, "FM476");
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/base_pack/playlist/helpers/subghz_txrx.c b/base_pack/playlist/helpers/subghz_txrx.c
@@ -129,6 +129,8 @@ const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset
         preset_name = "AM650";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         preset_name = "FM238";
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        preset_name = "FM12K";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         preset_name = "FM476";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/base_pack/pocsag_pager/protocols/pcsg_generic.c b/base_pack/pocsag_pager/protocols/pcsg_generic.c
@@ -13,6 +13,8 @@ void pcsg_block_generic_get_preset_name(const char* preset_name, FuriString* pre
         preset_name_temp = "FuriHalSubGhzPresetOok650Async";
     } else if(!strcmp(preset_name, "FM238")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev238Async";
+    } else if(!strcmp(preset_name, "FM12K")) {
+        preset_name_temp = "FuriHalSubGhzPreset2FSKDev12KAsync";
     } else if(!strcmp(preset_name, "FM476")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev476Async";
     } else {
diff --git a/base_pack/protoview/app_subghz.c b/base_pack/protoview/app_subghz.c
@@ -20,6 +20,11 @@ ProtoViewModulation ProtoViewModulations[] = {
      FuriHalSubGhzPreset2FSKDev238Async,
      NULL,
      30},
+    {"2FSK 12Khz",
+     "FuriHalSubGhzPreset2FSKDev12KAsync",
+     FuriHalSubGhzPreset2FSKDev12KAsync,
+     NULL,
+     30},
     {"2FSK 47.6Khz",
      "FuriHalSubGhzPreset2FSKDev476Async",
      FuriHalSubGhzPreset2FSKDev476Async,
diff --git a/base_pack/quac/actions/helpers/subghz_txrx.c b/base_pack/quac/actions/helpers/subghz_txrx.c
@@ -127,6 +127,8 @@ const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset
         preset_name = "AM650";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         preset_name = "FM238";
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        preset_name = "FM12K";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         preset_name = "FM476";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/base_pack/subghz-scheduler/helpers/subghz_txrx.c b/base_pack/subghz-scheduler/helpers/subghz_txrx.c
@@ -127,6 +127,8 @@ const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset
         preset_name = "AM650";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         preset_name = "FM238";
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        preset_name = "FM12K";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         preset_name = "FM476";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/base_pack/weather_station/protocols/ws_generic.c b/base_pack/weather_station/protocols/ws_generic.c
@@ -13,6 +13,8 @@ void ws_block_generic_get_preset_name(const char* preset_name, FuriString* prese
         preset_name_temp = "FuriHalSubGhzPresetOok650Async";
     } else if(!strcmp(preset_name, "FM238")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev238Async";
+    } else if(!strcmp(preset_name, "FM12K")) {
+        preset_name_temp = "FuriHalSubGhzPreset2FSKDev12KAsync";
     } else if(!strcmp(preset_name, "FM476")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev476Async";
     } else {
diff --git a/base_pack/weather_station/weather_station_app_i.c b/base_pack/weather_station/weather_station_app_i.c
@@ -24,6 +24,8 @@ bool ws_set_preset(WeatherStationApp* app, const char* preset) {
         furi_string_set(app->txrx->preset->name, "AM650");
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         furi_string_set(app->txrx->preset->name, "FM238");
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        furi_string_set(app->txrx->preset->name, "FM12K");
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         furi_string_set(app->txrx->preset->name, "FM476");
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/non_catalog_apps/fmf_to_sub/app.c b/non_catalog_apps/fmf_to_sub/app.c
@@ -166,8 +166,9 @@ static char* setting_modulation_values[] = {
     "FuriHalSubGhzPresetOok270Async",
     "FuriHalSubGhzPresetOok650Async",
     "FuriHalSubGhzPreset2FSKDev238Async",
+    "FuriHalSubGhzPreset2FSKDev12KAsync",
     "FuriHalSubGhzPreset2FSKDev476Async"};
-static char* setting_modulation_names[] = {"AM270", "AM650", "FM238", "FM476"};
+static char* setting_modulation_names[] = {"AM270", "AM650", "FM238", "FM12K", "FM476"};
 static void fmf2sub_setting_modulation_change(VariableItem* item) {
     Fmf2SubApp* app = variable_item_get_context(item);
     uint8_t index = variable_item_get_current_value_index(item);
diff --git a/non_catalog_apps/freq_analyzer_ext/helpers/subghz_txrx.c b/non_catalog_apps/freq_analyzer_ext/helpers/subghz_txrx.c
@@ -116,6 +116,8 @@ const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset
         preset_name = "AM650";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         preset_name = "FM238";
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        preset_name = "FM12K";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         preset_name = "FM476";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/non_catalog_apps/genie-recorder/protocols/generic.c b/non_catalog_apps/genie-recorder/protocols/generic.c
@@ -12,6 +12,8 @@ void subghz_block_generic_get_preset_name(const char* preset_name, FuriString* p
         preset_name_temp = "FuriHalSubGhzPresetOok650Async";
     } else if(!strcmp(preset_name, "FM238")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev238Async";
+    } else if(!strcmp(preset_name, "FM12K")) {
+        preset_name_temp = "FuriHalSubGhzPreset2FSKDev12KAsync";
     } else if(!strcmp(preset_name, "FM476")) {
         preset_name_temp = "FuriHalSubGhzPreset2FSKDev476Async";
     } else {
diff --git a/non_catalog_apps/magspoof_flipper/helpers/mag_helpers.c b/non_catalog_apps/magspoof_flipper/helpers/mag_helpers.c
@@ -153,11 +153,7 @@ void tx_deinit_rfid() {
 void tx_init_rf(int hz) {
     // presets and frequency will need some experimenting
     furi_hal_subghz_reset();
-    // furi_hal_subghz_load_preset(FuriHalSubGhzPresetOok650Async);
-    // furi_hal_subghz_load_preset(FuriHalSubGhzPresetGFSK9_99KbAsync);
-    // furi_hal_subghz_load_preset(FuriHalSubGhzPresetMSK99_97KbAsync);
-    // furi_hal_subghz_load_preset(FuriHalSubGhzPreset2FSKDev238Async);
-    // furi_hal_subghz_load_preset(FuriHalSubGhzPreset2FSKDev476Async);
+
     furi_hal_gpio_init(&gpio_cc1101_g0, GpioModeOutputPushPull, GpioPullNo, GpioSpeedLow);
     furi_hal_subghz_set_frequency_and_path(hz);
     furi_hal_subghz_tx();
diff --git a/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c b/non_catalog_apps/meal_pager/helpers/subghz/subghz_txrx.c
@@ -126,6 +126,8 @@ const char* subghz_txrx_get_preset_name(SubGhzTxRx* instance, const char* preset
         preset_name = "AM650";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev238Async")) {
         preset_name = "FM238";
+    } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev12KAsync")) {
+        preset_name = "FM12K";
     } else if(!strcmp(preset, "FuriHalSubGhzPreset2FSKDev476Async")) {
         preset_name = "FM476";
     } else if(!strcmp(preset, "FuriHalSubGhzPresetCustom")) {
diff --git a/non_catalog_apps/subghz_signal_generator/subghz_signal_gen.c b/non_catalog_apps/subghz_signal_generator/subghz_signal_gen.c
@@ -40,6 +40,7 @@ static const FrequencyBand valid_frequency_bands[] = {
 static const char *signal_modes[] = {
     "OOK 650kHz",
     "2FSK 2.38kHz",
+    "2FSK 12kHz",
     "2FSK 47.6kHz",
     "MSK 99.97Kb/s",
     "GFSK 9.99Kb/s",
@@ -564,6 +565,9 @@ static void subghz_signal_gen_switch_mode(SubGhzSignalGenApp *app)
     case SignalMode2FSKDev238Async:
         subghz_devices_load_preset(app->device, FuriHalSubGhzPreset2FSKDev238Async, NULL);
         break;
+    case SignalMode2FSKDev12KAsync:
+        subghz_devices_load_preset(app->device, FuriHalSubGhzPreset2FSKDev12KAsync, NULL);
+        break;
     case SignalMode2FSKDev476Async:
         subghz_devices_load_preset(app->device, FuriHalSubGhzPreset2FSKDev476Async, NULL);
         break;
@@ -644,6 +648,7 @@ static int32_t subghz_signal_gen_tx_thread(void *context)
         memset(signal_data, 0xFF, sizeof(signal_data));
         break;
     case SignalMode2FSKDev238Async:
+    case SignalMode2FSKDev12KAsync:
     case SignalMode2FSKDev476Async:
         for (size_t i = 0; i < sizeof(signal_data); i++)
         {
diff --git a/non_catalog_apps/subghz_signal_generator/subghz_signal_gen.h b/non_catalog_apps/subghz_signal_generator/subghz_signal_gen.h
@@ -25,6 +25,7 @@ typedef enum
 {
     SignalModeOok650Async,
     SignalMode2FSKDev238Async,
+    SignalMode2FSKDev12KAsync,
     SignalMode2FSKDev476Async,
     SignalModeMSK99_97KbAsync,
     SignalModeGFSK9_99KbAsync,
