IR Blaster auto-detect patch for Offical Firmware
This commit is contained in:
Derek Jamison
parent
cafdbcc001
commit
8241069354
35
gpio/ir_blaster/README.md
Normal file
35
gpio/ir_blaster/README.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# IR-Blaster
|
||||||
|
|
||||||
|
## Overview
|
||||||
|
I created a YouTube video to explain how to modify official firmware to use an external IR Blaster. You can find the video [here](https://www.youtube.com/watch?v=o_Tz68ju4Dg)
|
||||||
|
[](https://youtu.be/o_Tz68ju4Dg)
|
||||||
|
|
||||||
|
In the comments Jeff-ss6qt posted a question about if we can detect the IR hardware and switch automatically. It turns out that we can! This tutorial will show you how!
|
||||||
|
|
||||||
|
## How to use this patch
|
||||||
|
You can apply this patch to your official firmware...
|
||||||
|
1. Recursively clone the repo like in the video.
|
||||||
|
2. Instead of manually making the edits, 4:40-7:00.
|
||||||
|
- 2a. Copy this [ir-blaster.patch](./ir-blaster.patch) file into the root folder of your firmware (same folder as where the fbt file is).
|
||||||
|
- 2b. In VS Code, right click on `ir-blaster.patch` and choose `Open in Integrated Terminal`
|
||||||
|
- 2c. In the terminal window type: `git apply ir-blaster.patch`
|
||||||
|
3. 7:00-7:50 - In the source control pane, you should see a bunch of edits to `furi_hal_infrared.c`. You will not have any edits to `infrared_app.c`.
|
||||||
|
4. 7:50 - Ctrl+Shift+B then [Release] Flash (USB, with resources)
|
||||||
|
|
||||||
|
Your Flipper Zero will now automatically detect if you have an IR Blaster connected and use it instead of the internal IR LED. If you do not have an IR Blaster connected, it will use the internal IR LED!
|
||||||
|
|
||||||
|
## How does it work?
|
||||||
|
When the IR Blaster is attached and use that instead of the built-in IR. When you remove the module, it reverts back to the built-in IR -- no setting changes required!
|
||||||
|
|
||||||
|
It automatically provides the +5 volts during the transmission, so no need to go into GPIO settings and change with that either (unless you want the status LED always on).
|
||||||
|
|
||||||
|
The detection is just based on "something" being present on pin A7, so other modules may also cause the Flipper Zero to no longer use the built-in IR port but typically you should be using your IR Blaster. We use an internal pull-up resistor on pin A7 and then read the value. If it is `high` we assume something nothing is connected. If it is `low` we assume the IR Blaster is connected (although all we really know is some module is pulling the pin toward ground.)
|
||||||
|
|
||||||
|
This is really just for those times when you are needing to adjust your TV and don't have the accessory nearby -- simply unplug whatever is connected to your Flipper and do a quick IR transmit using the built-in LED. In general, I would always recommend using the IR Blaster module.
|
||||||
|
|
||||||
|
You can find more information about the IR Blaster module I used in the description of the YouTube video.
|
||||||
|
|
||||||
|
## More information
|
||||||
|
If you are interested in learning more about the Flipper Zero, check out my YouTube channel: https://youtube.com/@MrDerekJamison
|
||||||
|
|
||||||
|
I also have a Discord server where you can ask questions and share your projects: https://discord.com/invite/NsjCvqwPAd
|
||||||
147
gpio/ir_blaster/ir-blaster.patch
Normal file
147
gpio/ir_blaster/ir-blaster.patch
Normal file
@ -0,0 +1,147 @@
|
|||||||
|
diff --git a/targets/f7/furi_hal/furi_hal_infrared.c b/targets/f7/furi_hal/furi_hal_infrared.c
|
||||||
|
index 3b20b6bc3..723ce0bd6 100644
|
||||||
|
--- a/targets/f7/furi_hal/furi_hal_infrared.c
|
||||||
|
+++ b/targets/f7/furi_hal/furi_hal_infrared.c
|
||||||
|
@@ -2,6 +2,7 @@
|
||||||
|
#include <furi_hal_interrupt.h>
|
||||||
|
#include <furi_hal_resources.h>
|
||||||
|
#include <furi_hal_bus.h>
|
||||||
|
+#include <furi_hal_power.h>
|
||||||
|
|
||||||
|
#include <stm32wbxx_ll_tim.h>
|
||||||
|
#include <stm32wbxx_ll_dma.h>
|
||||||
|
@@ -9,12 +10,6 @@
|
||||||
|
#include <furi.h>
|
||||||
|
#include <math.h>
|
||||||
|
|
||||||
|
-// #define INFRARED_TX_DEBUG
|
||||||
|
-
|
||||||
|
-#if defined INFRARED_TX_DEBUG
|
||||||
|
-#define gpio_infrared_tx gpio_ext_pa7
|
||||||
|
-#endif
|
||||||
|
-
|
||||||
|
#define INFRARED_TIM_TX_DMA_BUFFER_SIZE 200
|
||||||
|
#define INFRARED_POLARITY_SHIFT 1
|
||||||
|
|
||||||
|
@@ -84,6 +79,8 @@ typedef enum {
|
||||||
|
static volatile InfraredState furi_hal_infrared_state = InfraredStateIdle;
|
||||||
|
static InfraredTimTx infrared_tim_tx;
|
||||||
|
static InfraredTimRx infrared_tim_rx;
|
||||||
|
+static bool is_infrared_external = false;
|
||||||
|
+static bool was_otg_requested = false;
|
||||||
|
|
||||||
|
static void furi_hal_infrared_tx_fill_buffer(uint8_t buf_num, uint8_t polarity_shift);
|
||||||
|
static void furi_hal_infrared_async_tx_free_resources(void);
|
||||||
|
@@ -348,27 +345,29 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
|
||||||
|
LL_TIM_SetAutoReload(
|
||||||
|
INFRARED_DMA_TIMER,
|
||||||
|
__LL_TIM_CALC_ARR(SystemCoreClock, LL_TIM_GetPrescaler(INFRARED_DMA_TIMER), freq));
|
||||||
|
-#if defined INFRARED_TX_DEBUG
|
||||||
|
- LL_TIM_OC_SetCompareCH1(
|
||||||
|
- INFRARED_DMA_TIMER, ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||||
|
- LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
|
||||||
|
- /* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||||
|
- LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||||
|
- LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N, LL_TIM_OCPOLARITY_HIGH);
|
||||||
|
- LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
|
||||||
|
- LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N);
|
||||||
|
- LL_TIM_DisableIT_CC1(INFRARED_DMA_TIMER);
|
||||||
|
-#else
|
||||||
|
- LL_TIM_OC_SetCompareCH3(
|
||||||
|
- INFRARED_DMA_TIMER, ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||||
|
- LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
|
||||||
|
- /* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||||
|
- LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||||
|
- LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3N, LL_TIM_OCPOLARITY_HIGH);
|
||||||
|
- LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
|
||||||
|
- LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3N);
|
||||||
|
- LL_TIM_DisableIT_CC3(INFRARED_DMA_TIMER);
|
||||||
|
-#endif
|
||||||
|
+ if(is_infrared_external) {
|
||||||
|
+ LL_TIM_OC_SetCompareCH1(
|
||||||
|
+ INFRARED_DMA_TIMER,
|
||||||
|
+ ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||||
|
+ LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
|
||||||
|
+ /* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||||
|
+ LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||||
|
+ LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N, LL_TIM_OCPOLARITY_HIGH);
|
||||||
|
+ LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1);
|
||||||
|
+ LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH1N);
|
||||||
|
+ LL_TIM_DisableIT_CC1(INFRARED_DMA_TIMER);
|
||||||
|
+ } else {
|
||||||
|
+ LL_TIM_OC_SetCompareCH3(
|
||||||
|
+ INFRARED_DMA_TIMER,
|
||||||
|
+ ((LL_TIM_GetAutoReload(INFRARED_DMA_TIMER) + 1) * (1 - duty_cycle)));
|
||||||
|
+ LL_TIM_OC_EnablePreload(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
|
||||||
|
+ /* LL_TIM_OCMODE_PWM2 set by DMA */
|
||||||
|
+ LL_TIM_OC_SetMode(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3, LL_TIM_OCMODE_FORCED_INACTIVE);
|
||||||
|
+ LL_TIM_OC_SetPolarity(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3N, LL_TIM_OCPOLARITY_HIGH);
|
||||||
|
+ LL_TIM_OC_DisableFast(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3);
|
||||||
|
+ LL_TIM_CC_EnableChannel(INFRARED_DMA_TIMER, LL_TIM_CHANNEL_CH3N);
|
||||||
|
+ LL_TIM_DisableIT_CC3(INFRARED_DMA_TIMER);
|
||||||
|
+ }
|
||||||
|
LL_TIM_DisableMasterSlaveMode(INFRARED_DMA_TIMER);
|
||||||
|
LL_TIM_EnableAllOutputs(INFRARED_DMA_TIMER);
|
||||||
|
LL_TIM_DisableIT_UPDATE(INFRARED_DMA_TIMER);
|
||||||
|
@@ -377,11 +376,11 @@ static void furi_hal_infrared_configure_tim_pwm_tx(uint32_t freq, float duty_cyc
|
||||||
|
|
||||||
|
static void furi_hal_infrared_configure_tim_cmgr2_dma_tx(void) {
|
||||||
|
LL_DMA_InitTypeDef dma_config = {0};
|
||||||
|
-#if defined INFRARED_TX_DEBUG
|
||||||
|
- dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
|
||||||
|
-#else
|
||||||
|
- dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR2);
|
||||||
|
-#endif
|
||||||
|
+ if(is_infrared_external) {
|
||||||
|
+ dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR1);
|
||||||
|
+ } else {
|
||||||
|
+ dma_config.PeriphOrM2MSrcAddress = (uint32_t) & (INFRARED_DMA_TIMER->CCMR2);
|
||||||
|
+ }
|
||||||
|
dma_config.MemoryOrM2MDstAddress = (uint32_t)NULL;
|
||||||
|
dma_config.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
|
||||||
|
dma_config.Mode = LL_DMA_MODE_NORMAL;
|
||||||
|
@@ -575,7 +574,11 @@ static void furi_hal_infrared_async_tx_free_resources(void) {
|
||||||
|
(furi_hal_infrared_state == InfraredStateIdle) ||
|
||||||
|
(furi_hal_infrared_state == InfraredStateAsyncTxStopped));
|
||||||
|
|
||||||
|
- furi_hal_gpio_init(&gpio_infrared_tx, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
|
||||||
|
+ if(was_otg_requested) {
|
||||||
|
+ furi_hal_power_disable_otg();
|
||||||
|
+ }
|
||||||
|
+ const GpioPin* gpio_pin = (is_infrared_external) ? &gpio_ext_pa7 : &gpio_infrared_tx;
|
||||||
|
+ furi_hal_gpio_init(gpio_pin, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
|
||||||
|
furi_hal_interrupt_set_isr(INFRARED_DMA_CH1_IRQ, NULL, NULL);
|
||||||
|
furi_hal_interrupt_set_isr(INFRARED_DMA_CH2_IRQ, NULL, NULL);
|
||||||
|
|
||||||
|
@@ -636,10 +639,29 @@ void furi_hal_infrared_async_tx_start(uint32_t freq, float duty_cycle) {
|
||||||
|
furi_delay_us(5);
|
||||||
|
LL_TIM_GenerateEvent_UPDATE(INFRARED_DMA_TIMER); /* DMA -> TIMx_RCR */
|
||||||
|
furi_delay_us(5);
|
||||||
|
+
|
||||||
|
+ // Detect if a module (like IR Blaster) is connected to PA7.
|
||||||
|
+ furi_hal_gpio_init(&gpio_ext_pa7, GpioModeInput, GpioPullUp, GpioSpeedHigh);
|
||||||
|
+ furi_delay_ms(1);
|
||||||
|
+ is_infrared_external = !furi_hal_gpio_read(&gpio_ext_pa7);
|
||||||
|
+ furi_hal_gpio_init(&gpio_ext_pa7, GpioModeAnalog, GpioPullDown, GpioSpeedLow);
|
||||||
|
+
|
||||||
|
+ if(is_infrared_external) {
|
||||||
|
+ was_otg_requested = !furi_hal_power_is_otg_enabled();
|
||||||
|
+ if(was_otg_requested) {
|
||||||
|
+ furi_hal_power_enable_otg();
|
||||||
|
+ furi_delay_ms(100);
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ was_otg_requested = false;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ const GpioPin* gpio_pin = (is_infrared_external) ? &gpio_ext_pa7 : &gpio_infrared_tx;
|
||||||
|
+
|
||||||
|
LL_GPIO_ResetOutputPin(
|
||||||
|
- gpio_infrared_tx.port, gpio_infrared_tx.pin); /* when disable it prevents false pulse */
|
||||||
|
+ gpio_pin->port, gpio_pin->pin); /* when disable it prevents false pulse */
|
||||||
|
furi_hal_gpio_init_ex(
|
||||||
|
- &gpio_infrared_tx, GpioModeAltFunctionPushPull, GpioPullUp, GpioSpeedHigh, GpioAltFn1TIM1);
|
||||||
|
+ gpio_pin, GpioModeAltFunctionPushPull, GpioPullUp, GpioSpeedHigh, GpioAltFn1TIM1);
|
||||||
|
|
||||||
|
FURI_CRITICAL_ENTER();
|
||||||
|
LL_TIM_GenerateEvent_UPDATE(INFRARED_DMA_TIMER); /* TIMx_RCR -> Repetition counter */
|
||||||
Loading…
Reference in New Issue
Block a user