aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <[email protected]>2024-06-20 08:10:13 +0000
committerQMK Bot <[email protected]>2024-06-20 08:10:13 +0000
commit27455bba6c572723b97416ee4d8065ee9ff76cb2 (patch)
treeb12557cb2923167ce81faf91571b6a759df2f913
parent92881d38ef30d5fb9f83428feb92117c3e24cc9b (diff)
parenta6ef34cd169f77f68788f9f0a8384a1143cdd122 (diff)
downloadqmk_firmware-27455bba6c572723b97416ee4d8065ee9ff76cb2.tar.gz
qmk_firmware-27455bba6c572723b97416ee4d8065ee9ff76cb2.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--keyboards/zsa/voyager/ld/voyager.ld8
-rw-r--r--keyboards/zsa/voyager/voyager.c5
2 files changed, 6 insertions, 7 deletions
diff --git a/keyboards/zsa/voyager/ld/voyager.ld b/keyboards/zsa/voyager/ld/voyager.ld
index 0619983beb..bfaed9df65 100644
--- a/keyboards/zsa/voyager/ld/voyager.ld
+++ b/keyboards/zsa/voyager/ld/voyager.ld
@@ -15,11 +15,11 @@
*/
/*
- * STM32F303xC memory setup.
+ * STM32F303xB memory setup.
*/
MEMORY
{
- flash0 (rx) : org = 0x08002000, len = 256k - 0x2000
+ flash0 (rx) : org = 0x08002000, len = 128k - 0x2000
flash1 (rx) : org = 0x00000000, len = 0
flash2 (rx) : org = 0x00000000, len = 0
flash3 (rx) : org = 0x00000000, len = 0
@@ -27,7 +27,7 @@ MEMORY
flash5 (rx) : org = 0x00000000, len = 0
flash6 (rx) : org = 0x00000000, len = 0
flash7 (rx) : org = 0x00000000, len = 0
- ram0 (wx) : org = 0x20000000, len = 40k
+ ram0 (wx) : org = 0x20000000, len = 32k
ram1 (wx) : org = 0x00000000, len = 0
ram2 (wx) : org = 0x00000000, len = 0
ram3 (wx) : org = 0x00000000, len = 0
@@ -82,4 +82,4 @@ REGION_ALIAS("BSS_RAM", ram0);
REGION_ALIAS("HEAP_RAM", ram0);
/* Generic rules inclusion.*/
-INCLUDE rules.ld \ No newline at end of file
+INCLUDE rules.ld
diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c
index d70f1be3ef..3255f25a97 100644
--- a/keyboards/zsa/voyager/voyager.c
+++ b/keyboards/zsa/voyager/voyager.c
@@ -12,7 +12,6 @@ bool is_launching = false;
#if defined(DEFERRED_EXEC_ENABLE)
# if defined(DYNAMIC_MACRO_ENABLE)
deferred_token dynamic_macro_token = INVALID_DEFERRED_TOKEN;
-
static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
static bool led_state = true;
if (!is_launching) {
@@ -22,8 +21,8 @@ static uint32_t dynamic_macro_led(uint32_t trigger_time, void *cb_arg) {
return 100;
}
-void dynamic_macro_record_start_user(void) {
- if (my_token == INVALID_DEFERRED_TOKEN) {
+void dynamic_macro_record_start_user(int8_t direction) {
+ if (dynamic_macro_token == INVALID_DEFERRED_TOKEN) {
STATUS_LED_3(true);
dynamic_macro_token = defer_exec(100, dynamic_macro_led, NULL);
}