mirror of
https://github.com/qmk/qmk_firmware
synced 2024-12-22 16:36:58 +00:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
c3c562cbb6
@ -78,8 +78,7 @@
|
||||
#define US_BEFORE_MOTION 100
|
||||
#define MSB1 0x80
|
||||
|
||||
extern const uint16_t adns_firmware_length;
|
||||
extern const uint8_t adns_firmware_data[];
|
||||
extern const uint8_t firmware_data[];
|
||||
|
||||
void adns_spi_start(void){
|
||||
spi_start(SPI_SS_PIN, false, SPI_MODE, SPI_DIVISOR);
|
||||
@ -145,8 +144,8 @@ void adns_init() {
|
||||
|
||||
// send all bytes of the firmware
|
||||
unsigned char c;
|
||||
for(int i = 0; i < adns_firmware_length; i++){
|
||||
c = (unsigned char)pgm_read_byte(adns_firmware_data + i);
|
||||
for(int i = 0; i < FIRMWARE_LENGTH; i++){
|
||||
c = (unsigned char)pgm_read_byte(firmware_data + i);
|
||||
spi_write(c);
|
||||
wait_us(15);
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -196,7 +196,7 @@ void pmw_upload_firmware(void) {
|
||||
wait_us(15);
|
||||
|
||||
unsigned char c;
|
||||
for (int i = 0; i < firmware_length; i++) {
|
||||
for (int i = 0; i < FIRMWARE_LENGTH; i++) {
|
||||
c = (unsigned char)pgm_read_byte(firmware_data + i);
|
||||
spi_write(c);
|
||||
wait_us(15);
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user