Skip to content

Commit

Permalink
Durgod keyboard refactor in preparation for adding additional durgod …
Browse files Browse the repository at this point in the history
…keyboards (#11978)

* Durgod keyboard refactor in preparation for adding additional durgod keyboards

* Moving Durgod board configuration into a common location
* Reformatting layout macro whitespace
* Moving TGUI key functionality to the keyboard level
* Replacing default keymap.c with keymap.json
* Changing default and default_toggle_mac_windows keymaps to LAYOUT_all
* Increasing EEPROM size to support more VIA layers
* Fixing media keys; KC_MRWD/KC_MFFD => KC_MPRV/KC_NXT

* Move ISO Enter key to the correct row in Durgod K320

* Minor whitespace and readme cleanup for K320

* Changing durgod/k320 debounce back to default

* Simplifying DURGOD_STM32_F070's chconf.h

Co-authored-by: Simon Arlott <sa.me.uk>
Co-authored-by: Tyler Tidman <tyler.tidman@draak.ca>
  • Loading branch information
dkjer and tylert committed Mar 21, 2021
1 parent 945b7a0 commit 00a0c81
Show file tree
Hide file tree
Showing 28 changed files with 504 additions and 1,296 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define STM32_HSECLK 12000000U
#include_next <board.h>
#undef STM32_HSE_BYPASS

12 changes: 12 additions & 0 deletions keyboards/durgod/boards/DURGOD_STM32_F070/board.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# List of all the board related files.
BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB/board.c

# Required include directories
BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F070RB

# Include mcu configuration
EXTRAINCDIRS = $(BOARD_PATH)/boards/DURGOD_STM32_F070

# Shared variables
ALLCSRC += $(BOARDSRC)
ALLINC += $(BOARDINC)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,4 @@

#define CH_CFG_ST_TIMEDELTA 0

#define CH_CFG_OPTIMIZE_SPEED FALSE

#define CH_CFG_USE_REGISTRY TRUE

#define CH_CFG_USE_WAITEXIT TRUE

#define CH_CFG_USE_CONDVARS TRUE

#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE

#define CH_CFG_USE_MESSAGES TRUE

#define CH_CFG_USE_MAILBOXES TRUE

#include_next <chconf.h>

File renamed without changes.
39 changes: 21 additions & 18 deletions keyboards/durgod/k320/config.h
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
/*
Copyright 2021 kuenhlee and Don Kjer
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/* Copyright 2021 kuenhlee and Don Kjer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

Expand All @@ -36,8 +35,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL

// Dynamic EEPROM
// Something sensible or else VIA may crash
// Users may enable more if they wish
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 7
#define DEBOUNCE 5

/* Bootmagic Lite key configuration */
#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
Expand All @@ -50,4 +54,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_WIN_LOCK_PIN A9
#define LED_MR_LOCK_PIN A10
#define LED_PIN_ON_STATE 0

0 comments on commit 00a0c81

Please sign in to comment.