Refactoring ASCCI-Art image printing

3 files changed, 4 insertions, 71 deletions

diff --git a/src/sim/Makefile.am b/src/sim/Makefile.am
index 7d8d402..975de70 100644
--- a/src/sim/Makefile.am
+++ b/src/sim/Makefile.am
@@ -14,5 +14,6 @@ cnetz_sim_LDADD = \
 	$(top_builddir)/src/libdebug/libdebug.a \
 	$(top_builddir)/src/liboptions/liboptions.a \
 	$(top_builddir)/src/libserial/libserial.a \
+	$(top_builddir)/src/libaaimage/libaaimage.a \
 	-lm
 
diff --git a/src/sim/image.c b/src/sim/image.c
index 92060c4..372b630 100644
--- a/src/sim/image.c
+++ b/src/sim/image.c
@@ -1,10 +1,8 @@
 #ifndef ARDUINO
 
 #include <stdio.h>
-#include <string.h>
-#include "../libmobile/image.h"
 
-const char *image[] = {
+const char *aaimage[] = {
 	"@w",
 	"                         ()",
 	"                        //    _______________________________________________",
@@ -28,70 +26,4 @@ const char *image[] = {
 	NULL
 };
 
-void print_image(void)
-{
-	int i, j;
-
-	for (i = 0; image[i]; i++) {
-		for (j = 0; j < (int)strlen(image[i]); j++) {
-			if (image[i][j] == '@') {
-				j++;
-				switch(image[i][j]) {
-				case 'k': /* black */
-					printf("\033[0;30m");
-					break;
-				case 'r': /* red */
-					printf("\033[0;31m");
-					break;
-				case 'g': /* green */
-					printf("\033[0;32m");
-					break;
-				case 'y': /* yellow */
-					printf("\033[0;33m");
-					break;
-				case 'b': /* blue */
-					printf("\033[0;34m");
-					break;
-				case 'm': /* magenta */
-					printf("\033[0;35m");
-					break;
-				case 'c': /* cyan */
-					printf("\033[0;36m");
-					break;
-				case 'w': /* white */
-					printf("\033[0;37m");
-					break;
-				case 'K': /* bright black */
-					printf("\033[1;30m");
-					break;
-				case 'R': /* bright red */
-					printf("\033[1;31m");
-					break;
-				case 'G': /* bright green */
-					printf("\033[1;32m");
-					break;
-				case 'Y': /* bright yellow */
-					printf("\033[1;33m");
-					break;
-				case 'B': /* bright blue */
-					printf("\033[1;34m");
-					break;
-				case 'M': /* bright magenta */
-					printf("\033[1;35m");
-					break;
-				case 'C': /* bright cyan */
-					printf("\033[1;36m");
-					break;
-				case 'W': /* bright white */
-					printf("\033[1;37m");
-					break;
-				}
-			} else
-				printf("%c", image[i][j]);
-		}
-		printf("\n");
-	}
-	printf("\033[0;39m");
-}
-
 #endif /* ARDUINO */
diff --git a/src/sim/main.c b/src/sim/main.c
index dd3de1f..fc7a7ef 100644
--- a/src/sim/main.c
+++ b/src/sim/main.c
@@ -33,7 +33,7 @@
 #include "../libdebug/debug.h"
 #include "../liboptions/options.h"
 #include "../libserial/serial.h"
-#include "../libmobile/image.h"
+#include "../libaaimage/aaimage.h"
 #include "sim.h"
 #include "sniffer.h"
 #include "eeprom.h"
@@ -445,7 +445,7 @@ int main(int argc, char *argv[])
 		printf("SIM analyzer ready, please start the phone!\n");
 	else {
 		char temp[5][16];
-		print_image();
+		print_aaimage();
 		decode_ebdt(ebdt_data, temp[0], temp[1], temp[2], temp[3], temp[4]);
 		printf("FUTLN=%s, Sicherungscode=%s, Kartekennung=%s, Sonderheitenschluessel=%s, Wartungsschluessel=%s\n", temp[0], temp[1], temp[2], temp[3], temp[4]);
 		for (i = 0; i < 8; i++)