removed useless entry in the menu

LesMargoulins · Mar 11, 2016 · 9698868 · 9698868
1 parent d4097c9
commit 9698868
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/Margoulineur2000.ino b/Margoulineur2000.ino
@@ -29,7 +29,7 @@ void setup(void)
 
   uint32_t versiondata = nfc.getFirmwareVersion();
 
-  if (! versiondata)
+  if (!versiondata)
   {
     Serial.print(F("Didn't find PN53x board"));
     lcd.setCursor(0,1);
@@ -79,17 +79,13 @@ void loop(void)
         nfc_read_write(4, true);
         break;
       case 4:
-        lcd.clear();
+            lcd.clear();
             nfc_read_write(5, false);
-        break;
+            break;
       case 5:
-        lcd.clear();
+            lcd.clear();
             nfc_read_write(5, true);
             break;
-      case 6:
-        lcd.clear();
-        nfc_read_write(13, true);  
-        break;     
     }
    }
 }

diff --git a/margoulinade.h b/margoulinade.h
@@ -8,10 +8,10 @@
 # include <Encoder.h>
 
 
-# define OPTIMIZATION_MODE 0 // Sets the optimization, 1 to only go through the desirable blocks, 0 for all blocks
-# define POURRISSAGE 1 // Sets the writing of silly messages in some blocks of the card
+# define OPTIMIZATION_MODE 1 // Sets the optimization, 1 to only go through the desirable blocks, 0 for all blocks
+# define POURRISSAGE 0 // Sets the writing of silly messages in some blocks of the card. It will not work with optimization on
 
-# define MENUELEMENTS 8 // Number of elements in the menu
+# define MENUELEMENTS 7 // Number of elements in the menu
 
 # define ENCODERSTEPS 4 //Steps for the rotary encoder, menu selection
 # define VALMIN 0 // Min value of the new balance in the write sequence
@@ -45,8 +45,7 @@ String menuStrings[][2] =
 				{{"4. write D4"},{"write new balance of the dormitory 4"}},
 				{{"5. read new D4"},{"read balance new D4 cards"}},
 				{{"6. write new D4"},{"write balance new D4 cards"}},
-				{{"7.Format Blank to D3"},{"Convert a blank cart to a dormitory 3 card"}},
-				{{"8. About"},{"by guigur & oborotev"}},
+				{{"7. About"},{"by guigur & oborotev"}},
 		};
 
 typedef struct	s_nfc_handler

diff --git a/washmach_RW.ino b/washmach_RW.ino
@@ -192,11 +192,11 @@ void        sectorsParsing(t_nfc_handler *nfc_handler, bool mode, byte dormitory
             if (dormitory == 3)
                 dormitory3Authentication(nfc_handler);
             else if (dormitory == 4)
-                nfc_handler->success = nfc.mifareclassic_AuthenticateBlock (nfc_handler->uid, nfc_handler->uidLength, nfc_handler->currentblock, nfc_handler->keyNumber, nfc_handler->KeyA_D4);
+                nfc_handler->success = nfc.mifareclassic_AuthenticateBlock(nfc_handler->uid, nfc_handler->uidLength, nfc_handler->currentblock, nfc_handler->keyNumber, nfc_handler->KeyA_D4);
             else if (dormitory == 5)
                 dormitory4newCardsAuthentication(nfc_handler);
             else if (dormitory == 13)
-                nfc_handler->success = nfc.mifareclassic_AuthenticateBlock (nfc_handler->uid, nfc_handler->uidLength, nfc_handler->currentblock, nfc_handler->keyNumber, nfc_handler->KeyA_Blank);
+                nfc_handler->success = nfc.mifareclassic_AuthenticateBlock(nfc_handler->uid, nfc_handler->uidLength, nfc_handler->currentblock, nfc_handler->keyNumber, nfc_handler->KeyA_Blank);
 
             Serial.println("");
             if (nfc_handler->success)
@@ -251,7 +251,6 @@ void        sectorsParsing(t_nfc_handler *nfc_handler, bool mode, byte dormitory
                 // Oops ... something happened
                 Serial.print(F("Block "));Serial.print(nfc_handler->currentblock, DEC);
                 Serial.println(F(" unable to read this block"));
-
             }
         }
     }