From 197bd3fad93d9f85da4eae07840dd4b91d161a87 Mon Sep 17 00:00:00 2001
From: sanni <sanni@users.noreply.github.com>
Date: Mon, 25 Oct 2021 18:03:16 +0200
Subject: [PATCH] bugfix

---
 Cart_Reader/Cart_Reader.ino | 16 +++++++---------
 Cart_Reader/options.h       |  4 ++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Cart_Reader/Cart_Reader.ino b/Cart_Reader/Cart_Reader.ino
index 9c4d587..58fef1e 100644
--- a/Cart_Reader/Cart_Reader.ino
+++ b/Cart_Reader/Cart_Reader.ino
@@ -4,7 +4,7 @@
    This project represents a community-driven effort to provide
    an easy to build and easy to modify cartridge dumper.
 
-   Date:             24.10.2021
+   Date:             25.10.2021
    Version:          7.0
 
    SD lib: https://github.com/greiman/SdFat
@@ -491,7 +491,8 @@ void aboutScreen() {
   display_Update();
 
   while (1) {
-#if defined(enable_OLED) || defined(enable_LCD)
+
+#if defined(enable_LCD) || defined(enable_OLED)
     // get input button
     int b = checkButton();
 
@@ -515,8 +516,7 @@ void aboutScreen() {
       EEPROM_writeAnything(0, foldern);
       resetArduino();
     }
-#endif
-#ifdef enable_serial
+#elif defined(enable_serial)
     wait_serial();
     resetArduino();
 #endif
@@ -851,13 +851,11 @@ void print_Error(const __FlashStringHelper *errorMessage, boolean forceReset) {
 }
 
 void wait() {
-#ifdef enable_LCD
+#if defined(enable_LCD)
   wait_encoder();
-#endif
-#ifdef enable_OLED
+#elif defined (enable_OLED)
   wait_btn();
-#endif
-#ifdef enable_serial
+#elif defined (enable_serial)
   wait_serial();
 #endif
 }
diff --git a/Cart_Reader/options.h b/Cart_Reader/options.h
index 140752a..ab52e60 100644
--- a/Cart_Reader/options.h
+++ b/Cart_Reader/options.h
@@ -5,7 +5,7 @@
 #define HW3
 //#define HW2
 //#define HW1
-//#define SERIAL
+//#define SERIAL_MONITOR
 
 #if defined(HW4)
 #define enable_LCD
@@ -22,7 +22,7 @@
 #define enable_OLED
 #endif
 
-#if defined(SERIAL)
+#if defined(SERIAL_MONITOR)
 #define enable_serial
 #endif