hailey
/
qmk_firmware
mirror of https://github.com/hailey/qmk_firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move more UART-based keyboards to use timeout correctly. (#17329)

Browse Source 
Co-authored-by: Tomasz Janeczko <tomasz.j@hey.com>
zvecr-patch-1
Tomasz Janeczko 3 years ago committed by GitHub
parent f6a7bf2a83
commit 6567b21688
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 111 additions and 31 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 9
      keyboards/centromere/matrix.c
  2. 12
      keyboards/dichotomy/matrix.c
  3. 9
      keyboards/glenpickle/chimera_ergo/matrix.c
  4. 9
      keyboards/glenpickle/chimera_ls/matrix.c
  5. 9
      keyboards/glenpickle/chimera_ortho/matrix.c
  6. 9
      keyboards/glenpickle/chimera_ortho_plus/matrix.c
  7. 10
      keyboards/keyhive/honeycomb/matrix.c
  8. 11
      keyboards/mitosis/matrix.c
  9. 2
      keyboards/redox_w/matrix.c
  10. 9
      keyboards/satt/comet46/matrix.c
  11. 9
      keyboards/sirius/uni660/rev1/matrix.c
  12. 9
      keyboards/sirius/uni660/rev2/matrix.c
  13. 9
      keyboards/telophase/matrix.c

9
keyboards/centromere/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(500000);
}
@ -39,11 +41,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//wait for the serial data, timeout if it's been too long
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

12
keyboards/dichotomy/matrix.c
Unescape View File

@ -48,6 +48,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define MAIN_ROWMASK 0xFFF0;
#define LOWER_ROWMASK 0x3FC0;
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
@ -96,8 +98,6 @@ void matrix_init(void) {
uint8_t matrix_scan(void)
{
//xprintf("\r\nTRYING TO SCAN");
uint32_t timeout = 0;
//the s character requests the RF slave to send the matrix
@ -113,12 +113,16 @@ uint8_t matrix_scan(void)
//harm to leave it in here
while(!uart_available()){
timeout++;
if (timeout > 10000){
xprintf("\r\nTime out in keyboard.");
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/glenpickle/chimera_ergo/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/glenpickle/chimera_ls/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/glenpickle/chimera_ortho/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/glenpickle/chimera_ortho_plus/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

10
keyboards/keyhive/honeycomb/matrix.c
Unescape View File

@ -46,6 +46,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define ROW_SHIFTER ((uint32_t)1)
#endif
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
//extern int8_t encoderValue;
@ -112,12 +114,16 @@ uint8_t matrix_scan(void)
// harm to leave it in here
while(!uart_available()){
timeout++;
if (timeout > 10000){
xprintf("\r\nTime out in keyboard.");
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
// Check for the end packet, it's our checksum.

11
keyboards/mitosis/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -34,18 +36,23 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//trust the external keystates entirely, erase the last data
uint8_t uart_data[11] = {0};
//there are 10 bytes corresponding to 10 columns, and an end byte
//there are 10 bytes corresponding to 10 columns, and then an end byte
for (uint8_t i = 0; i < 11; i++) {
//wait for the serial data, timeout if it's been too long
//this only happened in testing with a loose wire, but does no
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

2
keyboards/redox_w/matrix.c
Unescape View File

@ -34,7 +34,7 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//trust the external keystates entirely, erase the last data
uint8_t uart_data[11] = {0};
//there are 14 bytes corresponding to 14 columns, and an end byte
//there are 10 bytes corresponding to 10 columns, and then an end byte
for (uint8_t i = 0; i < 11; i++) {
//wait for the serial data, timeout if it's been too long
//this only happened in testing with a loose wire, but does no

9
keyboards/satt/comet46/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/sirius/uni660/rev1/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/sirius/uni660/rev2/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

9
keyboards/telophase/matrix.c
Unescape View File

@ -20,6 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "matrix.h"
#include "uart.h"
#define UART_MATRIX_RESPONSE_TIMEOUT 10000
void matrix_init_custom(void) {
uart_init(1000000);
}
@ -41,11 +43,16 @@ bool matrix_scan_custom(matrix_row_t current_matrix[]) {
//harm to leave it in here
while (!uart_available()) {
timeout++;
if (timeout > 10000) {
if (timeout > UART_MATRIX_RESPONSE_TIMEOUT) {
break;
}
}
if (timeout < UART_MATRIX_RESPONSE_TIMEOUT) {
uart_data[i] = uart_read();
} else {
uart_data[i] = 0x00;
}
}
//check for the end packet, the key state bytes use the LSBs, so 0xE0

Write Preview
Loading…
Cancel
Save