liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1254] ViewDispatcher improvements, SubGhz cli and certification preparation (#482)

Browse Source 
* Add more more frequencees and change ok key bahavior to toggle
* GUI: add queue support to ViewDispatcher
* SubGhz: basic cli
* SubGHz: pt send cli
* SubGhz: carrier cli commands.
* Fix irda test data merge artifacts
This commit is contained in:
あく
2021-05-25 13:19:07 +03:00
committed by GitHub
parent 1a1c5fa05d
commit 84f46e670a
14 changed files with 326 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/targets/api-hal-include/api-hal-subghz.h
View File

@@ -16,9 +16,9 @@ typedef enum {
/** Switchable Radio Paths */
typedef enum {
ApiHalSubGhzPathIsolate, /** Isolate Radio from antenna */
ApiHalSubGhzPath1, /** Path 1: SW1RF1-SW2RF2, LCLCL */
ApiHalSubGhzPath2, /** Path 2: SW1RF2-SW2RF1, LCLCLCL */
ApiHalSubGhzPath3, /** Path 3: SW1RF3-SW2RF3, LCLC */
ApiHalSubGhzPath433, /** Center Frquency: 433MHz. Path 1: SW1RF1-SW2RF2, LCLCL */
ApiHalSubGhzPath315, /** Center Frquency: 315MHz. Path 2: SW1RF2-SW2RF1, LCLCLCL */
ApiHalSubGhzPath868, /** Center Frquency: 868MHz. Path 3: SW1RF3-SW2RF3, LCLC */
} ApiHalSubGhzPath;
/** Initialize and switch to power save mode

6
firmware/targets/f5/api-hal/api-hal-subghz.c
View File

@@ -171,13 +171,13 @@ uint32_t api_hal_subghz_set_frequency(uint32_t value) {
}
void api_hal_subghz_set_path(ApiHalSubGhzPath path) {
if (path == ApiHalSubGhzPath1) {
if (path == ApiHalSubGhzPath433) {
hal_gpio_write(&gpio_rf_sw_0, 0);
hal_gpio_write(&gpio_rf_sw_1, 1);
} else if (path == ApiHalSubGhzPath2) {
} else if (path == ApiHalSubGhzPath315) {
hal_gpio_write(&gpio_rf_sw_0, 1);
hal_gpio_write(&gpio_rf_sw_1, 0);
} else if (path == ApiHalSubGhzPath3) {
} else if (path == ApiHalSubGhzPath868) {
hal_gpio_write(&gpio_rf_sw_0, 1);
hal_gpio_write(&gpio_rf_sw_1, 1);
} else if (path == ApiHalSubGhzPathIsolate) {

6
firmware/targets/f6/api-hal/api-hal-subghz.c
View File

@@ -172,13 +172,13 @@ uint32_t api_hal_subghz_set_frequency(uint32_t value) {
void api_hal_subghz_set_path(ApiHalSubGhzPath path) {
const ApiHalSpiDevice* device = api_hal_spi_device_get(ApiHalSpiDeviceIdSubGhz);
if (path == ApiHalSubGhzPath1) {
if (path == ApiHalSubGhzPath433) {
hal_gpio_write(&gpio_rf_sw_0, 0);
cc1101_write_reg(device, CC1101_IOCFG2, CC1101IocfgHW | CC1101_IOCFG_INV);
} else if (path == ApiHalSubGhzPath2) {
} else if (path == ApiHalSubGhzPath315) {
hal_gpio_write(&gpio_rf_sw_0, 1);
cc1101_write_reg(device, CC1101_IOCFG2, CC1101IocfgHW);
} else if (path == ApiHalSubGhzPath3) {
} else if (path == ApiHalSubGhzPath868) {
hal_gpio_write(&gpio_rf_sw_0, 1);
cc1101_write_reg(device, CC1101_IOCFG2, CC1101IocfgHW | CC1101_IOCFG_INV);
} else if (path == ApiHalSubGhzPathIsolate) {