reduce object size helix/rev2/matrix.c

pull/3608/head
mtei 7 years ago
parent bae4bfe9d7
commit 8ec5499b5a

@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include <avr/io.h> #include <avr/io.h>
#include <avr/wdt.h> #include <avr/wdt.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
@ -188,9 +189,8 @@ int serial_transaction(void) {
return 1; return 1;
} }
RXLED0; RXLED0;
for (int i = 0; i < ROWS_PER_HAND; ++i) { memcpy(&matrix[slaveOffset],
matrix[slaveOffset+i] = serial_slave_buffer[i]; (void *)serial_slave_buffer, sizeof(serial_slave_buffer));
}
return 0; return 0;
} }
#endif #endif
@ -201,19 +201,9 @@ uint8_t matrix_scan(void)
matrix_master_scan(); matrix_master_scan();
}else{ }else{
matrix_slave_scan(); matrix_slave_scan();
int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
// if(serial_slave_DATA_CORRUPT()){ memcpy(&matrix[offset],
// TXLED0; (void *)serial_master_buffer, sizeof(serial_master_buffer));
int offset = (isLeftHand) ? ROWS_PER_HAND : 0;
for (int i = 0; i < ROWS_PER_HAND; ++i) {
matrix[offset+i] = serial_master_buffer[i];
}
// }else{
// TXLED1;
// }
matrix_scan_quantum(); matrix_scan_quantum();
} }
return 1; return 1;
@ -233,9 +223,8 @@ uint8_t matrix_master_scan(void) {
// i2c_slave_buffer[i] = matrix[offset+i]; // i2c_slave_buffer[i] = matrix[offset+i];
// } // }
#else // USE_SERIAL #else // USE_SERIAL
for (int i = 0; i < ROWS_PER_HAND; ++i) { memcpy((void *)serial_master_buffer,
serial_master_buffer[i] = matrix[offset+i]; &matrix[offset], sizeof(serial_master_buffer));
}
#endif #endif
#endif #endif

Loading…
Cancel
Save