Skip to content
This repository has been archived by the owner on Nov 3, 2023. It is now read-only.

Commit

Permalink
Preset TPMS e inizio protocollo Baldr Rain
Browse files Browse the repository at this point in the history
- Preset TPMS - preset di gestione tpms.

WORK IN PROGRESS:
Baldr Rain protocollo di supporto al sensore di pioggia su dispositivi a protocollo NEXUS.
preset - fm238 e frequenza 433.92
  • Loading branch information
haisenteck committed Sep 24, 2023
1 parent 7dc6cba commit fc507aa
Show file tree
Hide file tree
Showing 25 changed files with 491 additions and 6 deletions.
Binary file modified dist/f7-D/f7-update-local/firmware.dfu
Binary file not shown.
Binary file modified dist/f7-D/f7-update-local/resources.tar
Binary file not shown.
2 changes: 1 addition & 1 deletion dist/f7-D/f7-update-local/update.fuf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Info: local
Target: 7
Loader: updater.bin
# little-endian hex!
Loader CRC: DB C8 4B 20
Loader CRC: BE 04 18 7B
Firmware: firmware.dfu
Radio: radio.bin
Radio address: 00 50 0D 08
Expand Down
Binary file modified dist/f7-D/f7-update-local/updater.bin
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-firmware-local.elf
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-full-local.bin
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-full-local.dfu
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/f7-D/flipper-z-f7-full-local.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firmware_build_date": "21-09-2023",
"firmware_commit": "46b72ecb",
"firmware_build_date": "24-09-2023",
"firmware_commit": "7dc6cbac",
"firmware_branch": "dev",
"firmware_target": 7,
"firmware_version": "unknown"
Expand Down
Binary file modified dist/f7-D/flipper-z-f7-sdk-local.zip
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-update-local.tgz
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-updater-local.bin
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-updater-local.dfu
Binary file not shown.
Binary file modified dist/f7-D/flipper-z-f7-updater-local.elf
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/f7-D/flipper-z-f7-updater-local.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"firmware_build_date": "21-09-2023",
"firmware_commit": "46b72ecb",
"firmware_build_date": "24-09-2023",
"firmware_commit": "7dc6cbac",
"firmware_branch": "dev",
"firmware_target": 7,
"firmware_version": "unknown"
Expand Down
3 changes: 2 additions & 1 deletion firmware/targets/f7/api_symbols.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
entry,status,name,type,params
Version,+,37.2,,
Version,+,37.3,,
Header,+,applications/drivers/subghz/cc1101_ext/cc1101_ext_interconnect.h,,
Header,+,applications/services/bt/bt_service/bt.h,,
Header,+,applications/services/cli/cli.h,,
Expand Down Expand Up @@ -3534,6 +3534,7 @@ Variable,+,sequence_success,const NotificationSequence,
Variable,-,subghz_device_cc1101_int,const SubGhzDevice,
Variable,+,subghz_device_cc1101_preset_2fsk_dev2_38khz_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_2fsk_dev47_6khz_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_TPMS,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_gfsk_9_99kb_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_msk_99_97kb_async_regs,const uint8_t[],
Variable,+,subghz_device_cc1101_preset_ook_270khz_async_regs,const uint8_t[],
Expand Down
2 changes: 2 additions & 0 deletions lib/subghz/blocks/generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ void subghz_block_generic_get_preset_name(const char* preset_name, FuriString* p
preset_name_temp = "FuriHalSubGhzPresetOok650Async_q";
} else if(!strcmp(preset_name, "AM650")) {
preset_name_temp = "FuriHalSubGhzPresetOok650Async";
} else if(!strcmp(preset_name, "TPMS")) {
preset_name_temp = "FuriHalSubGhzPresetTPMS";
} else if(!strcmp(preset_name, "FM238")) {
preset_name_temp = "FuriHalSubGhzPreset2FSKDev238Async";
} else if(!strcmp(preset_name, "FM476")) {
Expand Down
4 changes: 4 additions & 0 deletions lib/subghz/devices/cc1101_configs.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ const uint8_t subghz_device_cc1101_preset_ook_650khz_async_regs_better_q[] = {
0x02, 0x0D, 0x03, 0x07, 0x08, 0x32, 0x0B, 0x06, 0x14, 0x00, 0x13, 0x00, 0x12, 0x30, 0x11, 0x22, 0x10, 0x1C, 0x18, 0x18, 0x19, 0x18, 0x1D, 0x91, 0x1C, 0x00, 0x1B, 0x07, 0x20, 0xFB, 0x22, 0x11, 0x21, 0xB6, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};

const uint8_t subghz_device_cc1101_preset_TPMS[] = {
0x02, 0x0D, 0x07, 0x04, 0x08, 0x32, 0x0B, 0x06, 0x10, 0x69, 0x11, 0x93, 0x12, 0x14, 0x13, 0x01, 0x14, 0xF8, 0x15, 0x40, 0x18, 0x18, 0x19, 0x16, 0x1B, 0x07, 0x1C, 0x00, 0x1D, 0x91, 0x20, 0xFB, 0x21, 0x56, 0x22, 0x10, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
};

const uint8_t subghz_device_cc1101_preset_ook_650khz_async_regs[] = {
// https://e2e.ti.com/support/wireless-connectivity/sub-1-ghz-group/sub-1-ghz/f/sub-1-ghz-forum/382066/cc1101---don-t-know-the-correct-registers-configuration

Expand Down
1 change: 1 addition & 0 deletions lib/subghz/devices/cc1101_configs.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ extern "C" {
extern const uint8_t subghz_device_cc1101_preset_ook_270khz_async_regs[];
extern const uint8_t subghz_device_cc1101_preset_ook_650khz_async_regs[];
extern const uint8_t subghz_device_cc1101_preset_ook_650khz_async_regs_better_q[];
extern const uint8_t subghz_device_cc1101_preset_TPMS[];
extern const uint8_t subghz_device_cc1101_preset_2fsk_dev2_38khz_async_regs[];
extern const uint8_t subghz_device_cc1101_preset_2fsk_dev47_6khz_async_regs[];
extern const uint8_t subghz_device_cc1101_preset_msk_99_97kb_async_regs[];
Expand Down
3 changes: 3 additions & 0 deletions lib/subghz/devices/cc1101_int/cc1101_int_interconnect.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ static void subghz_device_cc1101_int_interconnect_load_preset(
FuriHalSubGhzPreset preset,
uint8_t* preset_data) {
switch(preset) {
case FuriHalSubGhzPresetTPMS:
furi_hal_subghz_load_custom_preset(subghz_device_cc1101_preset_TPMS);
break;
case FuriHalSubGhzPresetOok650Async:
furi_hal_subghz_load_custom_preset(subghz_device_cc1101_preset_ook_650khz_async_regs);
break;
Expand Down
1 change: 1 addition & 0 deletions lib/subghz/devices/preset.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ typedef enum {
FuriHalSubGhzPresetOok270Async, /**< OOK, bandwidth 270kHz, asynchronous */
FuriHalSubGhzPresetOok650Async, /**< OOK, bandwidth 650kHz, asynchronous */
FuriHalSubGhzPresetOok650Async_q, /** AM_Q*/
FuriHalSubGhzPresetTPMS, /** TPMS*/
FuriHalSubGhzPreset2FSKDev238Async, /**< FM, deviation 2.380371 kHz, asynchronous */
FuriHalSubGhzPreset2FSKDev476Async, /**< FM, deviation 47.60742 kHz, asynchronous */
FuriHalSubGhzPresetMSK99_97KbAsync, /**< MSK, deviation 47.60742 kHz, 99.97Kb/s, asynchronous */
Expand Down
Loading

0 comments on commit fc507aa

Please sign in to comment.