Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Keyboard] Add Dactyl 6x5 68 keys #18679

Merged
merged 19 commits into from
Feb 10, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
layout name change to remove build warning
  • Loading branch information
kpagratis committed Jan 23, 2023
commit ca6b6785a97216a4ef1b257c434a03de2805fa09
2 changes: 1 addition & 1 deletion keyboards/handwired/dactyl_manuform/5x6_68/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"diode_direction": "ROW2COL",
"layouts": {
"LAYOUT_5x6_68": {
"LAYOUT": {
"layout": [
{"x": 0, "y": 0, "matrix": [0,0]},
{"x": 1, "y": 0, "matrix": [0,1]},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ enum custom_layers {
#define RENAME LSFT(KC_F6) //Intellij Refactor Rename

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_5x6_68(
[_QWERTY] = LAYOUT(
kpagratis marked this conversation as resolved.
Show resolved Hide resolved
KC_EQL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 ,
KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T ,
KC_ESC , SFT_A , CTL_S , ALT_D , GUI_F , KC_G ,
Expand All @@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_DEL, KC_PGUP, KC_BSPC,
MO(_LAYER2), KC_PGDN, KC_ENT
),
[_LAYER2] = LAYOUT_5x6_68(
[_LAYER2] = LAYOUT(
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, IMPORTS, XXXXXXX, USAGES , RENAME , XXXXXXX,
XXXXXXX, LINES , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
Expand Down
2 changes: 1 addition & 1 deletion lib/pico-sdk
Submodule pico-sdk updated 90 files
+1 −1 README.md
+1 −1 cmake/pico_pre_load_platform.cmake
+1 −2 docs/Doxyfile.in
+0 −7 docs/index.h
+6 −6 pico_sdk_version.cmake
+0 −60 src/boards/include/boards/datanoisetv_rp2040_dsp.h
+0 −102 src/boards/include/boards/pico_w.h
+0 −79 src/boards/include/boards/solderparty_rp2040_stamp_round_carrier.h
+0 −2 src/boards/pico_w.cmake
+3 −3 src/common/pico_base/generate_config_header.cmake
+0 −9 src/common/pico_base/include/pico.h
+1 −6 src/common/pico_base/include/pico/config.h
+2 −6 src/common/pico_base/include/pico/error.h
+0 −5 src/common/pico_binary_info/include/pico/binary_info/code.h
+3 −1 src/common/pico_sync/critical_section.c
+0 −10 src/common/pico_sync/include/pico/critical_section.h
+1 −1 src/common/pico_sync/include/pico/mutex.h
+0 −11 src/common/pico_sync/include/pico/sem.h
+2 −13 src/common/pico_sync/sem.c
+5 −15 src/common/pico_time/include/pico/time.h
+0 −6 src/common/pico_time/time.c
+2 −0 src/host/hardware_sync/include/hardware/sync.h
+0 −3 src/host/pico_platform/include/pico/platform.h
+0 −1 src/rp2040/hardware_regs/include/hardware/platform_defs.h
+2 −2 src/rp2040/hardware_regs/include/hardware/regs/pll.h
+1 −1 src/rp2040/hardware_regs/rp2040.svd
+5 −5 src/rp2_common.cmake
+0 −4 src/rp2_common/CMakeLists.txt
+0 −81 src/rp2_common/cyw43_driver/CMakeLists.txt
+0 −545 src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.c
+0 −61 src/rp2_common/cyw43_driver/cyw43_bus_pio_spi.pio
+3 −3 src/rp2_common/hardware_clocks/clocks.c
+1 −1 src/rp2_common/hardware_clocks/scripts/vcocalc.py
+0 −6 src/rp2_common/hardware_dma/dma.c
+25 −52 src/rp2_common/hardware_dma/include/hardware/dma.h
+1 −2 src/rp2_common/hardware_gpio/CMakeLists.txt
+34 −66 src/rp2_common/hardware_gpio/gpio.c
+29 −260 src/rp2_common/hardware_gpio/include/hardware/gpio.h
+0 −71 src/rp2_common/hardware_irq/include/hardware/irq.h
+5 −47 src/rp2_common/hardware_irq/irq.c
+2 −4 src/rp2_common/hardware_irq/irq_handler_chain.S
+5 −8 src/rp2_common/hardware_pio/include/hardware/pio.h
+0 −8 src/rp2_common/hardware_pll/include/hardware/pll.h
+0 −3 src/rp2_common/hardware_pll/pll.c
+0 −4 src/rp2_common/hardware_rtc/include/hardware/rtc.h
+21 −21 src/rp2_common/hardware_rtc/rtc.c
+9 −0 src/rp2_common/hardware_sync/include/hardware/sync.h
+1 −1 src/rp2_common/hardware_watchdog/include/hardware/watchdog.h
+3 −0 src/rp2_common/pico_bootrom/bootrom.c
+1 −11 src/rp2_common/pico_bootrom/include/pico/bootrom.h
+0 −66 src/rp2_common/pico_cyw43_arch/CMakeLists.txt
+0 −145 src/rp2_common/pico_cyw43_arch/cyw43_arch.c
+0 −253 src/rp2_common/pico_cyw43_arch/cyw43_arch_freertos.c
+0 −113 src/rp2_common/pico_cyw43_arch/cyw43_arch_poll.c
+0 −320 src/rp2_common/pico_cyw43_arch/cyw43_arch_threadsafe_background.c
+0 −77 src/rp2_common/pico_cyw43_arch/include/cyw43_configport.h
+0 −328 src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch.h
+0 −74 src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_common.h
+0 −61 src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_freertos.h
+0 −58 src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_poll.h
+0 −67 src/rp2_common/pico_cyw43_arch/include/pico/cyw43_arch/arch_threadsafe_background.h
+2 −7 src/rp2_common/pico_fix/rp2040_usb_device_enumeration/rp2040_usb_device_enumeration.c
+0 −283 src/rp2_common/pico_lwip/CMakeLists.txt
+0 −45 src/rp2_common/pico_lwip/doc.h
+0 −79 src/rp2_common/pico_lwip/include/arch/cc.h
+0 −26 src/rp2_common/pico_lwip/nosys.c
+0 −29 src/rp2_common/pico_lwip/random.c
+0 −1 src/rp2_common/pico_malloc/CMakeLists.txt
+0 −18 src/rp2_common/pico_malloc/pico_malloc.c
+4 −18 src/rp2_common/pico_platform/include/pico/platform.h
+2 −2 src/rp2_common/pico_standard_link/CMakeLists.txt
+0 −9 src/rp2_common/pico_standard_link/crt0.S
+1 −2 src/rp2_common/pico_stdio/include/pico/stdio.h
+8 −25 src/rp2_common/pico_stdio/stdio.c
+2 −7 src/rp2_common/pico_stdio_usb/include/pico/stdio_usb.h
+0 −3 src/rp2_common/pico_stdio_usb/include/tusb_config.h
+0 −3 src/rp2_common/pico_stdio_usb/reset_interface.c
+20 −118 src/rp2_common/pico_stdio_usb/stdio_usb.c
+2 −2 src/rp2_common/pico_stdlib/CMakeLists.txt
+1 −1 src/rp2_common/pico_stdlib/stdlib.c
+0 −1 src/rp2_common/tinyusb/CMakeLists.txt
+1 −2 test/CMakeLists.txt
+6 −30 test/kitchen_sink/CMakeLists.txt
+0 −12 test/kitchen_sink/kitchen_sink.c
+0 −14 test/kitchen_sink/lwipopts.h
+0 −4 test/pico_sem_test/CMakeLists.txt
+0 −29 test/pico_sem_test/pico_sem_test.c
+1 −1 tools/CMakeLists.txt
+0 −9 tools/check_configs.sh
+11 −16 tools/extract_configs.py