From ed9a5e6d6ff82c971ae2fc5ae0d0e51ab8c3db51 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Thu, 23 May 2019 18:31:56 -0400
Subject: [PATCH] chg: textual

---
 armsrc/appmain.c     |  2 +-
 armsrc/flashmem.c    | 16 ++++++++--------
 armsrc/lfsampling.c  |  2 +-
 client/cmdflashmem.c |  1 -
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 75bf8e86e..7a86c5b49 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -397,7 +397,7 @@ void printConnSpeed(void) {
 
     Dbprintf("  Time elapsed............%dms", delta_time);
     Dbprintf("  Bytes transferred.......%d", bytes_transferred);
-    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") " bytes/s", 1000 * bytes_transferred / delta_time);
+    Dbprintf("  Transfer Speed PM3 -> Client = " _YELLOW_("%d") "bytes/s", 1000 * bytes_transferred / delta_time);
 }
 
 /**
diff --git a/armsrc/flashmem.c b/armsrc/flashmem.c
index fcfc9bcb2..5bdbfff90 100644
--- a/armsrc/flashmem.c
+++ b/armsrc/flashmem.c
@@ -518,7 +518,7 @@ void Flash_EraseChip(void) {
 
 void Flashmem_print_status(void) {
     DbpString(_BLUE_("Flash memory"));
-    Dbprintf("  Baudrate................%dMHz", FLASHMEM_SPIBAUDRATE / 1000000);
+    Dbprintf("  Baudrate................" _GREEN_("%d MHz"), FLASHMEM_SPIBAUDRATE / 1000000);
 
     if (!FlashInit()) {
         DbpString("  Init...................." _RED_("FAILED"));
@@ -529,13 +529,13 @@ void Flashmem_print_status(void) {
     uint8_t dev_id = Flash_ReadID();
     switch (dev_id) {
         case 0x11 :
-            DbpString("  Memory size............." _YELLOW_("2 mbits / 256kb"));
+            DbpString("  Memory size............." _YELLOW_("2 mbits / 256 kb"));
             break;
         case 0x10 :
-            DbpString("  Memory size..... ......." _YELLOW_("1 mbits / 128kb"));
+            DbpString("  Memory size..... ......." _YELLOW_("1 mbits / 128 kb"));
             break;
         case 0x05 :
-            DbpString("  Memory size............." _YELLOW_("512 kbits / 64kb"));
+            DbpString("  Memory size............." _YELLOW_("512 kbits / 64 kb"));
             break;
         default :
             DbpString("  Device ID..............." _YELLOW_(" -->  Unknown  <--"));
@@ -544,7 +544,7 @@ void Flashmem_print_status(void) {
 
     uint8_t uid[8] = {0, 0, 0, 0, 0, 0, 0, 0};
     Flash_UniqueID(uid);
-    Dbprintf("  Unique ID...............0x%02x%02x%02x%02x%02x%02x%02x%02x",
+    Dbprintf("  Unique ID...............0x%02X%02X%02X%02X%02X%02X%02X%02X",
              uid[7], uid[6], uid[5], uid[4],
              uid[3], uid[2], uid[1], uid[0]
             );
@@ -565,21 +565,21 @@ void Flashmem_print_info(void) {
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  Mifare................%d keys", num);
+            Dbprintf("  Mifare................"_YELLOW_("%d")"keys", num);
     }
 
     isok = Flash_ReadDataCont(DEFAULT_T55XX_KEYS_OFFSET, keysum, 2);
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  T55x7.................%d keys", num);
+            Dbprintf("  T55x7................."_YELLOW_("%d")"keys", num);
     }
 
     isok = Flash_ReadDataCont(DEFAULT_ICLASS_KEYS_OFFSET, keysum, 2);
     if (isok == 2) {
         num = ((keysum[1] << 8) | keysum[0]);
         if (num != 0xFFFF && num != 0x0)
-            Dbprintf("  iClass................%d keys", num);
+            Dbprintf("  iClass................"_YELLOW_("%d")"keys", num);
     }
 
     FlashStop();
diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index b8a76c016..53215581e 100644
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -20,7 +20,7 @@ sample_config config = { 1, 8, 1, 95, 0 } ;
 
 void printConfig() {
     DbpString(_BLUE_("LF Sampling config"));
-    Dbprintf("  [q] divisor.............%d (%d kHz)", config.divisor, 12000 / (config.divisor + 1));
+    Dbprintf("  [q] divisor.............%d ( "_GREEN_("%d kHz")")", config.divisor, 12000 / (config.divisor + 1));
     Dbprintf("  [b] bps.................%d", config.bits_per_sample);
     Dbprintf("  [d] decimation..........%d", config.decimation);
     Dbprintf("  [a] averaging...........%s", (config.averaging) ? "Yes" : "No");
diff --git a/client/cmdflashmem.c b/client/cmdflashmem.c
index a259a3e40..f9477cdd8 100644
--- a/client/cmdflashmem.c
+++ b/client/cmdflashmem.c
@@ -14,7 +14,6 @@
 #include "mbedtls/base64.h"
 
 #define MCK 48000000
-//#define FLASH_BAUD 24000000
 #define FLASH_MINFAST 24000000 //33000000
 #define FLASH_BAUD MCK/2
 #define FLASH_FASTBAUD MCK