diff options
author | That-Canadian <Poole.Chris.11@gmail.com> | 2018-07-17 11:54:07 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-07-17 14:54:07 -0400 |
commit | a012113d636e3f23841c23343ae3f1d5b7452701 (patch) | |
tree | f8fc1cf08b796ff5c3a263788277cd22c3c497cd | |
parent | c691396ae5bb48753b93fb22f74e4b70b82182eb (diff) | |
download | qmk_firmware-a012113d636e3f23841c23343ae3f1d5b7452701.tar.gz qmk_firmware-a012113d636e3f23841c23343ae3f1d5b7452701.zip |
Split common (#3429)
* Line ending stuff again
* Added Let's Split Eh? Files and updated #USE_IC2 checks to also include th EH revision (can only be used in I2C)
* Added personal keymap, updated some of the EH files
* Created new keyboard file for testing "lets_split_eh" will merge into lets_split once fully functional
* Added split code from lets_split, removed pro micro imports and LED code
THIS IS WORKING CODE, WITHOUT RGB AND BACKLIGHT
* Took back original Lets Slit files for the lets_split keyboard, working in the lets_split_eh folder for now
* Updated eh.c
* More rework of the I2C code, added global flags for split boards.
* Introduced RGB over I2C, having weird edge case issues at the moment though
* Fixed weird I2C edgecase with RGB, although still would like to track down route cause..
* Changed RGB keycodes (static ones) to activate on key-up instead of key-down to elimate weird ghosting issue over I2C
* Lots of changes, mainly externalized the Split keyboard code and added logic for only including when needed.
- Added makefile option "SPLIT_KEYBOARD" that when = yes will include the split keyboard files and custom matrix
- Split keyboard files placed into quantum/split_common/
- Added define option for config files "SPLIT_HAND_PIN" FOr using high/low pin to determine handedness, low = right hand, high = left hand
- Cleaned up split logic for RGB and Backlight so it is only exectuted / included when needed
* Updated documentation for the new makefile options and #defines specific to split keyboards
* Added a bit more info to docs, so people aren't confused
* Modifed Let's Split to use externalized code, also added left and right hand eeprom files to the split_common folder
* Removed some debugging from eh.c
* Small changes to keyboard configs. Also added a default keymap (just a copy of my that_canadian keymap).
* Added a README file to the Let's Split Eh?
* Changed it so RGB static updates are done on key-up ONLY for split boards rather than all boards. Also fixed leftover un-used variable in rgblight.c
* Updated default keymap and my keymap for Let's Split Eh? Updated the comments so it reflects RGB control, and removed audio functions.
* Fixed lets_split_eh not having a default version
* Removed "eh" references from lets_split folder for now
* Took lets_split folder from master to fix travis build errors, weird my local was overriding.
* Changed LAYOUT_ortho_4x12_kc -> LAYOUT_kc_ortho_4x12 to match bakingpy and others
* Removed rules.mk from my lets_split keymap, not needed
* Updated the config_options doc to better explain the usage of "#define SPLIT_HAND_PIN"
* Fixed split_common assuming I2C for RGB and Backlight. Added serial backlight support (stole from bakingpy's Levinson code ;) ) Serial RGB not implemented yet. Also Added "USE_IC2" to the lets_split_eh/eh as that was looked over.
* Fixed stupid mistake, forgot to set BACKLIT_DIRTY to false after setting slave backlit settings for serial
* Updated backlight data block to be cleaner (thanks drashna ;) )
-rw-r--r-- | keyboards/lets_split_eh/eh/config.h | 2 | ||||
-rw-r--r-- | quantum/split_common/matrix.c | 10 | ||||
-rw-r--r-- | quantum/split_common/serial.h | 3 | ||||
-rw-r--r-- | quantum/split_common/split_util.c | 53 |
4 files changed, 46 insertions, 22 deletions
diff --git a/keyboards/lets_split_eh/eh/config.h b/keyboards/lets_split_eh/eh/config.h index 5651ddd8b..59afb39c0 100644 --- a/keyboards/lets_split_eh/eh/config.h +++ b/keyboards/lets_split_eh/eh/config.h | |||
@@ -21,6 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
21 | 21 | ||
22 | // To let configuration know this is of type EH, which will force I2C irregardless of user config | 22 | // To let configuration know this is of type EH, which will force I2C irregardless of user config |
23 | #define EH | 23 | #define EH |
24 | // The 'EH' only uses I2C | ||
25 | #define USE_I2C | ||
24 | 26 | ||
25 | #include "config_common.h" | 27 | #include "config_common.h" |
26 | 28 | ||
diff --git a/quantum/split_common/matrix.c b/quantum/split_common/matrix.c index 071f0481a..5e5475f44 100644 --- a/quantum/split_common/matrix.c +++ b/quantum/split_common/matrix.c | |||
@@ -286,6 +286,16 @@ int serial_transaction(void) { | |||
286 | for (int i = 0; i < ROWS_PER_HAND; ++i) { | 286 | for (int i = 0; i < ROWS_PER_HAND; ++i) { |
287 | matrix[slaveOffset+i] = serial_slave_buffer[i]; | 287 | matrix[slaveOffset+i] = serial_slave_buffer[i]; |
288 | } | 288 | } |
289 | |||
290 | #ifdef RGBLIGHT_ENABLE | ||
291 | // Code to send RGB over serial goes here (not implemented yet) | ||
292 | #endif | ||
293 | |||
294 | #ifdef BACKLIGHT_ENABLE | ||
295 | // Write backlight level for slave to read | ||
296 | serial_master_buffer[SERIAL_BACKLIT_START] = backlight_config.enable ? backlight_config.level : 0; | ||
297 | #endif | ||
298 | |||
289 | return 0; | 299 | return 0; |
290 | } | 300 | } |
291 | #endif | 301 | #endif |
diff --git a/quantum/split_common/serial.h b/quantum/split_common/serial.h index 15fe4db7b..e566eb8a0 100644 --- a/quantum/split_common/serial.h +++ b/quantum/split_common/serial.h | |||
@@ -14,6 +14,9 @@ | |||
14 | #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 | 14 | #define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2 |
15 | #define SERIAL_MASTER_BUFFER_LENGTH 1 | 15 | #define SERIAL_MASTER_BUFFER_LENGTH 1 |
16 | 16 | ||
17 | // Address location defines | ||
18 | #define SERIAL_BACKLIT_START 0x00 | ||
19 | |||
17 | // Buffers for master - slave communication | 20 | // Buffers for master - slave communication |
18 | extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; | 21 | extern volatile uint8_t serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH]; |
19 | extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH]; | 22 | extern volatile uint8_t serial_master_buffer[SERIAL_MASTER_BUFFER_LENGTH]; |
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 340a63137..13b09d5b8 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c | |||
@@ -101,35 +101,44 @@ void keyboard_slave_loop(void) { | |||
101 | #endif | 101 | #endif |
102 | 102 | ||
103 | while (1) { | 103 | while (1) { |
104 | matrix_slave_scan(); | 104 | // Matrix Slave Scan |
105 | 105 | matrix_slave_scan(); | |
106 | // read backlight info | 106 | |
107 | // Read Backlight Info | ||
107 | #ifdef BACKLIGHT_ENABLE | 108 | #ifdef BACKLIGHT_ENABLE |
108 | if (BACKLIT_DIRTY) { | 109 | if (BACKLIT_DIRTY) { |
109 | backlight_set(i2c_slave_buffer[I2C_BACKLIT_START]); | 110 | #ifdef USE_I2C |
111 | backlight_set(i2c_slave_buffer[I2C_BACKLIT_START]); | ||
112 | #else // USE_SERIAL | ||
113 | backlight_set(serial_master_buffer[SERIAL_BACKLIT_START]); | ||
114 | #endif | ||
110 | BACKLIT_DIRTY = false; | 115 | BACKLIT_DIRTY = false; |
111 | } | 116 | } |
112 | #endif | 117 | #endif |
118 | // Read RGB Info | ||
113 | #ifdef RGBLIGHT_ENABLE | 119 | #ifdef RGBLIGHT_ENABLE |
114 | if (RGB_DIRTY) { | 120 | #ifdef USE_I2C |
115 | cli(); | 121 | if (RGB_DIRTY) { |
116 | uint32_t dword; | 122 | // Disable interupts (RGB data is big) |
117 | 123 | cli(); | |
118 | /*dword = i2c_slave_buffer[I2C_RGB_START + 3]; | 124 | // Create new DWORD for RGB data |
119 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START + 2]; | 125 | uint32_t dword; |
120 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START + 1]; | 126 | |
121 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START];*/ | 127 | // Fill the new DWORD with the data that was sent over |
122 | 128 | uint8_t *dword_dat = (uint8_t *)(&dword); | |
123 | 129 | for (int i = 0; i < 4; i++) { | |
124 | uint8_t *dword_dat = (uint8_t *)(&dword); | 130 | dword_dat[i] = i2c_slave_buffer[I2C_RGB_START+i]; |
125 | for (int i = 0; i < 4; i++) { | 131 | } |
126 | dword_dat[i] = i2c_slave_buffer[I2C_RGB_START+i]; | 132 | |
133 | // Update the RGB now with the new data and set RGB_DIRTY to false | ||
134 | rgblight_update_dword(dword); | ||
135 | RGB_DIRTY = false; | ||
136 | // Re-enable interupts now that RGB is set | ||
137 | sei(); | ||
127 | } | 138 | } |
128 | 139 | #else // USE_SERIAL | |
129 | rgblight_update_dword(dword); | 140 | // Add serial implementation for RGB here |
130 | RGB_DIRTY = false; | 141 | #endif |
131 | sei(); | ||
132 | } | ||
133 | #endif | 142 | #endif |
134 | } | 143 | } |
135 | } | 144 | } |