fix npdref

2026-05-17 04:34:44 -07:00 · 2023-09-20 17:07:50 +02:00
parent b9382c912e
commit 7318a08c32
20 changed files with 20 additions and 19 deletions
--- a/applications/main/subghz/subghz_history.c
+++ b/applications/main/subghz/subghz_history.c
@@ -271,5 +271,6 @@ bool subghz_history_add_to_history(

    furi_string_free(text);
    instance->last_index_write++;
+    FURI_LOG_E(TAG, "Add history exit");
    return true;
 }
--- a/lib/subghz/protocols/acurite_592txr.c
+++ b/lib/subghz/protocols/acurite_592txr.c
@@ -82,7 +82,7 @@ const SubGhzProtocolEncoder ws_protocol_acurite_592txr_encoder = {

 const SubGhzProtocol ws_protocol_acurite_592txr = {
    .name = WS_PROTOCOL_ACURITE_592TXR_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/acurite_606tx.c
+++ b/lib/subghz/protocols/acurite_606tx.c
@@ -67,7 +67,7 @@ const SubGhzProtocolEncoder ws_protocol_acurite_606tx_encoder = {

 const SubGhzProtocol ws_protocol_acurite_606tx = {
    .name = WS_PROTOCOL_ACURITE_606TX_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/acurite_609txc.c
+++ b/lib/subghz/protocols/acurite_609txc.c
@@ -68,7 +68,7 @@ const SubGhzProtocolEncoder ws_protocol_acurite_609txc_encoder = {

 const SubGhzProtocol ws_protocol_acurite_609txc = {
    .name = WS_PROTOCOL_ACURITE_609TXC_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/ambient_weather.c
+++ b/lib/subghz/protocols/ambient_weather.c
@@ -82,7 +82,7 @@ const SubGhzProtocolEncoder ws_protocol_ambient_weather_encoder = {

 const SubGhzProtocol ws_protocol_ambient_weather = {
    .name = WS_PROTOCOL_AMBIENT_WEATHER_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/auriol_ahfl.c
+++ b/lib/subghz/protocols/auriol_ahfl.c
@@ -79,7 +79,7 @@ const SubGhzProtocolEncoder ws_protocol_auriol_ahfl_encoder = {

 const SubGhzProtocol ws_protocol_auriol_ahfl = {
    .name = WS_PROTOCOL_AURIOL_AHFL_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/auriol_hg0601a.c
+++ b/lib/subghz/protocols/auriol_hg0601a.c
@@ -78,7 +78,7 @@ const SubGhzProtocolEncoder ws_protocol_auriol_th_encoder = {

 const SubGhzProtocol ws_protocol_auriol_th = {
    .name = WS_PROTOCOL_AURIOL_TH_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/gt_wt_02.c
+++ b/lib/subghz/protocols/gt_wt_02.c
@@ -81,7 +81,7 @@ const SubGhzProtocolEncoder ws_protocol_gt_wt_02_encoder = {

 const SubGhzProtocol ws_protocol_gt_wt_02 = {
    .name = WS_PROTOCOL_GT_WT_02_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/gt_wt_03.c
+++ b/lib/subghz/protocols/gt_wt_03.c
@@ -107,7 +107,7 @@ const SubGhzProtocolEncoder ws_protocol_gt_wt_03_encoder = {

 const SubGhzProtocol ws_protocol_gt_wt_03 = {
    .name = WS_PROTOCOL_GT_WT_03_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/infactory.c
+++ b/lib/subghz/protocols/infactory.c
@@ -92,7 +92,7 @@ const SubGhzProtocolEncoder ws_protocol_infactory_encoder = {

 const SubGhzProtocol ws_protocol_infactory = {
    .name = WS_PROTOCOL_INFACTORY_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/lacrosse_tx.c
+++ b/lib/subghz/protocols/lacrosse_tx.c
@@ -96,7 +96,7 @@ const SubGhzProtocolEncoder ws_protocol_lacrosse_tx_encoder = {

 const SubGhzProtocol ws_protocol_lacrosse_tx = {
    .name = WS_PROTOCOL_LACROSSE_TX_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/lacrosse_tx141thbv2.c
+++ b/lib/subghz/protocols/lacrosse_tx141thbv2.c
@@ -74,7 +74,7 @@ const SubGhzProtocolEncoder ws_protocol_lacrosse_tx141thbv2_encoder = {

 const SubGhzProtocol ws_protocol_lacrosse_tx141thbv2 = {
    .name = WS_PROTOCOL_LACROSSE_TX141THBV2_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/nexus_th.c
+++ b/lib/subghz/protocols/nexus_th.c
@@ -80,7 +80,7 @@ const SubGhzProtocolEncoder ws_protocol_nexus_th_encoder = {

 const SubGhzProtocol ws_protocol_nexus_th = {
    .name = WS_PROTOCOL_NEXUS_TH_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/oregon2.c
+++ b/lib/subghz/protocols/oregon2.c
@@ -422,7 +422,7 @@ const SubGhzProtocolDecoder ws_protocol_oregon2_decoder = {

 const SubGhzProtocol ws_protocol_oregon2 = {
    .name = WS_PROTOCOL_OREGON2_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
            SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/oregon3.c
+++ b/lib/subghz/protocols/oregon3.c
@@ -358,7 +358,7 @@ const SubGhzProtocolDecoder ws_protocol_oregon3_decoder = {

 const SubGhzProtocol ws_protocol_oregon3 = {
    .name = WS_PROTOCOL_OREGON3_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable |
            SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/oregon_v1.c
+++ b/lib/subghz/protocols/oregon_v1.c
@@ -93,7 +93,7 @@ const SubGhzProtocolEncoder ws_protocol_oregon_v1_encoder = {

 const SubGhzProtocol ws_protocol_oregon_v1 = {
    .name = WS_PROTOCOL_OREGON_V1_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/protocol_items.c
+++ b/lib/subghz/protocols/protocol_items.c
@@ -60,7 +60,7 @@ const SubGhzProtocol* subghz_protocol_registry_items[] = {
    &ws_protocol_tx_8300,
    &ws_protocol_wendox_w6726,
    &ws_protocol_auriol_ahfl,
-    &subghz_protocol_pocsag,
+    // &subghz_protocol_pocsag,
    &tpms_protocol_schrader_gg4,
    &subghz_protocol_bin_raw,
 };
--- a/lib/subghz/protocols/thermopro_tx4.c
+++ b/lib/subghz/protocols/thermopro_tx4.c
@@ -77,7 +77,7 @@ const SubGhzProtocolEncoder ws_protocol_thermopro_tx4_encoder = {

 const SubGhzProtocol ws_protocol_thermopro_tx4 = {
    .name = WS_PROTOCOL_THERMOPRO_TX4_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/tx_8300.c
+++ b/lib/subghz/protocols/tx_8300.c
@@ -88,7 +88,7 @@ const SubGhzProtocolEncoder ws_protocol_tx_8300_encoder = {

 const SubGhzProtocol ws_protocol_tx_8300 = {
    .name = WS_PROTOCOL_TX_8300_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,

--- a/lib/subghz/protocols/wendox_w6726.c
+++ b/lib/subghz/protocols/wendox_w6726.c
@@ -82,7 +82,7 @@ const SubGhzProtocolEncoder ws_protocol_wendox_w6726_encoder = {

 const SubGhzProtocol ws_protocol_wendox_w6726 = {
    .name = WS_PROTOCOL_WENDOX_W6726_NAME,
-    .type = SubGhzProtocolWeatherStation,
+    .type = SubGhzProtocolTypeStatic,
    .flag = SubGhzProtocolFlag_433 | SubGhzProtocolFlag_315 | SubGhzProtocolFlag_868 |
            SubGhzProtocolFlag_AM | SubGhzProtocolFlag_Decodable | SubGhzProtocolFlag_Weather,