1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-16 04:45:24 +03:00

Merge pull request #832 from martinbudden/bf_4way_lineendings

Removed spurious CRLF line ending that was causing problems with git
This commit is contained in:
Martin Budden 2016-07-27 09:05:57 +01:00 committed by GitHub
commit 174aff397c

View file

@ -330,7 +330,7 @@ uint8_t BL_WriteFlash(ioMem_t *pMem)
return BL_WriteA(CMD_PROG_FLASH, pMem, (40 / START_BIT_TIMEOUT_MS));
}
#endif
#endif
#if defined(USE_SERIAL_4WAY_BLHELI_BOOTLOADER) && defined(USE_FAKE_ESC)
#define FAKE_PAGE_SIZE 512
@ -877,7 +877,7 @@ uint8_t BL_PageErase(ioMem_t *pMem)
uint16_t address = pMem->D_FLASH_ADDR_H << 8 | pMem->D_FLASH_ADDR_L;
if (address + FAKE_PAGE_SIZE > FAKE_FLASH_SIZE)
return false;
memset(&fakeFlash[address], 0xFF, FAKE_PAGE_SIZE);
memset(&fakeFlash[address], 0xFF, FAKE_PAGE_SIZE);
return true;
}