From af4c712850bec34b64fea9fa7a08db6f6f58bb1c Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 17 Nov 2021 20:06:40 -0800
Subject: [PATCH 1/3] [Bug] Fix missing varaible for Backlight Breathing
---
quantum/backlight/backlight_avr.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index e3fe56aba305..32141de5a740 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -294,6 +294,7 @@ void backlight_task(void) {}
static uint8_t breathing_halt = BREATHING_NO_HALT;
static uint16_t breathing_counter = 0;
+static uint8_t breathing_period = BREATHING_PERIOD;
static uint8_t breath_scale_counter = 1;
/* Run the breathing loop at ~120Hz*/
@@ -454,4 +455,4 @@ void backlight_init_ports(void) {
breathing_enable();
}
#endif
-}
\ No newline at end of file
+}
From 4a1566f2fad59457aac2faad9354337b523fd5ab Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 17 Nov 2021 20:13:31 -0800
Subject: [PATCH 2/3] Better fix
---
quantum/backlight/backlight_avr.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index 32141de5a740..e952a0b7e93a 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -294,7 +294,6 @@ void backlight_task(void) {}
static uint8_t breathing_halt = BREATHING_NO_HALT;
static uint16_t breathing_counter = 0;
-static uint8_t breathing_period = BREATHING_PERIOD;
static uint8_t breath_scale_counter = 1;
/* Run the breathing loop at ~120Hz*/
@@ -334,7 +333,7 @@ bool is_breathing(void) { return !!(TIMSKx & _BV(TOIEx)); }
} while (0)
# define breathing_max() \
do { \
- breathing_counter = breathing_period * breathing_ISR_frequency / 2; \
+ breathing_counter = get_breathing_period() * breathing_ISR_frequency / 2; \
} while (0)
void breathing_enable(void) {
@@ -391,9 +390,9 @@ ISR(TIMERx_OVF_vect)
} else {
return;
}
- uint16_t interval = (uint16_t)breathing_period * breathing_ISR_frequency / BREATHING_STEPS;
+ uint16_t interval = (uint16_t)get_breathing_period() * breathing_ISR_frequency / BREATHING_STEPS;
// resetting after one period to prevent ugly reset at overflow.
- breathing_counter = (breathing_counter + 1) % (breathing_period * breathing_ISR_frequency);
+ breathing_counter = (breathing_counter + 1) % (get_breathing_period() * breathing_ISR_frequency);
uint8_t index = breathing_counter / interval % BREATHING_STEPS;
if (((breathing_halt == BREATHING_HALT_ON) && (index == BREATHING_STEPS / 2)) || ((breathing_halt == BREATHING_HALT_OFF) && (index == BREATHING_STEPS - 1))) {
From cf414ff0c7ec3d99bece058b7080e97fb729db83 Mon Sep 17 00:00:00 2001
From: Drashna Jael're <drashna@live.com>
Date: Wed, 17 Nov 2021 20:16:14 -0800
Subject: [PATCH 3/3] formatting
---
quantum/backlight/backlight_avr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/quantum/backlight/backlight_avr.c b/quantum/backlight/backlight_avr.c
index e952a0b7e93a..634260800a3d 100644
--- a/quantum/backlight/backlight_avr.c
+++ b/quantum/backlight/backlight_avr.c
@@ -331,8 +331,8 @@ bool is_breathing(void) { return !!(TIMSKx & _BV(TOIEx)); }
do { \
breathing_counter = 0; \
} while (0)
-# define breathing_max() \
- do { \
+# define breathing_max() \
+ do { \
breathing_counter = get_breathing_period() * breathing_ISR_frequency / 2; \
} while (0)