Merge remote-tracking branch 'origin/master' into develop
commit
84944df6a6
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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,18 +113,22 @@ 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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
//will only show up here if the correct bytes were recieved
|
||||
uint8_t checksum = 0x00;
|
||||
for (uint8_t z=0; z<10; z++){
|
||||
for (uint8_t z = 0; z < 10; z++){
|
||||
checksum = checksum^uart_data[z];
|
||||
}
|
||||
checksum = checksum ^ (uart_data[10] & 0xF0);
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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.
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
uart_data[i] = uart_read();
|
||||
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue