kim/modular-kbd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thingy!

Browse Source
This commit is contained in:
Oliver "Kim" Avecilla Cabral
2025-12-09 21:49:10 -08:00
parent 9d4f620023
commit af7da987cd
33 changed files with 40351 additions and 50098 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
firmware/67percent/.settings/language.settings.xml
View File

@@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="207264954110517844" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1283202245434077339" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="207264954110517844" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1283202245434077339" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

4
firmware/67percent/.settings/stm32cubeide.project.prefs
View File

@@ -1,5 +1,5 @@
635E684B79701B039C64EA45C3F84D30=995AAB8BA274295E2F8F7F317CB52865 635E684B79701B039C64EA45C3F84D30=995AAB8BA274295E2F8F7F317CB52865
66BE74F758C12D739921AEA421D593D3=0 66BE74F758C12D739921AEA421D593D3=0
8DF89ED150041C4CBC7CB9A9CAA90856=7FDA956CB788B83CC8F90FE0AF50270E 8DF89ED150041C4CBC7CB9A9CAA90856=CFE0804C550E33C5B9DAB17F678FB68D
DC22A860405A8BF2F2C095E5B6529F12=B4658D56AC47B13414DF7CA59C5A0171 DC22A860405A8BF2F2C095E5B6529F12=F0A07CD21464E41013D963397C49C064
eclipse.preferences.version=1 eclipse.preferences.version=1

2
firmware/67percent/67 Debug.launch
View File

@@ -43,7 +43,7 @@
<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/> <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.stlink_txt_serial_number" value=""/>
<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/> <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlink.watchdog_config" value="none"/>
<booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkenable_rtos" value="false"/> <booleanAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkenable_rtos" value="false"/>
<stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fVersion&quot;:1,&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Software system reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Software system reset&quot;,&quot;fLaunchAttribute&quot;:&quot;system_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset\r\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Hardware reset&quot;,&quot;fLaunchAttribute&quot;:&quot;hardware_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset hardware\r\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Core reset&quot;,&quot;fLaunchAttribute&quot;:&quot;core_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset core\r\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[&quot;-g&quot;]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]},&quot;fStartApplication&quot;:true}]}"/> <stringAttribute key="com.st.stm32cube.ide.mcu.debug.stlinkrestart_configurations" value="{&quot;fVersion&quot;:1,&quot;fItems&quot;:[{&quot;fDisplayName&quot;:&quot;Reset&quot;,&quot;fIsSuppressible&quot;:false,&quot;fResetAttribute&quot;:&quot;Software system reset&quot;,&quot;fResetStrategies&quot;:[{&quot;fDisplayName&quot;:&quot;Software system reset&quot;,&quot;fLaunchAttribute&quot;:&quot;system_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Hardware reset&quot;,&quot;fLaunchAttribute&quot;:&quot;hardware_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset hardware\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;Core reset&quot;,&quot;fLaunchAttribute&quot;:&quot;core_reset&quot;,&quot;fGdbCommands&quot;:[&quot;monitor reset core\n&quot;],&quot;fCmdOptions&quot;:[&quot;-g&quot;]},{&quot;fDisplayName&quot;:&quot;None&quot;,&quot;fLaunchAttribute&quot;:&quot;no_reset&quot;,&quot;fGdbCommands&quot;:[],&quot;fCmdOptions&quot;:[&quot;-g&quot;]}],&quot;fGdbCommandGroup&quot;:{&quot;name&quot;:&quot;Additional commands&quot;,&quot;commands&quot;:[]},&quot;fStartApplication&quot;:true}]}"/>
<booleanAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.enableRtosProxy" value="false"/> <booleanAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.enableRtosProxy" value="false"/>
<stringAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.rtosProxyCustomProperties" value=""/> <stringAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.rtosProxyCustomProperties" value=""/>
<stringAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.rtosProxyDriver" value="threadx"/> <stringAttribute key="com.st.stm32cube.ide.mcu.rtosproxy.rtosProxyDriver" value="threadx"/>

4
firmware/67percent/Core/Src/main.c
View File

@@ -160,7 +160,7 @@ uint8_t KEYCODES[ROW][COL] = {
{ KEY_LEFT_SHIFT, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMMA, KEY_PERIOD, KEY_SLASH, KEY_RIGHT_SHIFT, 0x00, KEY_UP_ARROW, KEY_PAGE_DOWN}, { KEY_LEFT_SHIFT, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMMA, KEY_PERIOD, KEY_SLASH, KEY_RIGHT_SHIFT, 0x00, KEY_UP_ARROW, KEY_PAGE_DOWN},
{KEY_LEFT_CTRL, 0x00, KEY_LEFT_ALT, 0x00, 0x00, KEY_SPACE, 0x00, 0x00, 0x00, KEY_RIGHT_ALT, 0x00, KEY_RIGHT_CTRL, KEY_LEFT_ARROW, KEY_DOWN_ARROW, KEY_RIGHT_ARROW} {KEY_LEFT_CTRL, KEY_LEFT_GUI, KEY_LEFT_ALT, 0x00, 0x00, KEY_SPACE, 0x00, 0x00, 0x00, KEY_RIGHT_ALT, 0x00, KEY_RIGHT_CTRL, KEY_LEFT_ARROW, KEY_DOWN_ARROW, KEY_RIGHT_ARROW}
}; };
uint16_t DEPTH = 0; uint16_t DEPTH = 0;
@@ -330,7 +330,7 @@ int main(void)
break; break;
} }
HAL_Delay(20); HAL_Delay(1);
/* USER CODE END WHILE */ /* USER CODE END WHILE */
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */

BIN
firmware/67percent/Debug/67.elf Normal file → Executable file
View File

Binary file not shown.

47239
firmware/67percent/Debug/67.list
View File

File diff suppressed because it is too large Load Diff

2581
firmware/67percent/Debug/67.map
View File

File diff suppressed because it is too large Load Diff

BIN
firmware/67percent/Debug/Core/Src/gpio.o
View File

Binary file not shown.

24
firmware/67percent/Debug/Core/Src/main.cyclo
View File

@@ -1,15 +1,15 @@
../Core/Src/main.c:70:6:pq_init 1 ../Core/Src/main.c:70:6:pq_init 1
../Core/Src/main.c:77:6:pq_push 2 ../Core/Src/main.c:77:6:pq_push 2
../Core/Src/main.c:87:6:pq_pop 2 ../Core/Src/main.c:87:6:pq_pop 2
../Core/Src/main.c:211:5:main 7 ../Core/Src/main.c:218:5:main 7
../Core/Src/main.c:335:6:mergeChild 7 ../Core/Src/main.c:341:6:mergeChild 7
../Core/Src/main.c:364:6:SystemClock_Config 3 ../Core/Src/main.c:370:6:SystemClock_Config 3
../Core/Src/main.c:408:6:HAL_UART_RxCpltCallback 5 ../Core/Src/main.c:414:6:HAL_UART_RxCpltCallback 5
../Core/Src/main.c:427:6:HAL_UART_ErrorCallback 5 ../Core/Src/main.c:433:6:HAL_UART_ErrorCallback 5
../Core/Src/main.c:445:6:findBestParent 4 ../Core/Src/main.c:451:6:findBestParent 4
../Core/Src/main.c:466:6:handleUARTMessages 14 ../Core/Src/main.c:472:6:handleUARTMessages 14
../Core/Src/main.c:525:6:addUSBReport 3 ../Core/Src/main.c:531:6:addUSBReport 5
../Core/Src/main.c:533:6:matrixScan 5 ../Core/Src/main.c:547:6:matrixScan 5
../Core/Src/main.c:555:6:encoderProcess 9 ../Core/Src/main.c:569:6:encoderProcess 9
../Core/Src/main.c:579:6:resetReport 1 ../Core/Src/main.c:593:6:resetReport 1
../Core/Src/main.c:589:6:Error_Handler 1 ../Core/Src/main.c:604:6:Error_Handler 1

BIN
firmware/67percent/Debug/Core/Src/main.o
View File

Binary file not shown.

24
firmware/67percent/Debug/Core/Src/main.su
View File

@@ -1,15 +1,15 @@
../Core/Src/main.c:70:6:pq_init 16 static ../Core/Src/main.c:70:6:pq_init 16 static
../Core/Src/main.c:77:6:pq_push 24 static ../Core/Src/main.c:77:6:pq_push 24 static
../Core/Src/main.c:87:6:pq_pop 16 static ../Core/Src/main.c:87:6:pq_pop 16 static
../Core/Src/main.c:211:5:main 40 static ../Core/Src/main.c:218:5:main 40 static
../Core/Src/main.c:335:6:mergeChild 40 static ../Core/Src/main.c:341:6:mergeChild 40 static
../Core/Src/main.c:364:6:SystemClock_Config 88 static ../Core/Src/main.c:370:6:SystemClock_Config 88 static
../Core/Src/main.c:408:6:HAL_UART_RxCpltCallback 16 static ../Core/Src/main.c:414:6:HAL_UART_RxCpltCallback 16 static
../Core/Src/main.c:427:6:HAL_UART_ErrorCallback 16 static ../Core/Src/main.c:433:6:HAL_UART_ErrorCallback 16 static
../Core/Src/main.c:445:6:findBestParent 24 static ../Core/Src/main.c:451:6:findBestParent 24 static
../Core/Src/main.c:466:6:handleUARTMessages 56 static ../Core/Src/main.c:472:6:handleUARTMessages 56 static
../Core/Src/main.c:525:6:addUSBReport 24 static ../Core/Src/main.c:531:6:addUSBReport 24 static
../Core/Src/main.c:533:6:matrixScan 16 static ../Core/Src/main.c:547:6:matrixScan 16 static
../Core/Src/main.c:555:6:encoderProcess 32 static ../Core/Src/main.c:569:6:encoderProcess 32 static
../Core/Src/main.c:579:6:resetReport 8 static ../Core/Src/main.c:593:6:resetReport 8 static
../Core/Src/main.c:589:6:Error_Handler 4 static,ignoring_inline_asm ../Core/Src/main.c:604:6:Error_Handler 4 static,ignoring_inline_asm

4
firmware/67percent/Debug/makefile
View File

@@ -64,8 +64,8 @@ all: main-build
main-build: 67.elf secondary-outputs main-build: 67.elf secondary-outputs
# Tool invocations # Tool invocations
67.elf 67.map: $(OBJS) $(USER_OBJS) C:\Users\Adron\OneDrive\Documents\GitHub\modular-kbd\firmware\67percent\STM32F446RETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS) 67.elf 67.map: $(OBJS) $(USER_OBJS) /home/ukim/Projects/modular-kbd/firmware/67percent/STM32F446RETX_FLASH.ld makefile objects.list $(OPTIONAL_TOOL_DEPS)
arm-none-eabi-gcc -o "67.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"C:\Users\Adron\OneDrive\Documents\GitHub\modular-kbd\firmware\67percent\STM32F446RETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="67.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group arm-none-eabi-gcc -o "67.elf" @"objects.list" $(USER_OBJS) $(LIBS) -mcpu=cortex-m4 -T"/home/ukim/Projects/modular-kbd/firmware/67percent/STM32F446RETX_FLASH.ld" --specs=nosys.specs -Wl,-Map="67.map" -Wl,--gc-sections -static --specs=nano.specs -mfpu=fpv4-sp-d16 -mfloat-abi=hard -mthumb -Wl,--start-group -lc -lm -Wl,--end-group
@echo 'Finished building target: $@' @echo 'Finished building target: $@'
@echo ' ' @echo ' '

10
firmware/numpad/Core/Src/main.c
View File

@@ -279,7 +279,7 @@ int main(void)
resetReport(); resetReport();
matrixScan(); matrixScan();
mergeChild(); mergeChild();
//encoderProcess(); encoderProcess();
if(KEYSTATE_CHANGED_FLAG == 1){ if(KEYSTATE_CHANGED_FLAG == 1){
UARTMessage UARTREPORT; UARTMessage UARTREPORT;
UARTREPORT.DEPTH = DEPTH; UARTREPORT.DEPTH = DEPTH;
@@ -318,7 +318,7 @@ int main(void)
resetReport(); resetReport();
matrixScan();//Something related to this making the key stick. Likely due to race conditions matrixScan();//Something related to this making the key stick. Likely due to race conditions
mergeChild(); mergeChild();
//encoderProcess(); encoderProcess();
USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t*)&REPORT, sizeof(REPORT)); USBD_HID_SendReport(&hUsbDeviceFS, (uint8_t*)&REPORT, sizeof(REPORT));
break; break;
@@ -326,7 +326,7 @@ int main(void)
break; break;
} }
RGBProcess(); RGBProcess();
HAL_Delay(20); HAL_Delay(1);
/* USER CODE END WHILE */ /* USER CODE END WHILE */
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */
@@ -598,14 +598,14 @@ void encoderProcess(void){
if(steps > 10) steps = 10; // cap bursts if(steps > 10) steps = 10; // cap bursts
for(int i = 0; i < steps; i++){ for(int i = 0; i < steps; i++){
// CW -> KEYCODES[0][0] // CW -> KEYCODES[0][0]
addUSBReport(KEYCODES[0][0]); addUSBReport(KEY_RIGHT_ARROW);
} }
}else if(diff < 0){ }else if(diff < 0){
int steps = -diff; int steps = -diff;
if(steps > 10) steps = 10; if(steps > 10) steps = 10;
for(int i = 0; i < steps; i++){ for(int i = 0; i < steps; i++){
// CCW -> KEYCODES[0][1] // CCW -> KEYCODES[0][1]
addUSBReport(KEYCODES[0][1]); addUSBReport(KEY_LEFT_ARROW);
} }
} }
LAST_ENCODER_COUNT = cnt; LAST_ENCODER_COUNT = cnt;

BIN
firmware/numpad/Debug/Core/Src/main.o
View File

Binary file not shown.

BIN
firmware/numpad/Debug/numpad.elf
View File

Binary file not shown.

39214
firmware/numpad/Debug/numpad.list
View File

File diff suppressed because it is too large Load Diff

1309
firmware/numpad/Debug/numpad.map
View File

File diff suppressed because it is too large Load Diff

BIN
hardware/68percent/68percent-backups/68percent-2025-11-07_233214.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-11-07_235042.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-11-08_213627.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-11-08_214651.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-11-08_215644.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-11-08_220751.zip
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-08_163857.zip Normal file
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-08_165131.zip Normal file
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-08_174605.zip Normal file
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-08_182213.zip Normal file
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-09_212103.zip Normal file
View File

Binary file not shown.

BIN
hardware/68percent/68percent-backups/68percent-2025-12-09_212628.zip Normal file
View File

Binary file not shown.

24
hardware/68percent/68percent.kicad_prl
View File

@@ -92,18 +92,18 @@
11 11
], ],
"col_widths": [ "col_widths": [
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
10, 0,
165 0
], ],
"custom_group_rules": [], "custom_group_rules": [],
"expanded_rows": [], "expanded_rows": [],

1
hardware/68percent/~68percent.kicad_pcb.lck Normal file
View File

@@ -0,0 +1 @@
{"hostname":"framework16","username":"ukim"}

1
hardware/68percent/~_autosave-68percent.kicad_pcb.lck Normal file
View File

@@ -0,0 +1 @@
{"hostname":"framework16","username":"ukim"}

BIN
hardware/numpad/numpad/numpad-backups/numpad-2025-12-08_182933.zip Normal file
View File

Binary file not shown.