Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2025-03-06 23:18:25 +00:00
commit 1b4d4a30bc
123 changed files with 125 additions and 125 deletions

View File

@ -38,4 +38,4 @@ body:
- type: textarea
attributes:
label: Additional Context
description: Add any other relevant information about the problem here.
description: Add any other relevant information about the problem here.

View File

@ -372,4 +372,4 @@
"label": "~",
}
}
}
}

View File

@ -629,4 +629,4 @@
"label": "(narrow non-breaking space)",
}
}
}
}

View File

@ -376,4 +376,4 @@
"label": "₢",
}
}
}
}

View File

@ -638,4 +638,4 @@
"label": "÷",
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": "?",
}
}
}
}

View File

@ -400,4 +400,4 @@
"label": "§",
}
}
}
}

View File

@ -432,4 +432,4 @@
"label": "*",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "µ",
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": ":",
}
}
}
}

View File

@ -314,4 +314,4 @@
"label": "@",
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": "\"",
}
}
}
}

View File

@ -364,4 +364,4 @@
"label": "ž",
}
}
}
}

View File

@ -593,4 +593,4 @@
"label": "…",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "µ",
}
}
}
}

View File

@ -364,4 +364,4 @@
"label": "¤",
}
}
}
}

View File

@ -620,4 +620,4 @@
"label": "≠",
}
}
}
}

View File

@ -673,4 +673,4 @@
"label": "±",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "µ",
}
}
}
}

View File

@ -653,4 +653,4 @@
"label": "—",
}
}
}
}

View File

@ -388,4 +388,4 @@
"label": "©",
}
}
}
}

View File

@ -344,4 +344,4 @@
"label": "÷",
}
}
}
}

View File

@ -432,4 +432,4 @@
"label": "*",
}
}
}
}

View File

@ -352,4 +352,4 @@
"label": "µ",
}
}
}
}

View File

@ -352,4 +352,4 @@
"label": "´ (dead)",
}
}
}
}

View File

@ -361,4 +361,4 @@
"label": "}",
}
}
}
}

View File

@ -681,4 +681,4 @@
"label": "—",
}
}
}
}

View File

@ -685,4 +685,4 @@
"label": "—",
}
}
}
}

View File

@ -327,4 +327,4 @@
"label": "_",
}
}
}
}

View File

@ -307,4 +307,4 @@
"label": "?",
}
}
}
}

View File

@ -437,4 +437,4 @@
"label": "¨ (dead)",
}
}
}
}

View File

@ -372,4 +372,4 @@
"label": "\\",
}
}
}
}

View File

@ -365,4 +365,4 @@
"label": "+",
}
}
}
}

View File

@ -214,4 +214,4 @@
"label": "(layer 4)",
}
}
}
}

View File

@ -113,4 +113,4 @@
"key": "NO_MU"
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": "?",
}
}
}
}

View File

@ -352,4 +352,4 @@
"label": "µ",
}
}
}
}

View File

@ -83,4 +83,4 @@
"key": "PV_U"
}
}
}
}

View File

@ -70,4 +70,4 @@
"key": "PD_U"
}
}
}
}

View File

@ -352,4 +352,4 @@
"label": "Ń",
}
}
}
}

View File

@ -352,4 +352,4 @@
"label": "€",
}
}
}
}

View File

@ -617,4 +617,4 @@
"label": "",
}
}
}
}

View File

@ -441,4 +441,4 @@
"label": "»",
}
}
}
}

View File

@ -288,4 +288,4 @@
"label": "₽",
}
}
}
}

View File

@ -304,4 +304,4 @@
"label": "€",
}
}
}
}

View File

@ -404,4 +404,4 @@
"label": "§",
}
}
}
}

View File

@ -440,4 +440,4 @@
"label": "}",
}
}
}
}

View File

@ -400,4 +400,4 @@
"label": "§",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "}",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "}",
}
}
}
}

View File

@ -340,4 +340,4 @@
"label": "`",
}
}
}
}

View File

@ -356,4 +356,4 @@
"label": "µ",
}
}
}
}

View File

@ -639,4 +639,4 @@
"label": "—",
}
}
}
}

View File

@ -637,4 +637,4 @@
"label": "—",
}
}
}
}

View File

@ -639,4 +639,4 @@
"label": "—",
}
}
}
}

View File

@ -637,4 +637,4 @@
"label": "—",
}
}
}
}

View File

@ -376,4 +376,4 @@
"label": "\\",
}
}
}
}

View File

@ -376,4 +376,4 @@
"label": "\\",
}
}
}
}

View File

@ -477,4 +477,4 @@
"label": "º",
}
}
}
}

View File

@ -372,4 +372,4 @@
"label": "` (dead)",
}
}
}
}

View File

@ -350,4 +350,4 @@
"label": "Á"
}
}
}
}

View File

@ -292,4 +292,4 @@
"label": "ґ",
}
}
}
}

View File

@ -585,4 +585,4 @@
"label": "̉ (dead)",
}
}
}
}

View File

@ -505,4 +505,4 @@
"label": "¢",
}
}
}
}

View File

@ -573,4 +573,4 @@
"label": "̉ (dead)",
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": "?",
}
}
}
}

View File

@ -299,4 +299,4 @@
"label": "?",
}
}
}
}

View File

@ -93,4 +93,4 @@
"key": "SAFE_RANGE"
}
}
}
}

View File

@ -225,4 +225,4 @@
]
}
}
}
}

View File

@ -246,4 +246,4 @@
]
}
}
}
}

View File

@ -225,4 +225,4 @@
]
}
}
}
}

View File

@ -37,4 +37,4 @@
"key": "SQ_SCLR"
}
}
}
}

View File

@ -17,4 +17,4 @@
]
}
}
}
}

View File

@ -248,4 +248,4 @@
]
}
}
}
}

View File

@ -66,4 +66,4 @@
]
}
}
}
}

View File

@ -1 +1 @@
<mxfile host="Electron" modified="2021-08-09T19:46:29.036Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="PQ2r34UrZa0TfW4Fw0EV" version="14.6.13" type="device"><diagram id="NEtccoSKIy4HskWlhJpu" name="Page-1">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</diagram></mxfile>
<mxfile host="Electron" modified="2021-08-09T19:46:29.036Z" agent="5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.6.13 Chrome/89.0.4389.128 Electron/12.0.7 Safari/537.36" etag="PQ2r34UrZa0TfW4Fw0EV" version="14.6.13" type="device"><diagram id="NEtccoSKIy4HskWlhJpu" name="Page-1">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</diagram></mxfile>

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 51 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 53 KiB

View File

@ -101,4 +101,4 @@
#define GC9A01_GRAM_INTERFACE_RGB 0b00000010
#define GC9A01_RGB_INTERFACE_MODE_1_TRANSFER 0b00000000
#define GC9A01_RGB_INTERFACE_MODE_3_TRANSFER 0b00000001
#define GC9A01_RGB_INTERFACE_MODE_3_TRANSFER 0b00000001

View File

@ -63,4 +63,4 @@ painter_device_t qp_ld7032_make_spi_device(uint16_t panel_width, uint16_t panel_
*/
painter_device_t qp_ld7032_make_i2c_device(uint16_t panel_width, uint16_t panel_height, uint8_t i2c_address);
#endif // QUANTUM_PAINTER_LD7032_I2C_ENABLE
#endif // QUANTUM_PAINTER_LD7032_I2C_ENABLE

View File

@ -42,4 +42,4 @@ typedef enum {
LD7032_S_START_STOP = 0xCD,
LD7032_S_SELECT = 0xCE,
LD7032_TESTCNT1 = 0xF0, //-0xFF
} ld7032_opcodes;
} ld7032_opcodes;

View File

@ -26,4 +26,4 @@ typedef enum {
void usbpd_init(void);
// Gets the current state of the USBPD allowance
usbpd_allowance_t usbpd_get_allowance(void);
usbpd_allowance_t usbpd_get_allowance(void);

View File

@ -16,9 +16,6 @@
#pragma once
/* DIP switch */
#define DIP_SWITCH_PINS { D2 }
/* Increase I2C speed to 1000 KHz */
#define I2C1_CLOCK_SPEED 400000
#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2

View File

@ -20,6 +20,9 @@
"indicators": {
"caps_lock": "C9"
},
"dip_switch": {
"pins": ["D2"]
},
"matrix_pins": {
"cols": ["A0", "A1", "A2", "A3", "C0", "C1", "C2", "C3", "A8", "C12", "B9", "C6", "C7", "C4", "C5", "A15", "B10"],
"rows": ["B0", "B1", "B8", "B3", "B4", "B5"]

View File

@ -16,9 +16,6 @@
#pragma once
/* DIP switch */
#define DIP_SWITCH_PINS { D2 }
/* Indication led */
#define LED_MAC_OS_PIN C10
#define LED_WIN_OS_PIN C11

View File

@ -30,6 +30,9 @@
"caps_lock": "C9",
"num_lock": "C8"
},
"dip_switch": {
"pins": ["D2"]
},
"layouts": {
"LAYOUT_104_ansi": {
"layout": [

View File

@ -3,4 +3,4 @@
[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""],
[{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""],
[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""],
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]

View File

@ -1 +1 @@
["","","",""]
["","","",""]

View File

@ -1,4 +1,4 @@
["","","","","","","","","","","",""],
["","","","","","","","","","","",""],
["","","","","","","","","","","",""],
["","","","","","","","","","","",""]
["","","","","","","","","","","",""]

View File

@ -3,4 +3,4 @@
[{w:1.75},"","","","","","","","","","","","",{w:2.25},""],
[{w:2.25},"","","","","","","","","","",{w:1.75},"","",""],
[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","",""]

View File

@ -1,3 +1,3 @@
# ortho_5x5
LAYOUT_ortho_5x5
LAYOUT_ortho_5x5

View File

@ -315,4 +315,4 @@ __attribute__((weak)) i2c_status_t i2c_ping_address(uint8_t address, uint16_t ti
i2c_status_t status = i2c_start(address, timeout);
i2c_stop();
return status;
}
}

View File

@ -17,4 +17,4 @@
#include_next <board.h>
#undef STM32_HSE_BYPASS
#undef STM32_HSE_BYPASS

View File

@ -87,4 +87,4 @@
#ifndef USB_VBUS_PIN
# define USB_VBUS_PIN PAL_LINE(GPIOA, 9)
#endif
#endif

View File

@ -46,4 +46,4 @@
# define SPI_USE_WAIT TRUE
#endif
#include_next <halconf.h>
#include_next <halconf.h>

View File

@ -6,4 +6,4 @@ BOARDINC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLINC += $(BOARDINC)
ALLINC += $(BOARDINC)

View File

@ -6,4 +6,4 @@ BOARDINC = $(CHIBIOS)/os/hal/boards/ST_STM32F4_DISCOVERY
# Shared variables
ALLCSRC += $(BOARDSRC)
ALLINC += $(BOARDINC)
ALLINC += $(BOARDINC)

View File

@ -21,4 +21,4 @@
#include_next <board.h>
#undef STM32_HSE_BYPASS
#undef STM32_HSE_BYPASS

View File

@ -27,4 +27,4 @@
#if 0
#define STM32_BOOTLOADER_DUAL_BANK TRUE
#define STM32_BOOTLOADER_DUAL_BANK_GPIO B7
#endif
#endif

Some files were not shown because too many files have changed in this diff Show More