rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix:not saving card data when it is smaller than one page(256B)

Browse Source
This commit is contained in:
Willok
2019-12-06 10:18:22 +01:00
parent 5dcf851734
commit 1339e6350d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Makefile
+2 -1
View File
@@ -133,7 +133,8 @@ AVRDUDE_WRITE_EEPROM_LATEST = -U eeprom:w:Latest/Chameleon-RevG.eep
# Default target
all:
touch uartcmd.c
touch Terminal/Commands.c
# Include LUFA build script makefiles
include $(LUFA_PATH)/Build/lufa_core.mk
include $(LUFA_PATH)/Build/lufa_sources.mk
Firmware/Chameleon-Mini/Memory.c
+3 -3
View File
@@ -204,7 +204,7 @@ INLINE void FlashWrite(const void *Buffer, uint32_t Address, uint16_t ByteCount)
/* We assume that FlashWrite is always called for write actions that are
* aligned to APP_SECTION_PAGE_SIZE and a multiple of APP_SECTION_PAGE_SIZE.
* Thus only full pages are written into the flash. */
uint16_t PageCount = ByteCount / APP_SECTION_PAGE_SIZE;
uint16_t PageCount = (ByteCount + APP_SECTION_PAGE_SIZE - 1) / APP_SECTION_PAGE_SIZE;
uint32_t PhysicalAddress = Address + FLASH_DATA_ADDR;
if ((PhysicalAddress >= FLASH_DATA_START) && (PhysicalAddress <= FLASH_DATA_END)) {
@@ -240,7 +240,7 @@ INLINE void FlashWrite(const void *Buffer, uint32_t Address, uint16_t ByteCount)
}
INLINE void FlashErase(uint32_t Address, uint16_t ByteCount) {
uint16_t PageCount = ByteCount / APP_SECTION_PAGE_SIZE;
uint16_t PageCount = (ByteCount + APP_SECTION_PAGE_SIZE - 1) / APP_SECTION_PAGE_SIZE;
uint32_t PhysicalAddress = Address + FLASH_DATA_ADDR;
if ((PhysicalAddress >= FLASH_DATA_START) && (PhysicalAddress <= FLASH_DATA_END)) {
@@ -308,7 +308,7 @@ INLINE void FRAMToFlash(uint32_t Address, uint16_t ByteCount) {
/* We assume that FlashWrite is always called for write actions that are
* aligned to APP_SECTION_PAGE_SIZE and a multiple of APP_SECTION_PAGE_SIZE.
* Thus only full pages are written into the flash. */
uint16_t PageCount = ByteCount / APP_SECTION_PAGE_SIZE;
uint16_t PageCount = (ByteCount + APP_SECTION_PAGE_SIZE - 1) / APP_SECTION_PAGE_SIZE;
uint32_t PhysicalAddress = Address + FLASH_DATA_ADDR;
if ((PhysicalAddress >= FLASH_DATA_START) && (PhysicalAddress <= FLASH_DATA_END)) {
Firmware/Chameleon-Mini/Terminal/Commands.c
+1
View File
@@ -670,6 +670,7 @@ CommandStatusIdType CommandSetLedMode(char *OutMessage, const char *InParam) {
break;
case 'R': // State reset
bKeepAlive = 1;
bUSBTerminal = 0;
break;
case 'T': // Test
SendTestCmd(InParam[1]);