You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

376 lines
11 KiB

8 years ago
8 years ago
8 years ago
Simplify split_common Code significantly (#4772) * Eliminate separate slave loop Both master and slave run the standard keyboard_task main loop now. * Refactor i2c/serial specific code Simplify some of the preprocessor mess by using common function names. * Fix missing #endif * Move direct pin mapping support from miniaxe to split_common For boards with more pins than sense--sorry, switches. * Reordering and reformatting only * Don't run matrix_scan_quantum on slave side * Clean up the offset/slaveOffset calculations * Cut undebounced matrix size in half * Refactor debouncing * Minor fixups * Split split_common transport and debounce code into their own files Can now be replaced with custom versions per keyboard using CUSTOM_TRANSPORT = yes and CUSTOM_DEBOUNCE = yes * Refactor debounce for non-split keyboards too * Update handwired/xealous to build using new split_common * Fix debounce breaking basic test * Dodgy method to allow a split kb to only include one of i2c/serial SPLIT_TRANSPORT = serial or SPLIT_TRANSPORT = i2c will include only that driver code in the binary. SPLIT_TRANSPORT = custom (or anything else) will include neither, the keyboard must supply it's own code if SPLIT_TRANSPORT is not defined then the original behaviour (include both avr i2c and serial code) is maintained. This could be better but it would require explicitly updating all the existing split keyboards. * Enable LTO to get lets_split/sockets under the line * Add docs for SPLIT_TRANSPORT, CUSTOM_MATRIX, CUSTOM_DEBOUNCE * Remove avr-specific sei() from split matrix_setup Not needed now that slave doesn't have a separate main loop. Both sides (on avr) call sei() in lufa's main() after exiting keyboard_setup(). * Fix QUANTUM_LIB_SRC references and simplify SPLIT_TRANSPORT. * Add comments and fix formatting.
5 years ago
2020 November 28 Breaking Changes Update (#11053) * Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
3 years ago
2020 November 28 Breaking Changes Update (#11053) * Branch point for 2020 November 28 Breaking Change * Remove matrix_col_t to allow MATRIX_ROWS > 32 (#10183) * Add support for soft serial to ATmega32U2 (#10204) * Change MIDI velocity implementation to allow direct control of velocity value (#9940) * Add ability to build a subset of all keyboards based on platform. * Actually use eeprom_driver_init(). * Make bootloader_jump weak for ChibiOS. (#10417) * Joystick 16-bit support (#10439) * Per-encoder resolutions (#10259) * Share button state from mousekey to pointing_device (#10179) * Add hotfix for chibios keyboards not wake (#10088) * Add advanced/efficient RGB Matrix Indicators (#8564) * Naming change. * Support for STM32 GPIOF,G,H,I,J,K (#10206) * Add milc as a dependency and remove the installed milc (#10563) * ChibiOS upgrade: early init conversions (#10214) * ChibiOS upgrade: configuration file migrator (#9952) * Haptic and solenoid cleanup (#9700) * XD75 cleanup (#10524) * OLED display update interval support (#10388) * Add definition based on currently-selected serial driver. (#10716) * New feature: Retro Tapping per key (#10622) * Allow for modification of output RGB values when using rgblight/rgb_matrix. (#10638) * Add housekeeping task callbacks so that keyboards/keymaps are capable of executing code for each main loop iteration. (#10530) * Rescale both ChibiOS and AVR backlighting. * Reduce Helix keyboard build variation (#8669) * Minor change to behavior allowing display updates to continue between task ticks (#10750) * Some GPIO manipulations in matrix.c change to atomic. (#10491) * qmk cformat (#10767) * [Keyboard] Update the Speedo firmware for v3.0 (#10657) * Maartenwut/Maarten namechange to evyd13/Evy (#10274) * [quantum] combine repeated lines of code (#10837) * Add step sequencer feature (#9703) * aeboards/ext65 refactor (#10820) * Refactor xelus/dawn60 for Rev2 later (#10584) * add DEBUG_MATRIX_SCAN_RATE_ENABLE to common_features.mk (#10824) * [Core] Added `add_oneshot_mods` & `del_oneshot_mods` (#10549) * update chibios os usb for the otg driver (#8893) * Remove HD44780 References, Part 4 (#10735) * [Keyboard] Add Valor FRL TKL (+refactor) (#10512) * Fix cursor position bug in oled_write_raw functions (#10800) * Fixup version.h writing when using SKIP_VERSION=yes (#10972) * Allow for certain code in the codebase assuming length of string. (#10974) * Add AT90USB support for serial.c (#10706) * Auto shift: support repeats and early registration (#9826) * Rename ledmatrix.h to match .c file (#7949) * Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER (#10231) * Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER (#10840) * Merge point for 2020 Nov 28 Breaking Change
3 years ago
8 years ago
8 years ago
  1. /*
  2. Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
  3. This program is free software: you can redistribute it and/or modify
  4. it under the terms of the GNU General Public License as published by
  5. the Free Software Foundation, either version 2 of the License, or
  6. (at your option) any later version.
  7. This program is distributed in the hope that it will be useful,
  8. but WITHOUT ANY WARRANTY; without even the implied warranty of
  9. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  10. GNU General Public License for more details.
  11. You should have received a copy of the GNU General Public License
  12. along with this program. If not, see <http://www.gnu.org/licenses/>.
  13. */
  14. #include <stdint.h>
  15. #include <stdbool.h>
  16. #include <string.h>
  17. #include "util.h"
  18. #include "matrix.h"
  19. #include "debounce.h"
  20. #include "quantum.h"
  21. #ifdef SPLIT_KEYBOARD
  22. # include "split_common/split_util.h"
  23. # include "split_common/transactions.h"
  24. # ifndef ERROR_DISCONNECT_COUNT
  25. # define ERROR_DISCONNECT_COUNT 5
  26. # endif // ERROR_DISCONNECT_COUNT
  27. # define ROWS_PER_HAND (MATRIX_ROWS / 2)
  28. #else
  29. # define ROWS_PER_HAND (MATRIX_ROWS)
  30. #endif
  31. #ifdef DIRECT_PINS_RIGHT
  32. # define SPLIT_MUTABLE
  33. #else
  34. # define SPLIT_MUTABLE const
  35. #endif
  36. #ifdef MATRIX_ROW_PINS_RIGHT
  37. # define SPLIT_MUTABLE_ROW
  38. #else
  39. # define SPLIT_MUTABLE_ROW const
  40. #endif
  41. #ifdef MATRIX_COL_PINS_RIGHT
  42. # define SPLIT_MUTABLE_COL
  43. #else
  44. # define SPLIT_MUTABLE_COL const
  45. #endif
  46. #ifdef DIRECT_PINS
  47. static SPLIT_MUTABLE pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
  48. #elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
  49. # ifdef MATRIX_ROW_PINS
  50. static SPLIT_MUTABLE_ROW pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
  51. # endif // MATRIX_ROW_PINS
  52. # ifdef MATRIX_COL_PINS
  53. static SPLIT_MUTABLE_COL pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
  54. # endif // MATRIX_COL_PINS
  55. #endif
  56. /* matrix state(1:on, 0:off) */
  57. extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
  58. extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
  59. #ifdef SPLIT_KEYBOARD
  60. // row offsets for each hand
  61. uint8_t thisHand, thatHand;
  62. #endif
  63. // user-defined overridable functions
  64. __attribute__((weak)) void matrix_init_pins(void);
  65. __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
  66. __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
  67. #ifdef SPLIT_KEYBOARD
  68. __attribute__((weak)) void matrix_slave_scan_kb(void) { matrix_slave_scan_user(); }
  69. __attribute__((weak)) void matrix_slave_scan_user(void) {}
  70. #endif
  71. static inline void setPinOutput_writeLow(pin_t pin) {
  72. ATOMIC_BLOCK_FORCEON {
  73. setPinOutput(pin);
  74. writePinLow(pin);
  75. }
  76. }
  77. static inline void setPinInputHigh_atomic(pin_t pin) {
  78. ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
  79. }
  80. static inline uint8_t readMatrixPin(pin_t pin) {
  81. if (pin != NO_PIN) {
  82. return readPin(pin);
  83. } else {
  84. return 1;
  85. }
  86. }
  87. // matrix code
  88. #ifdef DIRECT_PINS
  89. __attribute__((weak)) void matrix_init_pins(void) {
  90. for (int row = 0; row < MATRIX_ROWS; row++) {
  91. for (int col = 0; col < MATRIX_COLS; col++) {
  92. pin_t pin = direct_pins[row][col];
  93. if (pin != NO_PIN) {
  94. setPinInputHigh(pin);
  95. }
  96. }
  97. }
  98. }
  99. __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
  100. // Start with a clear matrix row
  101. matrix_row_t current_row_value = 0;
  102. for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
  103. pin_t pin = direct_pins[current_row][col_index];
  104. if (pin != NO_PIN) {
  105. current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
  106. }
  107. }
  108. // Update the matrix
  109. current_matrix[current_row] = current_row_value;
  110. }
  111. #elif defined(DIODE_DIRECTION)
  112. # if defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
  113. # if (DIODE_DIRECTION == COL2ROW)
  114. static bool select_row(uint8_t row) {
  115. pin_t pin = row_pins[row];
  116. if (pin != NO_PIN) {
  117. setPinOutput_writeLow(pin);
  118. return true;
  119. }
  120. return false;
  121. }
  122. static void unselect_row(uint8_t row) {
  123. pin_t pin = row_pins[row];
  124. if (pin != NO_PIN) {
  125. setPinInputHigh_atomic(pin);
  126. }
  127. }
  128. static void unselect_rows(void) {
  129. for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
  130. unselect_row(x);
  131. }
  132. }
  133. __attribute__((weak)) void matrix_init_pins(void) {
  134. unselect_rows();
  135. for (uint8_t x = 0; x < MATRIX_COLS; x++) {
  136. if (col_pins[x] != NO_PIN) {
  137. setPinInputHigh_atomic(col_pins[x]);
  138. }
  139. }
  140. }
  141. __attribute__((weak)) void matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
  142. // Start with a clear matrix row
  143. matrix_row_t current_row_value = 0;
  144. if (!select_row(current_row)) { // Select row
  145. return; // skip NO_PIN row
  146. }
  147. matrix_output_select_delay();
  148. // For each col...
  149. for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
  150. uint8_t pin_state = readMatrixPin(col_pins[col_index]);
  151. // Populate the matrix row with the state of the col pin
  152. current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
  153. }
  154. // Unselect row
  155. unselect_row(current_row);
  156. matrix_output_unselect_delay(current_row, current_row_value != 0); // wait for all Col signals to go HIGH
  157. // Update the matrix
  158. current_matrix[current_row] = current_row_value;
  159. }
  160. # elif (DIODE_DIRECTION == ROW2COL)
  161. static bool select_col(uint8_t col) {
  162. pin_t pin = col_pins[col];
  163. if (pin != NO_PIN) {
  164. setPinOutput_writeLow(pin);
  165. return true;
  166. }
  167. return false;
  168. }
  169. static void unselect_col(uint8_t col) {
  170. pin_t pin = col_pins[col];
  171. if (pin != NO_PIN) {
  172. setPinInputHigh_atomic(pin);
  173. }
  174. }
  175. static void unselect_cols(void) {
  176. for (uint8_t x = 0; x < MATRIX_COLS; x++) {
  177. unselect_col(x);
  178. }
  179. }
  180. __attribute__((weak)) void matrix_init_pins(void) {
  181. unselect_cols();
  182. for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
  183. if (row_pins[x] != NO_PIN) {
  184. setPinInputHigh_atomic(row_pins[x]);
  185. }
  186. }
  187. }
  188. __attribute__((weak)) void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
  189. bool key_pressed = false;
  190. // Select col
  191. if (!select_col(current_col)) { // select col
  192. return; // skip NO_PIN col
  193. }
  194. matrix_output_select_delay();
  195. // For each row...
  196. for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
  197. // Check row pin state
  198. if (readMatrixPin(row_pins[row_index]) == 0) {
  199. // Pin LO, set col bit
  200. current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
  201. key_pressed = true;
  202. } else {
  203. // Pin HI, clear col bit
  204. current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
  205. }
  206. }
  207. // Unselect col
  208. unselect_col(current_col);
  209. matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
  210. }
  211. # else
  212. # error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
  213. # endif
  214. # endif // defined(MATRIX_ROW_PINS) && defined(MATRIX_COL_PINS)
  215. #else
  216. # error DIODE_DIRECTION is not defined!
  217. #endif
  218. void matrix_init(void) {
  219. #ifdef SPLIT_KEYBOARD
  220. split_pre_init();
  221. // Set pinout for right half if pinout for that half is defined
  222. if (!isLeftHand) {
  223. # ifdef DIRECT_PINS_RIGHT
  224. const pin_t direct_pins_right[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS_RIGHT;
  225. for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
  226. for (uint8_t j = 0; j < MATRIX_COLS; j++) {
  227. direct_pins[i][j] = direct_pins_right[i][j];
  228. }
  229. }
  230. # endif
  231. # ifdef MATRIX_ROW_PINS_RIGHT
  232. const pin_t row_pins_right[MATRIX_ROWS] = MATRIX_ROW_PINS_RIGHT;
  233. for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
  234. row_pins[i] = row_pins_right[i];
  235. }
  236. # endif
  237. # ifdef MATRIX_COL_PINS_RIGHT
  238. const pin_t col_pins_right[MATRIX_COLS] = MATRIX_COL_PINS_RIGHT;
  239. for (uint8_t i = 0; i < MATRIX_COLS; i++) {
  240. col_pins[i] = col_pins_right[i];
  241. }
  242. # endif
  243. }
  244. thisHand = isLeftHand ? 0 : (ROWS_PER_HAND);
  245. thatHand = ROWS_PER_HAND - thisHand;
  246. #endif
  247. // initialize key pins
  248. matrix_init_pins();
  249. // initialize matrix state: all keys off
  250. for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
  251. raw_matrix[i] = 0;
  252. matrix[i] = 0;
  253. }
  254. debounce_init(ROWS_PER_HAND);
  255. matrix_init_quantum();
  256. #ifdef SPLIT_KEYBOARD
  257. split_post_init();
  258. #endif
  259. }
  260. #ifdef SPLIT_KEYBOARD
  261. bool matrix_post_scan(void) {
  262. bool changed = false;
  263. if (is_keyboard_master()) {
  264. static uint8_t error_count;
  265. matrix_row_t slave_matrix[ROWS_PER_HAND] = {0};
  266. if (!transport_master(matrix + thisHand, slave_matrix)) {
  267. error_count++;
  268. if (error_count > ERROR_DISCONNECT_COUNT) {
  269. // reset other half if disconnected
  270. for (int i = 0; i < ROWS_PER_HAND; ++i) {
  271. matrix[thatHand + i] = 0;
  272. slave_matrix[i] = 0;
  273. }
  274. changed = true;
  275. }
  276. } else {
  277. error_count = 0;
  278. for (int i = 0; i < ROWS_PER_HAND; ++i) {
  279. if (matrix[thatHand + i] != slave_matrix[i]) {
  280. matrix[thatHand + i] = slave_matrix[i];
  281. changed = true;
  282. }
  283. }
  284. }
  285. matrix_scan_quantum();
  286. } else {
  287. transport_slave(matrix + thatHand, matrix + thisHand);
  288. matrix_slave_scan_kb();
  289. }
  290. return changed;
  291. }
  292. #endif
  293. uint8_t matrix_scan(void) {
  294. matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
  295. #if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
  296. // Set row, read cols
  297. for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
  298. matrix_read_cols_on_row(curr_matrix, current_row);
  299. }
  300. #elif (DIODE_DIRECTION == ROW2COL)
  301. // Set col, read rows
  302. for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
  303. matrix_read_rows_on_col(curr_matrix, current_col);
  304. }
  305. #endif
  306. bool changed = memcmp(raw_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
  307. if (changed) memcpy(raw_matrix, curr_matrix, sizeof(curr_matrix));
  308. #ifdef SPLIT_KEYBOARD
  309. debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
  310. changed = (changed || matrix_post_scan());
  311. #else
  312. debounce(raw_matrix, matrix, ROWS_PER_HAND, changed);
  313. matrix_scan_quantum();
  314. #endif
  315. return (uint8_t)changed;
  316. }