gitbot/qmk_firmware
0
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2024-11-26 21:26:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Keyboard] Fix matrix issues with Promethium (#13648)

Browse Source
This commit is contained in:
Drashna Jaelre 2021-07-22 21:02:50 -07:00 committed by GitHub
parent bf57c552c9
commit 21e0a9780d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 154 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

307
keyboards/handwired/promethium/config.h
View File

@ -20,23 +20,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h" #include "config_common.h"
/* USB Device descriptor parameter */ /* USB Device descriptor parameter */
#define VENDOR_ID 0x17EF // Lenovo #define VENDOR_ID 0x17EF // Lenovo
//#define PRODUCT_ID 0x6009 // ThinkPad Keyboard with TrackPoint //#define PRODUCT_ID 0x6009 // ThinkPad Keyboard with TrackPoint
//#define PRODUCT_ID 0x6047 // ThinkPad Compact USB Keyboard with TrackPoint //#define PRODUCT_ID 0x6047 // ThinkPad Compact USB Keyboard with TrackPoint
#define PRODUCT_ID 0x6048 // ThinkPad Compact Bluetooth Keyboard with TrackPoint #define PRODUCT_ID 0x6048 // ThinkPad Compact Bluetooth Keyboard with TrackPoint
//#define PRODUCT_ID 0x6067 // ThinkPad Pro Docking Station //#define PRODUCT_ID 0x6067 // ThinkPad Pro Docking Station
#define DEVICE_VER 0x0001 #define DEVICE_VER 0x0001
#define MANUFACTURER Priyadi #define MANUFACTURER Priyadi
#define PRODUCT Promethium Keyboard #define PRODUCT Promethium Keyboard
/* key matrix size */ /* key matrix size */
#define MATRIX_COLS 6 #define MATRIX_COLS 6
#define MATRIX_ROWS 3 #define MATRIX_ROWS 9
/* default pin-out */ /* default pin-out */
#define MATRIX_COL_PINS { F4, F1, F0, D6, D0, D1 } #define MATRIX_COL_PINS \
#define MATRIX_ROW_PINS { F5, F6, F7 } { F4, F1, F0, D6, D0, D1 }
#define TRACKPOINT_PINS { B7, B6, D7 } #define MATRIX_ROW_PINS \
{ F5, F6, F7, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
#define TRACKPOINT_PINS \
{ B7, B6, D7 }
#define UNUSED_PINS #define UNUSED_PINS
/* /*
@ -48,15 +51,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
* *
*/ */
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION COL2ROW
// #define BACKLIGHT_PIN B7 // #define BACKLIGHT_PIN B7
// #define BACKLIGHT_BREATHING // #define BACKLIGHT_BREATHING
// #define BACKLIGHT_LEVELS 3 // #define BACKLIGHT_LEVELS 3
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5 #define DEBOUNCE 5
/* define if matrix has ghost (lacks anti-ghosting diodes) */ /* define if matrix has ghost (lacks anti-ghosting diodes) */
//#define MATRIX_HAS_GHOST //#define MATRIX_HAS_GHOST
@ -90,9 +93,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define FORCE_NKRO //#define FORCE_NKRO
/* key combination for command */ /* key combination for command */
#define IS_COMMAND() ( \ #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RCTRL)))
get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT) | MOD_BIT(KC_LCTRL) | MOD_BIT(KC_RCTRL)) \
)
/* control how magic key switches layers */ /* control how magic key switches layers */
//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS true
@ -149,178 +150,178 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION
#define PS2_MOUSE_INIT_DELAY 2000 #define PS2_MOUSE_INIT_DELAY 2000
#define BATTERY_POLL 30000 #define BATTERY_POLL 30000
#define MAX_VOLTAGE 4.2 #define MAX_VOLTAGE 4.2
#define MIN_VOLTAGE 3.2 #define MIN_VOLTAGE 3.2
#ifndef __ASSEMBLER__ // assembler doesn't like enum in .h file #ifndef __ASSEMBLER__ // assembler doesn't like enum in .h file
enum led_sequence { enum led_sequence {
LED_IND_LINUX, LED_IND_LINUX,
LED_IND_APPLE, LED_IND_APPLE,
LED_IND_WINDOWS, LED_IND_WINDOWS,
LED_IND_QWERTY, LED_IND_QWERTY,
LED_IND_ALT, LED_IND_ALT,
LED_IND_AUDIO, LED_IND_AUDIO,
LED_IND_BLUETOOTH, LED_IND_BLUETOOTH,
LED_IND_USB, LED_IND_USB,
LED_IND_BATTERY, LED_IND_BATTERY,
LED_IND_CAPSLOCK, LED_IND_CAPSLOCK,
LED_IND_GUI, LED_IND_GUI,
LED_IND_FUN, LED_IND_FUN,
LED_IND_NUM, LED_IND_NUM,
LED_IND_PUNC, LED_IND_PUNC,
LED_IND_EMOJI, LED_IND_EMOJI,
LED_IND_GREEK, LED_IND_GREEK,
LED_BKSP, LED_BKSP,
LED_ENT, LED_ENT,
LED_RSFT, LED_RSFT,
LED_RCTL, LED_RCTL,
LED_RALT, LED_RALT,
LED_SLSH, LED_SLSH,
LED_SCLN, LED_SCLN,
LED_P, LED_P,
LED_O, LED_O,
LED_L, LED_L,
LED_DOT, LED_DOT,
LED_RGUI, LED_RGUI,
LED_GREEK, LED_GREEK,
LED_COMM, LED_COMM,
LED_K, LED_K,
LED_I, LED_I,
LED_U, LED_U,
LED_J, LED_J,
LED_M, LED_M,
LED_FUN, LED_FUN,
LED_RSPC, LED_RSPC,
LED_N, LED_N,
LED_HH, LED_HH,
LED_Y, LED_Y,
LED_TRACKPOINT3, LED_TRACKPOINT3,
LED_TRACKPOINT2, LED_TRACKPOINT2,
LED_TRACKPOINT1, LED_TRACKPOINT1,
LED_T, LED_T,
LED_G, LED_G,
LED_B, LED_B,
LED_LSPC, LED_LSPC,
LED_NUM, LED_NUM,
LED_V, LED_V,
LED_F, LED_F,
LED_R, LED_R,
LED_E, LED_E,
LED_D, LED_D,
LED_C, LED_C,
LED_EMPTY, LED_EMPTY,
LED_LGUI, LED_LGUI,
LED_X, LED_X,
LED_S, LED_S,
LED_W, LED_W,
LED_Q, LED_Q,
LED_A, LED_A,
LED_Z, LED_Z,
LED_LALT, LED_LALT,
LED_LCTL, LED_LCTL,
LED_LSFT, LED_LSFT,
LED_ESC, LED_ESC,
LED_TAB, LED_TAB,
LED_TOTAL LED_TOTAL
}; };
#define RGB_DI_PIN B5 # define RGB_DI_PIN B5
#define RGBSPS_NUM LED_TOTAL # define RGBSPS_NUM LED_TOTAL
#endif #endif
/* PS/2 mouse */ /* PS/2 mouse */
#ifdef PS2_USE_BUSYWAIT #ifdef PS2_USE_BUSYWAIT
# define PS2_CLOCK_PORT PORTD # define PS2_CLOCK_PORT PORTD
# define PS2_CLOCK_PIN PIND # define PS2_CLOCK_PIN PIND
# define PS2_CLOCK_DDR DDRD # define PS2_CLOCK_DDR DDRD
# define PS2_CLOCK_BIT 3 # define PS2_CLOCK_BIT 3
# define PS2_DATA_PORT PORTD # define PS2_DATA_PORT PORTD
# define PS2_DATA_PIN PIND # define PS2_DATA_PIN PIND
# define PS2_DATA_DDR DDRD # define PS2_DATA_DDR DDRD
# define PS2_DATA_BIT 2 # define PS2_DATA_BIT 2
#endif #endif
/* PS/2 mouse interrupt version */ /* PS/2 mouse interrupt version */
#ifdef PS2_USE_INT #ifdef PS2_USE_INT
/* uses INT1 for clock line(ATMega32U4) */ /* uses INT1 for clock line(ATMega32U4) */
#define PS2_CLOCK_PORT PORTD # define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND # define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD # define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 3 # define PS2_CLOCK_BIT 3
#define PS2_DATA_PORT PORTD # define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND # define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD # define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 2 # define PS2_DATA_BIT 2
#define PS2_INT_INIT() do { \ # define PS2_INT_INIT() \
EICRA |= ((1<<ISC31) | \ do { \
(0<<ISC30)); \ EICRA |= ((1 << ISC31) | (0 << ISC30)); \
} while (0) } while (0)
#define PS2_INT_ON() do { \ # define PS2_INT_ON() \
EIMSK |= (1<<INT3); \ do { \
} while (0) EIMSK |= (1 << INT3); \
#define PS2_INT_OFF() do { \ } while (0)
EIMSK &= ~(1<<INT3); \ # define PS2_INT_OFF() \
} while (0) do { \
#define PS2_INT_VECT INT3_vect EIMSK &= ~(1 << INT3); \
} while (0)
# define PS2_INT_VECT INT3_vect
#endif #endif
/* PS/2 mouse USART version */ /* PS/2 mouse USART version */
#ifdef PS2_USE_USART #ifdef PS2_USE_USART
/* XCK for clock line and RXD for data line */ /* XCK for clock line and RXD for data line */
#define PS2_CLOCK_PORT PORTD # define PS2_CLOCK_PORT PORTD
#define PS2_CLOCK_PIN PIND # define PS2_CLOCK_PIN PIND
#define PS2_CLOCK_DDR DDRD # define PS2_CLOCK_DDR DDRD
#define PS2_CLOCK_BIT 5 # define PS2_CLOCK_BIT 5
#define PS2_DATA_PORT PORTD # define PS2_DATA_PORT PORTD
#define PS2_DATA_PIN PIND # define PS2_DATA_PIN PIND
#define PS2_DATA_DDR DDRD # define PS2_DATA_DDR DDRD
#define PS2_DATA_BIT 2 # define PS2_DATA_BIT 2
/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */ /* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
/* set DDR of CLOCK as input to be slave */ /* set DDR of CLOCK as input to be slave */
#define PS2_USART_INIT() do { \ # define PS2_USART_INIT() \
PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT); \ do { \
PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT); \ PS2_CLOCK_DDR &= ~(1 << PS2_CLOCK_BIT); \
UCSR1C = ((1 << UMSEL10) | \ PS2_DATA_DDR &= ~(1 << PS2_DATA_BIT); \
(3 << UPM10) | \ UCSR1C = ((1 << UMSEL10) | (3 << UPM10) | (0 << USBS1) | (3 << UCSZ10) | (0 << UCPOL1)); \
(0 << USBS1) | \ UCSR1A = 0; \
(3 << UCSZ10) | \ UBRR1H = 0; \
(0 << UCPOL1)); \ UBRR1L = 0; \
UCSR1A = 0; \ } while (0)
UBRR1H = 0; \ # define PS2_USART_RX_INT_ON() \
UBRR1L = 0; \ do { \
} while (0) UCSR1B = ((1 << RXCIE1) | (1 << RXEN1)); \
#define PS2_USART_RX_INT_ON() do { \ } while (0)
UCSR1B = ((1 << RXCIE1) | \ # define PS2_USART_RX_POLL_ON() \
(1 << RXEN1)); \ do { \
} while (0) UCSR1B = (1 << RXEN1); \
#define PS2_USART_RX_POLL_ON() do { \ } while (0)
UCSR1B = (1 << RXEN1); \ # define PS2_USART_OFF() \
} while (0) do { \
#define PS2_USART_OFF() do { \ UCSR1C = 0; \
UCSR1C = 0; \ UCSR1B &= ~((1 << RXEN1) | (1 << TXEN1)); \
UCSR1B &= ~((1 << RXEN1) | \ } while (0)
(1 << TXEN1)); \ # define PS2_USART_RX_READY (UCSR1A & (1 << RXC1))
} while (0) # define PS2_USART_RX_DATA UDR1
#define PS2_USART_RX_READY (UCSR1A & (1<<RXC1)) # define PS2_USART_ERROR (UCSR1A & ((1 << FE1) | (1 << DOR1) | (1 << UPE1)))
#define PS2_USART_RX_DATA UDR1 # define PS2_USART_RX_VECT USART1_RX_vect
#define PS2_USART_ERROR (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
#define PS2_USART_RX_VECT USART1_RX_vect
#endif #endif