Mirrors/cartreader
2
0
Fork 0
mirror of https://github.com/sanni/cartreader.git synced 2024-11-15 01:15:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix compilation errors when the FLASH core is enabled without FLASH16

Browse Source 
Commit References:
* a32c6b3bff - Added ATTENTION_3_3V flash string but placed the definition inside a FLASH16 ifdef.
* 4d000418a8 - Added use of writeWord_Flash to FLASH8 without removing the FLASH16 ifdef around it.
This commit is contained in:
Ancyker 2024-06-10 11:46:26 -04:00
parent 01f424cad6
commit 8535552b9a
No known key found for this signature in database
GPG Key ID: 841A6B28CD25A744
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Cart_Reader/FLASH.ino
View File

@ -31,6 +31,9 @@ static const char flashMenuItemPrint[] PROGMEM = "Print";
// 8bit Flash menu items // 8bit Flash menu items
static const char* const menuOptionsFLASH8[] PROGMEM = { flashMenuItemBlankcheck, flashMenuItemErase, flashMenuItemRead, flashMenuItemWrite, flashMenuItemID, flashMenuItemPrint, FSTRING_RESET }; static const char* const menuOptionsFLASH8[] PROGMEM = { flashMenuItemBlankcheck, flashMenuItemErase, flashMenuItemRead, flashMenuItemWrite, flashMenuItemID, flashMenuItemPrint, FSTRING_RESET };
// Misc flash strings
const char PROGMEM ATTENTION_3_3V[] = "ATTENTION 3.3V";
#ifdef ENABLE_FLASH16 #ifdef ENABLE_FLASH16
// Flash start menu // Flash start menu
static const char flashMenuItem1[] PROGMEM = "8bit Flash adapter"; static const char flashMenuItem1[] PROGMEM = "8bit Flash adapter";
@ -45,8 +48,6 @@ static const char* const menuOptionsFLASH16[] PROGMEM = { flashMenuItemBlankchec
static const char epromMenuItem4[] PROGMEM = "Verify"; static const char epromMenuItem4[] PROGMEM = "Verify";
static const char* const menuOptionsEprom[] PROGMEM = { flashMenuItemBlankcheck, flashMenuItemRead, flashMenuItemWrite, epromMenuItem4, flashMenuItemPrint, FSTRING_RESET }; static const char* const menuOptionsEprom[] PROGMEM = { flashMenuItemBlankcheck, flashMenuItemRead, flashMenuItemWrite, epromMenuItem4, flashMenuItemPrint, FSTRING_RESET };
constexpr char PROGMEM ATTENTION_3_3V[] = "ATTENTION 3.3V";
void flashMenu() { void flashMenu() {
// create menu with title and 3 options to choose from // create menu with title and 3 options to choose from
unsigned char flashSlot; unsigned char flashSlot;
@ -975,7 +976,6 @@ byte readByte_Flash(unsigned long myAddress) {
return tempByte; return tempByte;
} }
#ifdef ENABLE_FLASH16
void writeWord_Flash(unsigned long myAddress, word myData) { void writeWord_Flash(unsigned long myAddress, word myData) {
PORTF = myAddress & 0xFF; PORTF = myAddress & 0xFF;
PORTK = (myAddress >> 8) & 0xFF; PORTK = (myAddress >> 8) & 0xFF;
@ -1044,7 +1044,6 @@ word readWord_Flash(unsigned long myAddress) {
return tempWord; return tempWord;
} }
#endif
/****************************************** /******************************************
write helper functions write helper functions