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.

321 lines
7.7 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
8 years ago
8 years ago
8 years ago
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
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
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
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
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
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
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
8 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 "wait.h"
  17. #include "print.h"
  18. #include "debug.h"
  19. #include "util.h"
  20. #include "matrix.h"
  21. #include "debounce.h"
  22. #include "quantum.h"
  23. #if (MATRIX_COLS <= 8)
  24. # define print_matrix_header() print("\nr/c 01234567\n")
  25. # define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
  26. # define matrix_bitpop(i) bitpop(matrix[i])
  27. # define ROW_SHIFTER ((uint8_t)1)
  28. #elif (MATRIX_COLS <= 16)
  29. # define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
  30. # define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
  31. # define matrix_bitpop(i) bitpop16(matrix[i])
  32. # define ROW_SHIFTER ((uint16_t)1)
  33. #elif (MATRIX_COLS <= 32)
  34. # define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
  35. # define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
  36. # define matrix_bitpop(i) bitpop32(matrix[i])
  37. # define ROW_SHIFTER ((uint32_t)1)
  38. #endif
  39. #ifdef MATRIX_MASKED
  40. extern const matrix_row_t matrix_mask[];
  41. #endif
  42. #if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
  43. static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
  44. static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
  45. #endif
  46. /* matrix state(1:on, 0:off) */
  47. static matrix_row_t raw_matrix[MATRIX_ROWS]; //raw values
  48. static matrix_row_t matrix[MATRIX_ROWS]; //debounced values
  49. #if (DIODE_DIRECTION == COL2ROW)
  50. static void init_cols(void);
  51. static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
  52. static void unselect_rows(void);
  53. static void select_row(uint8_t row);
  54. static void unselect_row(uint8_t row);
  55. #elif (DIODE_DIRECTION == ROW2COL)
  56. static void init_rows(void);
  57. static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
  58. static void unselect_cols(void);
  59. static void unselect_col(uint8_t col);
  60. static void select_col(uint8_t col);
  61. #endif
  62. __attribute__ ((weak))
  63. void matrix_init_quantum(void) {
  64. matrix_init_kb();
  65. }
  66. __attribute__ ((weak))
  67. void matrix_scan_quantum(void) {
  68. matrix_scan_kb();
  69. }
  70. __attribute__ ((weak))
  71. void matrix_init_kb(void) {
  72. matrix_init_user();
  73. }
  74. __attribute__ ((weak))
  75. void matrix_scan_kb(void) {
  76. matrix_scan_user();
  77. }
  78. __attribute__ ((weak))
  79. void matrix_init_user(void) {
  80. }
  81. __attribute__ ((weak))
  82. void matrix_scan_user(void) {
  83. }
  84. inline
  85. uint8_t matrix_rows(void) {
  86. return MATRIX_ROWS;
  87. }
  88. inline
  89. uint8_t matrix_cols(void) {
  90. return MATRIX_COLS;
  91. }
  92. void matrix_init(void) {
  93. // initialize row and col
  94. #if (DIODE_DIRECTION == COL2ROW)
  95. unselect_rows();
  96. init_cols();
  97. #elif (DIODE_DIRECTION == ROW2COL)
  98. unselect_cols();
  99. init_rows();
  100. #endif
  101. // initialize matrix state: all keys off
  102. for (uint8_t i=0; i < MATRIX_ROWS; i++) {
  103. raw_matrix[i] = 0;
  104. matrix[i] = 0;
  105. }
  106. debounce_init(MATRIX_ROWS);
  107. matrix_init_quantum();
  108. }
  109. uint8_t matrix_scan(void)
  110. {
  111. bool changed = false;
  112. #if (DIODE_DIRECTION == COL2ROW)
  113. // Set row, read cols
  114. for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
  115. changed |= read_cols_on_row(raw_matrix, current_row);
  116. }
  117. #elif (DIODE_DIRECTION == ROW2COL)
  118. // Set col, read rows
  119. for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
  120. changed |= read_rows_on_col(raw_matrix, current_col);
  121. }
  122. #endif
  123. debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
  124. matrix_scan_quantum();
  125. return 1;
  126. }
  127. //Deprecated.
  128. bool matrix_is_modified(void)
  129. {
  130. if (debounce_active()) return false;
  131. return true;
  132. }
  133. inline
  134. bool matrix_is_on(uint8_t row, uint8_t col)
  135. {
  136. return (matrix[row] & ((matrix_row_t)1<<col));
  137. }
  138. inline
  139. matrix_row_t matrix_get_row(uint8_t row)
  140. {
  141. // Matrix mask lets you disable switches in the returned matrix data. For example, if you have a
  142. // switch blocker installed and the switch is always pressed.
  143. #ifdef MATRIX_MASKED
  144. return matrix[row] & matrix_mask[row];
  145. #else
  146. return matrix[row];
  147. #endif
  148. }
  149. void matrix_print(void)
  150. {
  151. print_matrix_header();
  152. for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
  153. phex(row); print(": ");
  154. print_matrix_row(row);
  155. print("\n");
  156. }
  157. }
  158. uint8_t matrix_key_count(void)
  159. {
  160. uint8_t count = 0;
  161. for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
  162. count += matrix_bitpop(i);
  163. }
  164. return count;
  165. }
  166. #if (DIODE_DIRECTION == COL2ROW)
  167. static void init_cols(void)
  168. {
  169. for(uint8_t x = 0; x < MATRIX_COLS; x++) {
  170. setPinInputHigh(col_pins[x]);
  171. }
  172. }
  173. static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
  174. {
  175. // Store last value of row prior to reading
  176. matrix_row_t last_row_value = current_matrix[current_row];
  177. // Clear data in matrix row
  178. current_matrix[current_row] = 0;
  179. // Select row and wait for row selecton to stabilize
  180. select_row(current_row);
  181. wait_us(30);
  182. // For each col...
  183. for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
  184. // Select the col pin to read (active low)
  185. uint8_t pin_state = readPin(col_pins[col_index]);
  186. // Populate the matrix row with the state of the col pin
  187. current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
  188. }
  189. // Unselect row
  190. unselect_row(current_row);
  191. return (last_row_value != current_matrix[current_row]);
  192. }
  193. static void select_row(uint8_t row)
  194. {
  195. setPinOutput(row_pins[row]);
  196. writePinLow(row_pins[row]);
  197. }
  198. static void unselect_row(uint8_t row)
  199. {
  200. setPinInputHigh(row_pins[row]);
  201. }
  202. static void unselect_rows(void)
  203. {
  204. for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
  205. setPinInput(row_pins[x]);
  206. }
  207. }
  208. #elif (DIODE_DIRECTION == ROW2COL)
  209. static void init_rows(void)
  210. {
  211. for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
  212. setPinInputHigh(row_pins[x]);
  213. }
  214. }
  215. static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
  216. {
  217. bool matrix_changed = false;
  218. // Select col and wait for col selecton to stabilize
  219. select_col(current_col);
  220. wait_us(30);
  221. // For each row...
  222. for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++)
  223. {
  224. // Store last value of row prior to reading
  225. matrix_row_t last_row_value = current_matrix[row_index];
  226. // Check row pin state
  227. if (readPin(row_pins[row_index]) == 0)
  228. {
  229. // Pin LO, set col bit
  230. current_matrix[row_index] |= (ROW_SHIFTER << current_col);
  231. }
  232. else
  233. {
  234. // Pin HI, clear col bit
  235. current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
  236. }
  237. // Determine if the matrix changed state
  238. if ((last_row_value != current_matrix[row_index]) && !(matrix_changed))
  239. {
  240. matrix_changed = true;
  241. }
  242. }
  243. // Unselect col
  244. unselect_col(current_col);
  245. return matrix_changed;
  246. }
  247. static void select_col(uint8_t col)
  248. {
  249. setPinOutput(col_pins[col]);
  250. writePinLow(col_pins[col]);
  251. }
  252. static void unselect_col(uint8_t col)
  253. {
  254. setPinInputHigh(col_pins[col]);
  255. }
  256. static void unselect_cols(void)
  257. {
  258. for(uint8_t x = 0; x < MATRIX_COLS; x++) {
  259. setPinInputHigh(col_pins[x]);
  260. }
  261. }
  262. #endif