mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-21 00:53:23 +00:00
43579a80a7
* Added orthodox
* Modified readme
* Modified readme
* Modified readme
* Updated makefile
* Fixed keymap issues
* Modified serial communications to allow for over 8 columns
* Fixed sizeof command
* Fixed some typing issues
* Testing issue #1191 (n-column split i2c slave)
Based on initial OrthoDox (serial) config by @reddragond and others,
this attempts to add TWI (I2C) support.
Relevant: <https://github.com/qmk/qmk_firmware/issues/1191>
- per @ahtn recommendation, using memcpy for moving slave matrix
into slave sending buffer
- slave buffer has been enlarged using sizeof(matrix_row_t)
- note: i2c.h now includes matrix.h
- note: matrix.c includes <string.h>
* Added i2c keymap - right col still not working
* orthodox: re-added i2c keymap, based on serial
* orthodox / issue #1191: trying 9-bit serial
- orthodox serial protocol now sends 9 bits per row, instead of 16.
Technically it's using MATRIX_COLS, so it might work generically.
- ROW_MASK is #defined in serial.c to truncate the checksums to prevent
overflows causing false errors. This macro should be renamed if it's
kept.
* Revert "Fixed sizeof command"
This reverts commit f62a5b9939.
Changes had been made to the lets_split serial driver for testing which
mirrored the multi-byte-row changes made to support the orthodox. As the
lets_split does not require these changes, and new improvements had
been added to the orthodox port only, this commit reverts them.
Because the new code could potentially reduce latency over the serial
transport, it may be desirable to re-add in the future, by backporting
the current working orthodox code.
* orthodox: default serial keymap improvements
- formatting has been improved
- a few keys have been shifted, mainly in Raise and Lower layers,
to be more like the default Planck layout
- Now available: F12, Home, End, PgUp, PgDn, Media-Next, Media-Play
Still To Do:
- duplicate for TWI
- Alt modifier
- GUI modifier
* orthodox: failed attempt at 16b/row TWI
- duplicated updated serial keymap for "i2c"
- removed string.h/memcpy, instead
- hardcoded copying of six bytes per update
- still doesn't work; master reports interconnect errors on txled
* orthodox: adjusted default keymap
- this is applied to both 'serial' and 'i2c' keymaps
- Alt and GUI have been added, as they were missing
- comma and period persist across more layers; Home/PgUp and End/PgDn
have been moved slightly to accommodate
* orthodox: revert TWI support to minimum to debug
- disabled ssd1306 and hardware locking in build configuration
- increased TWI buffer from 0x10 to 0x20 bytes
- decreased TWI clock from 400000 to 100000
- removed hardcoded TWI multi-byte sending/receiving
An 'i2c' build of this was found to work on a rev1 Orthodox, although
slave-side col9 was understandably not working. When testing-time
permits, features will be gradually re-enabled towards getting the full
matrix supported over TWI.
* orthodox: TWI (i2c) is working, kludge for col9
The TWI interconnect ("i2c" in directories and build config) is now
working for the Orthodox, including the slave half's column #9.
This is intended as an interim solution, as it's a kludge, not a fix.
Rather than a working multi-byte implementation, the two col9 keys'
bits are packed-into and unpacked-from the two unused bits in row1.
Furthermore, the TWI clock constant has been reduced to 100000 from
400000, as testing revealed the higher value just didn't work.
Testing also found that (with this kludge) increasing the TWI buffer
was not necessary.
This commit leaves many commented-out lines in matrix.c from previous
testing, which will be removed in a future commit once the
interconnects' multi-byte problems have been debugged more thoroughly.
* orthodox: updated readme.md
The readme for the Orthodox now includes a description of the keyboard,
allusions to its author and availability, a linked photo, and links to
the evolving build guide and the current keymap on KLE.
This update has been prepared with /u/Deductivemonkee's assistance.
85 lines
1.6 KiB
C
85 lines
1.6 KiB
C
#include <avr/io.h>
|
|
#include <avr/wdt.h>
|
|
#include <avr/power.h>
|
|
#include <avr/interrupt.h>
|
|
#include <util/delay.h>
|
|
#include <avr/eeprom.h>
|
|
#include "split_util.h"
|
|
#include "matrix.h"
|
|
#include "keyboard.h"
|
|
#include "config.h"
|
|
|
|
#ifdef USE_I2C
|
|
# include "i2c.h"
|
|
#else
|
|
# include "serial.h"
|
|
#endif
|
|
|
|
volatile bool isLeftHand = true;
|
|
|
|
static void setup_handedness(void) {
|
|
#ifdef EE_HANDS
|
|
isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS);
|
|
#else
|
|
// I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c
|
|
#if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT)
|
|
isLeftHand = !has_usb();
|
|
#else
|
|
isLeftHand = has_usb();
|
|
#endif
|
|
#endif
|
|
}
|
|
|
|
static void keyboard_master_setup(void) {
|
|
#ifdef USE_I2C
|
|
i2c_master_init();
|
|
#ifdef SSD1306OLED
|
|
matrix_master_OLED_init ();
|
|
#endif
|
|
#else
|
|
serial_master_init();
|
|
#endif
|
|
}
|
|
|
|
static void keyboard_slave_setup(void) {
|
|
#ifdef USE_I2C
|
|
i2c_slave_init(SLAVE_I2C_ADDRESS);
|
|
#else
|
|
serial_slave_init();
|
|
#endif
|
|
}
|
|
|
|
bool has_usb(void) {
|
|
USBCON |= (1 << OTGPADE); //enables VBUS pad
|
|
_delay_us(5);
|
|
return (USBSTA & (1<<VBUS)); //checks state of VBUS
|
|
}
|
|
|
|
void split_keyboard_setup(void) {
|
|
setup_handedness();
|
|
|
|
if (has_usb()) {
|
|
keyboard_master_setup();
|
|
} else {
|
|
keyboard_slave_setup();
|
|
}
|
|
sei();
|
|
}
|
|
|
|
void keyboard_slave_loop(void) {
|
|
matrix_init();
|
|
|
|
while (1) {
|
|
matrix_slave_scan();
|
|
}
|
|
}
|
|
|
|
// this code runs before the usb and keyboard is initialized
|
|
void matrix_setup(void) {
|
|
split_keyboard_setup();
|
|
|
|
if (!has_usb()) {
|
|
keyboard_slave_loop();
|
|
}
|
|
}
|