From d2ff66a985b938e87fffe55c1d9f1dc55e356f91 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 23 Aug 2017 22:29:07 -0400 Subject: Creates a layouts/ folder for keymaps shared between keyboards (#1609) * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches --- keyboards/ergodox/ergodone/Makefile | 3 - keyboards/ergodox/ergodone/config.h | 55 ------ keyboards/ergodox/ergodone/ergodone.c | 5 - keyboards/ergodox/ergodone/ergodone.h | 63 ------- keyboards/ergodox/ergodone/expander.c | 120 -------------- keyboards/ergodox/ergodone/expander.h | 48 ------ keyboards/ergodox/ergodone/i2cmaster.h | 178 -------------------- keyboards/ergodox/ergodone/matrix.c | 295 --------------------------------- keyboards/ergodox/ergodone/readme.md | 26 --- keyboards/ergodox/ergodone/rules.mk | 91 ---------- keyboards/ergodox/ergodone/twimaster.c | 208 ----------------------- 11 files changed, 1092 deletions(-) delete mode 100644 keyboards/ergodox/ergodone/Makefile delete mode 100644 keyboards/ergodox/ergodone/config.h delete mode 100644 keyboards/ergodox/ergodone/ergodone.c delete mode 100644 keyboards/ergodox/ergodone/ergodone.h delete mode 100644 keyboards/ergodox/ergodone/expander.c delete mode 100644 keyboards/ergodox/ergodone/expander.h delete mode 100644 keyboards/ergodox/ergodone/i2cmaster.h delete mode 100644 keyboards/ergodox/ergodone/matrix.c delete mode 100644 keyboards/ergodox/ergodone/readme.md delete mode 100644 keyboards/ergodox/ergodone/rules.mk delete mode 100644 keyboards/ergodox/ergodone/twimaster.c (limited to 'keyboards/ergodox/ergodone') diff --git a/keyboards/ergodox/ergodone/Makefile b/keyboards/ergodox/ergodone/Makefile deleted file mode 100644 index bd09e5885d..0000000000 --- a/keyboards/ergodox/ergodone/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -ifndef MAKEFILE_INCLUDED - include ../../../Makefile -endif diff --git a/keyboards/ergodox/ergodone/config.h b/keyboards/ergodox/ergodone/config.h deleted file mode 100644 index 52ae2d576c..0000000000 --- a/keyboards/ergodox/ergodone/config.h +++ /dev/null @@ -1,55 +0,0 @@ -#ifndef ERGODOX_ERGODONE_CONFIG_H -#define ERGODOX_ERGODONE_CONFIG_H - -#include "../config.h" - -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x1307 -#define DEVICE_VER 0x0001 -#define MANUFACTURER ErgoDone -#define PRODUCT ErgoDone -#define DESCRIPTION QMK keyboard firmware for ErgoDone - -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 14 - -/* number of backlight levels */ -#define BACKLIGHT_LEVELS 3 - -#define LED_BRIGHTNESS_LO 15 -#define LED_BRIGHTNESS_HI 255 - -/* fix space cadet rollover issue */ -#define DISABLE_SPACE_CADET_ROLLOVER - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -#define PREVENT_STUCK_MODIFIERS - -#define USB_MAX_POWER_CONSUMPTION 500 - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT -//#define NO_ACTION_MACRO -//#define NO_ACTION_FUNCTION -//#define DEBUG_MATRIX_SCAN_RATE - -#endif diff --git a/keyboards/ergodox/ergodone/ergodone.c b/keyboards/ergodox/ergodone/ergodone.c deleted file mode 100644 index 6b8d8a0632..0000000000 --- a/keyboards/ergodox/ergodone/ergodone.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "ergodone.h" - -void matrix_init_kb(void) { - matrix_init_user(); -} diff --git a/keyboards/ergodox/ergodone/ergodone.h b/keyboards/ergodox/ergodone/ergodone.h deleted file mode 100644 index cddc1fbe7a..0000000000 --- a/keyboards/ergodox/ergodone/ergodone.h +++ /dev/null @@ -1,63 +0,0 @@ -#ifndef ERGODOX_ERGODONE_H -#define ERGODOX_ERGODONE_H - -#include "quantum.h" -#include -#include - -#define CPU_PRESCALE(n) (CLKPR = 0x80, CLKPR = (n)) -#define CPU_16MHz 0x00 - -void init_ergodox(void); - -inline void ergodox_right_led_1_off(void) {} -inline void ergodox_right_led_1_on(void) {} -inline void ergodox_right_led_2_off(void) {} -inline void ergodox_right_led_2_on(void) {} -inline void ergodox_right_led_3_off(void) {} -inline void ergodox_right_led_3_on(void) {} -inline void ergodox_right_led_on(uint8_t l) {} -inline void ergodox_right_led_off(uint8_t l) {} -inline void ergodox_board_led_off(void) {} -inline void ergodox_board_led_on(void) {} -inline void ergodox_led_all_on(void) {} -inline void ergodox_led_all_off(void) {} -inline void ergodox_right_led_1_set(uint8_t n) {} -inline void ergodox_right_led_2_set(uint8_t n) {} -inline void ergodox_right_led_3_set(uint8_t n) {} -inline void ergodox_right_led_set(uint8_t l, uint8_t n) {} -inline void ergodox_led_all_set(uint8_t n) {} - -#define KEYMAP( \ - \ - /* left hand, spatial positions */ \ - k00,k01,k02,k03,k04,k05,k06, \ - k10,k11,k12,k13,k14,k15,k16, \ - k20,k21,k22,k23,k24,k25, \ - k30,k31,k32,k33,k34,k35,k36, \ - k40,k41,k42,k43,k44, \ - k55,k56, \ - k54, \ - k53,k52,k51, \ - \ - /* right hand, spatial positions */ \ - k07,k08,k09,k0A,k0B,k0C,k0D, \ - k17,k18,k19,k1A,k1B,k1C,k1D, \ - k28,k29,k2A,k2B,k2C,k2D, \ - k37,k38,k39,k3A,k3B,k3C,k3D, \ - k49,k4A,k4B,k4C,k4D, \ - k57,k58, \ - k59, \ - k5C,k5B,k5A ) \ - \ - /* matrix positions */ \ - { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, KC_NO, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, KC_NO, KC_NO, KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D }, \ - { KC_NO, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, KC_NO } \ - } - -#endif diff --git a/keyboards/ergodox/ergodone/expander.c b/keyboards/ergodox/ergodone/expander.c deleted file mode 100644 index 0c8a2289c5..0000000000 --- a/keyboards/ergodox/ergodone/expander.c +++ /dev/null @@ -1,120 +0,0 @@ -#include -#include "action.h" -#include "i2cmaster.h" -#include "expander.h" -#include "debug.h" - -static uint8_t expander_status = 0; -static uint8_t expander_input = 0; - -void expander_config(void); -uint8_t expander_write(uint8_t reg, uint8_t data); -uint8_t expander_read(uint8_t reg, uint8_t *data); - -void expander_init(void) -{ - i2c_init(); - expander_scan(); -} - -void expander_scan(void) -{ - dprintf("expander status: %d ... ", expander_status); - uint8_t ret = i2c_start(EXPANDER_ADDR | I2C_WRITE); - if (ret == 0) { - i2c_stop(); - if (expander_status == 0) { - dprintf("attached\n"); - expander_status = 1; - expander_config(); - clear_keyboard(); - } - } - else { - if (expander_status == 1) { - dprintf("detached\n"); - expander_status = 0; - clear_keyboard(); - } - } - dprintf("%d\n", expander_status); -} - -void expander_read_cols(void) -{ - expander_read(EXPANDER_REG_GPIOA, &expander_input); -} - -uint8_t expander_get_col(uint8_t col) -{ - if (col > 4) { - col++; - } - return expander_input & (1< -#include "matrix.h" - -#define MCP23017 -#define MCP23017_A0 0 -#define MCP23017_A1 0 -#define MCP23017_A2 0 - -#ifdef MCP23017 -#define EXPANDER_ADDR ((0x20|(MCP23017_A0<<0)|(MCP23017_A1<<1)|(MCP23017_A2<<2)) << 1) -enum EXPANDER_REG_BANK0 { - EXPANDER_REG_IODIRA = 0, - EXPANDER_REG_IODIRB, - EXPANDER_REG_IPOLA, - EXPANDER_REG_IPOLB, - EXPANDER_REG_GPINTENA, - EXPANDER_REG_GPINTENB, - EXPANDER_REG_DEFVALA, - EXPANDER_REG_DEFVALB, - EXPANDER_REG_INTCONA, - EXPANDER_REG_INTCONB, - EXPANDER_REG_IOCONA, - EXPANDER_REG_IOCONB, - EXPANDER_REG_GPPUA, - EXPANDER_REG_GPPUB, - EXPANDER_REG_INTFA, - EXPANDER_REG_INTFB, - EXPANDER_REG_INTCAPA, - EXPANDER_REG_INTCAPB, - EXPANDER_REG_GPIOA, - EXPANDER_REG_GPIOB, - EXPANDER_REG_OLATA, - EXPANDER_REG_OLATB -}; -#endif - -void expander_init(void); -void expander_scan(void); -void expander_read_cols(void); -uint8_t expander_get_col(uint8_t col); -matrix_row_t expander_read_row(void); -void expander_unselect_rows(void); -void expander_select_row(uint8_t row); - -#endif diff --git a/keyboards/ergodox/ergodone/i2cmaster.h b/keyboards/ergodox/ergodone/i2cmaster.h deleted file mode 100644 index 3917b9e6c0..0000000000 --- a/keyboards/ergodox/ergodone/i2cmaster.h +++ /dev/null @@ -1,178 +0,0 @@ -#ifndef _I2CMASTER_H -#define _I2CMASTER_H 1 -/************************************************************************* -* Title: C include file for the I2C master interface -* (i2cmaster.S or twimaster.c) -* Author: Peter Fleury http://jump.to/fleury -* File: $Id: i2cmaster.h,v 1.10 2005/03/06 22:39:57 Peter Exp $ -* Software: AVR-GCC 3.4.3 / avr-libc 1.2.3 -* Target: any AVR device -* Usage: see Doxygen manual -**************************************************************************/ - -#ifdef DOXYGEN -/** - @defgroup pfleury_ic2master I2C Master library - @code #include @endcode - - @brief I2C (TWI) Master Software Library - - Basic routines for communicating with I2C slave devices. This single master - implementation is limited to one bus master on the I2C bus. - - This I2c library is implemented as a compact assembler software implementation of the I2C protocol - which runs on any AVR (i2cmaster.S) and as a TWI hardware interface for all AVR with built-in TWI hardware (twimaster.c). - Since the API for these two implementations is exactly the same, an application can be linked either against the - software I2C implementation or the hardware I2C implementation. - - Use 4.7k pull-up resistor on the SDA and SCL pin. - - Adapt the SCL and SDA port and pin definitions and eventually the delay routine in the module - i2cmaster.S to your target when using the software I2C implementation ! - - Adjust the CPU clock frequence F_CPU in twimaster.c or in the Makfile when using the TWI hardware implementaion. - - @note - The module i2cmaster.S is based on the Atmel Application Note AVR300, corrected and adapted - to GNU assembler and AVR-GCC C call interface. - Replaced the incorrect quarter period delays found in AVR300 with - half period delays. - - @author Peter Fleury pfleury@gmx.ch http://jump.to/fleury - - @par API Usage Example - The following code shows typical usage of this library, see example test_i2cmaster.c - - @code - - #include - - - #define Dev24C02 0xA2 // device address of EEPROM 24C02, see datasheet - - int main(void) - { - unsigned char ret; - - i2c_init(); // initialize I2C library - - // write 0x75 to EEPROM address 5 (Byte Write) - i2c_start_wait(Dev24C02+I2C_WRITE); // set device address and write mode - i2c_write(0x05); // write address = 5 - i2c_write(0x75); // write value 0x75 to EEPROM - i2c_stop(); // set stop conditon = release bus - - - // read previously written value back from EEPROM address 5 - i2c_start_wait(Dev24C02+I2C_WRITE); // set device address and write mode - - i2c_write(0x05); // write address = 5 - i2c_rep_start(Dev24C02+I2C_READ); // set device address and read mode - - ret = i2c_readNak(); // read one byte from EEPROM - i2c_stop(); - - for(;;); - } - @endcode - -*/ -#endif /* DOXYGEN */ - -/**@{*/ - -#if (__GNUC__ * 100 + __GNUC_MINOR__) < 304 -#error "This library requires AVR-GCC 3.4 or later, update to newer AVR-GCC compiler !" -#endif - -#include - -/** defines the data direction (reading from I2C device) in i2c_start(),i2c_rep_start() */ -#define I2C_READ 1 - -/** defines the data direction (writing to I2C device) in i2c_start(),i2c_rep_start() */ -#define I2C_WRITE 0 - - -/** - @brief initialize the I2C master interace. Need to be called only once - @param void - @return none - */ -extern void i2c_init(void); - - -/** - @brief Terminates the data transfer and releases the I2C bus - @param void - @return none - */ -extern void i2c_stop(void); - - -/** - @brief Issues a start condition and sends address and transfer direction - - @param addr address and transfer direction of I2C device - @retval 0 device accessible - @retval 1 failed to access device - */ -extern unsigned char i2c_start(unsigned char addr); - - -/** - @brief Issues a repeated start condition and sends address and transfer direction - - @param addr address and transfer direction of I2C device - @retval 0 device accessible - @retval 1 failed to access device - */ -extern unsigned char i2c_rep_start(unsigned char addr); - - -/** - @brief Issues a start condition and sends address and transfer direction - - If device is busy, use ack polling to wait until device ready - @param addr address and transfer direction of I2C device - @return none - */ -extern void i2c_start_wait(unsigned char addr); - - -/** - @brief Send one byte to I2C device - @param data byte to be transfered - @retval 0 write successful - @retval 1 write failed - */ -extern unsigned char i2c_write(unsigned char data); - - -/** - @brief read one byte from the I2C device, request more data from device - @return byte read from I2C device - */ -extern unsigned char i2c_readAck(void); - -/** - @brief read one byte from the I2C device, read is followed by a stop condition - @return byte read from I2C device - */ -extern unsigned char i2c_readNak(void); - -/** - @brief read one byte from the I2C device - - Implemented as a macro, which calls either i2c_readAck or i2c_readNak - - @param ack 1 send ack, request more data from device
- 0 send nak, read is followed by a stop condition - @return byte read from I2C device - */ -extern unsigned char i2c_read(unsigned char ack); -#define i2c_read(ack) (ack) ? i2c_readAck() : i2c_readNak(); - - -/**@}*/ -#endif diff --git a/keyboards/ergodox/ergodone/matrix.c b/keyboards/ergodox/ergodone/matrix.c deleted file mode 100644 index 2eb8f24ba8..0000000000 --- a/keyboards/ergodox/ergodone/matrix.c +++ /dev/null @@ -1,295 +0,0 @@ -#include -#include -#include -#include "wait.h" -#include "action_layer.h" -#include "print.h" -#include "debug.h" -#include "util.h" -#include "matrix.h" -#include "ergodone.h" -#include "expander.h" -#ifdef DEBUG_MATRIX_SCAN_RATE -#include "timer.h" -#endif - -/* - * This constant define not debouncing time in msecs, but amount of matrix - * scan loops which should be made to get stable debounced results. - * - * On Ergodox matrix scan rate is relatively low, because of slow I2C. - * Now it's only 317 scans/second, or about 3.15 msec/scan. - * According to Cherry specs, debouncing time is 5 msec. - * - * And so, there is no sense to have DEBOUNCE higher than 2. - */ - -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; - -// Debouncing: store for each key the number of scans until it's eligible to -// change. When scanning the matrix, ignore any changes in keys that have -// already changed in the last DEBOUNCE scans. -static uint8_t debounce_matrix[MATRIX_ROWS * MATRIX_COLS]; - -static matrix_row_t read_cols(uint8_t row); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); - -#ifdef DEBUG_MATRIX_SCAN_RATE -uint32_t matrix_timer; -uint32_t matrix_scan_count; -#endif - - -__attribute__ ((weak)) -void matrix_init_user(void) {} - -__attribute__ ((weak)) -void matrix_scan_user(void) {} - -__attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} - -__attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); -} - -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; -} - -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - // disable JTAG - MCUCR = (1<1000) { - print("matrix scan frequency: "); - pdec(matrix_scan_count); - print("\n"); - matrix_print(); - - matrix_timer = timer_now; - matrix_scan_count = 0; - } -#endif - - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - wait_us(30); // without this wait read unstable value. - matrix_row_t mask = debounce_mask(i); - matrix_row_t cols = (read_cols(i) & mask) | (matrix[i] & ~mask); - debounce_report(cols ^ matrix[i], i); - matrix[i] = cols; - - unselect_rows(); - } - - matrix_scan_quantum(); - - return 1; -} - -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1< http://jump.to/fleury -* File: $Id: twimaster.c,v 1.3 2005/07/02 11:14:21 Peter Exp $ -* Software: AVR-GCC 3.4.3 / avr-libc 1.2.3 -* Target: any AVR device with hardware TWI -* Usage: API compatible with I2C Software Library i2cmaster.h -**************************************************************************/ -#include -#include - -#include - - -/* define CPU frequency in Mhz here if not defined in Makefile */ -#ifndef F_CPU -#define F_CPU 16000000UL -#endif - -/* I2C clock in Hz */ -#define SCL_CLOCK 400000L - - -/************************************************************************* - Initialization of the I2C bus interface. Need to be called only once -*************************************************************************/ -void i2c_init(void) -{ - /* initialize TWI clock - * minimal values in Bit Rate Register (TWBR) and minimal Prescaler - * bits in the TWI Status Register should give us maximal possible - * I2C bus speed - about 444 kHz - * - * for more details, see 20.5.2 in ATmega16/32 secification - */ - - TWSR = 0; /* no prescaler */ - TWBR = 10; /* must be >= 10 for stable operation */ - -}/* i2c_init */ - - -/************************************************************************* - Issues a start condition and sends address and transfer direction. - return 0 = device accessible, 1= failed to access device -*************************************************************************/ -unsigned char i2c_start(unsigned char address) -{ - uint8_t twst; - - // send START condition - TWCR = (1<