diff options
author | That-Canadian <Poole.Chris.11@gmail.com> | 2018-07-16 19:25:02 -0700 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2018-07-16 22:25:02 -0400 |
commit | 0fab3bbde33f82301a8c5e177c3c0ceb7ad2219c (patch) | |
tree | 15a411d5ed6ad203982337448cfde11ed26ce7b7 /quantum/split_common/split_util.c | |
parent | b2877470ced1deb9651ecb39f6a82f5ef380b399 (diff) | |
download | qmk_firmware-0fab3bbde33f82301a8c5e177c3c0ceb7ad2219c.tar.gz qmk_firmware-0fab3bbde33f82301a8c5e177c3c0ceb7ad2219c.zip |
Lets split eh (#3120)
* 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"
Diffstat (limited to 'quantum/split_common/split_util.c')
-rw-r--r-- | quantum/split_common/split_util.c | 145 |
1 files changed, 145 insertions, 0 deletions
diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c new file mode 100644 index 000000000..340a63137 --- /dev/null +++ b/quantum/split_common/split_util.c | |||
@@ -0,0 +1,145 @@ | |||
1 | #include <avr/io.h> | ||
2 | #include <avr/wdt.h> | ||
3 | #include <avr/power.h> | ||
4 | #include <avr/interrupt.h> | ||
5 | #include <util/delay.h> | ||
6 | #include <avr/eeprom.h> | ||
7 | #include "split_util.h" | ||
8 | #include "matrix.h" | ||
9 | #include "keyboard.h" | ||
10 | #include "config.h" | ||
11 | #include "timer.h" | ||
12 | #include "split_flags.h" | ||
13 | |||
14 | #ifdef RGBLIGHT_ENABLE | ||
15 | # include "rgblight.h" | ||
16 | #endif | ||
17 | #ifdef BACKLIGHT_ENABLE | ||
18 | # include "backlight.h" | ||
19 | #endif | ||
20 | |||
21 | #ifdef SPLIT_HAND_PIN | ||
22 | # include "pincontrol.h" | ||
23 | #endif | ||
24 | |||
25 | #if defined(USE_I2C) || defined(EH) | ||
26 | # include "i2c.h" | ||
27 | #else | ||
28 | # include "serial.h" | ||
29 | #endif | ||
30 | |||
31 | volatile bool isLeftHand = true; | ||
32 | |||
33 | volatile uint8_t setTries = 0; | ||
34 | |||
35 | static void setup_handedness(void) { | ||
36 | #ifdef SPLIT_HAND_PIN | ||
37 | // Test pin SPLIT_HAND_PIN for High/Low, if low it's right hand | ||
38 | pinMode(SPLIT_HAND_PIN, PinDirectionInput); | ||
39 | isLeftHand = digitalRead(SPLIT_HAND_PIN); | ||
40 | #else | ||
41 | #ifdef EE_HANDS | ||
42 | isLeftHand = eeprom_read_byte(EECONFIG_HANDEDNESS); | ||
43 | #else | ||
44 | // I2C_MASTER_RIGHT is deprecated, use MASTER_RIGHT instead, since this works for both serial and i2c | ||
45 | #if defined(I2C_MASTER_RIGHT) || defined(MASTER_RIGHT) | ||
46 | isLeftHand = !has_usb(); | ||
47 | #else | ||
48 | isLeftHand = has_usb(); | ||
49 | #endif | ||
50 | #endif | ||
51 | #endif | ||
52 | } | ||
53 | |||
54 | static void keyboard_master_setup(void) { | ||
55 | #if defined(USE_I2C) || defined(EH) | ||
56 | i2c_master_init(); | ||
57 | #ifdef SSD1306OLED | ||
58 | matrix_master_OLED_init (); | ||
59 | #endif | ||
60 | #else | ||
61 | serial_master_init(); | ||
62 | #endif | ||
63 | |||
64 | // For master the Backlight info needs to be sent on startup | ||
65 | // Otherwise the salve won't start with the proper info until an update | ||
66 | BACKLIT_DIRTY = true; | ||
67 | } | ||
68 | |||
69 | static void keyboard_slave_setup(void) { | ||
70 | timer_init(); | ||
71 | #if defined(USE_I2C) || defined(EH) | ||
72 | i2c_slave_init(SLAVE_I2C_ADDRESS); | ||
73 | #else | ||
74 | serial_slave_init(); | ||
75 | #endif | ||
76 | } | ||
77 | |||
78 | bool has_usb(void) { | ||
79 | USBCON |= (1 << OTGPADE); //enables VBUS pad | ||
80 | _delay_us(5); | ||
81 | return (USBSTA & (1<<VBUS)); //checks state of VBUS | ||
82 | } | ||
83 | |||
84 | void split_keyboard_setup(void) { | ||
85 | setup_handedness(); | ||
86 | |||
87 | if (has_usb()) { | ||
88 | keyboard_master_setup(); | ||
89 | } else { | ||
90 | keyboard_slave_setup(); | ||
91 | } | ||
92 | sei(); | ||
93 | } | ||
94 | |||
95 | void keyboard_slave_loop(void) { | ||
96 | matrix_init(); | ||
97 | |||
98 | //Init RGB | ||
99 | #ifdef RGBLIGHT_ENABLE | ||
100 | rgblight_init(); | ||
101 | #endif | ||
102 | |||
103 | while (1) { | ||
104 | matrix_slave_scan(); | ||
105 | |||
106 | // read backlight info | ||
107 | #ifdef BACKLIGHT_ENABLE | ||
108 | if (BACKLIT_DIRTY) { | ||
109 | backlight_set(i2c_slave_buffer[I2C_BACKLIT_START]); | ||
110 | BACKLIT_DIRTY = false; | ||
111 | } | ||
112 | #endif | ||
113 | #ifdef RGBLIGHT_ENABLE | ||
114 | if (RGB_DIRTY) { | ||
115 | cli(); | ||
116 | uint32_t dword; | ||
117 | |||
118 | /*dword = i2c_slave_buffer[I2C_RGB_START + 3]; | ||
119 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START + 2]; | ||
120 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START + 1]; | ||
121 | dword = (dword << 8) + i2c_slave_buffer[I2C_RGB_START];*/ | ||
122 | |||
123 | |||
124 | uint8_t *dword_dat = (uint8_t *)(&dword); | ||
125 | for (int i = 0; i < 4; i++) { | ||
126 | dword_dat[i] = i2c_slave_buffer[I2C_RGB_START+i]; | ||
127 | } | ||
128 | |||
129 | rgblight_update_dword(dword); | ||
130 | RGB_DIRTY = false; | ||
131 | sei(); | ||
132 | } | ||
133 | #endif | ||
134 | } | ||
135 | } | ||
136 | |||
137 | // this code runs before the usb and keyboard is initialized | ||
138 | void matrix_setup(void) { | ||
139 | split_keyboard_setup(); | ||
140 | |||
141 | if (!has_usb()) { | ||
142 | //rgblight_init(); | ||
143 | keyboard_slave_loop(); | ||
144 | } | ||
145 | } | ||