parent
							
								
									03ed819717
								
							
						
					
					
						commit
						d597af9e1e
					
				
					 12 changed files with 99 additions and 418 deletions
				
			
		| 
						 | 
				
			
			@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#include "util.h"
 | 
			
		||||
#include "matrix.h"
 | 
			
		||||
#include "split_util.h"
 | 
			
		||||
#include "pro_micro.h"
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#ifdef USE_MATRIX_I2C
 | 
			
		||||
#  include "i2c.h"
 | 
			
		||||
| 
						 | 
				
			
			@ -102,9 +102,10 @@ void matrix_init(void)
 | 
			
		|||
    unselect_rows();
 | 
			
		||||
    init_cols();
 | 
			
		||||
 | 
			
		||||
    TX_RX_LED_INIT;
 | 
			
		||||
    TXLED0;
 | 
			
		||||
    RXLED0;
 | 
			
		||||
    setPinOutput(B0);
 | 
			
		||||
    setPinOutput(D5);
 | 
			
		||||
    writePinHigh(D5);
 | 
			
		||||
    writePinHigh(B0);
 | 
			
		||||
 | 
			
		||||
    // initialize matrix state: all keys off
 | 
			
		||||
    for (uint8_t i=0; i < MATRIX_ROWS; i++) {
 | 
			
		||||
| 
						 | 
				
			
			@ -189,10 +190,10 @@ int serial_transaction(int master_changed) {
 | 
			
		|||
    int ret=serial_update_buffers();
 | 
			
		||||
#endif
 | 
			
		||||
    if (ret ) {
 | 
			
		||||
        if(ret==2) RXLED1;
 | 
			
		||||
        if(ret==2) writePinLow(B0);
 | 
			
		||||
        return 1;
 | 
			
		||||
    }
 | 
			
		||||
    RXLED0;
 | 
			
		||||
    writePinHigh(B0);
 | 
			
		||||
    memcpy(&matrix[slaveOffset],
 | 
			
		||||
        (void *)serial_slave_buffer, sizeof(serial_slave_buffer));
 | 
			
		||||
    return 0;
 | 
			
		||||
| 
						 | 
				
			
			@ -240,7 +241,7 @@ uint8_t matrix_master_scan(void) {
 | 
			
		|||
    if( serial_transaction(mchanged) ) {
 | 
			
		||||
#endif
 | 
			
		||||
        // turn on the indicator led when halves are disconnected
 | 
			
		||||
        TXLED1;
 | 
			
		||||
        writePinLow(D5);
 | 
			
		||||
 | 
			
		||||
        error_count++;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -253,7 +254,7 @@ uint8_t matrix_master_scan(void) {
 | 
			
		|||
        }
 | 
			
		||||
    } else {
 | 
			
		||||
        // turn off the indicator led on no error
 | 
			
		||||
        TXLED0;
 | 
			
		||||
        writePinHigh(D5);
 | 
			
		||||
        error_count = 0;
 | 
			
		||||
    }
 | 
			
		||||
    matrix_scan_quantum();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue