This commit is contained in:
sanni 2021-10-25 18:03:16 +02:00
parent 05deb817ac
commit 197bd3fad9
2 changed files with 9 additions and 11 deletions

View File

@ -4,7 +4,7 @@
This project represents a community-driven effort to provide This project represents a community-driven effort to provide
an easy to build and easy to modify cartridge dumper. an easy to build and easy to modify cartridge dumper.
Date: 24.10.2021 Date: 25.10.2021
Version: 7.0 Version: 7.0
SD lib: https://github.com/greiman/SdFat SD lib: https://github.com/greiman/SdFat
@ -491,7 +491,8 @@ void aboutScreen() {
display_Update(); display_Update();
while (1) { while (1) {
#if defined(enable_OLED) || defined(enable_LCD)
#if defined(enable_LCD) || defined(enable_OLED)
// get input button // get input button
int b = checkButton(); int b = checkButton();
@ -515,8 +516,7 @@ void aboutScreen() {
EEPROM_writeAnything(0, foldern); EEPROM_writeAnything(0, foldern);
resetArduino(); resetArduino();
} }
#endif #elif defined(enable_serial)
#ifdef enable_serial
wait_serial(); wait_serial();
resetArduino(); resetArduino();
#endif #endif
@ -851,13 +851,11 @@ void print_Error(const __FlashStringHelper *errorMessage, boolean forceReset) {
} }
void wait() { void wait() {
#ifdef enable_LCD #if defined(enable_LCD)
wait_encoder(); wait_encoder();
#endif #elif defined (enable_OLED)
#ifdef enable_OLED
wait_btn(); wait_btn();
#endif #elif defined (enable_serial)
#ifdef enable_serial
wait_serial(); wait_serial();
#endif #endif
} }

View File

@ -5,7 +5,7 @@
#define HW3 #define HW3
//#define HW2 //#define HW2
//#define HW1 //#define HW1
//#define SERIAL //#define SERIAL_MONITOR
#if defined(HW4) #if defined(HW4)
#define enable_LCD #define enable_LCD
@ -22,7 +22,7 @@
#define enable_OLED #define enable_OLED
#endif #endif
#if defined(SERIAL) #if defined(SERIAL_MONITOR)
#define enable_serial #define enable_serial
#endif #endif