From: dopefishh <mart@martlubbers.net>
Date: Fri, 9 Oct 2015 12:35:31 +0000 (+0200)
Subject: YAYYYYYYYYY
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=51c933f7fdf6d0c8801b6ff277b291bbd3c104b2;p=des2015.git

YAYYYYYYYYY
---

diff --git a/mart/ex11/ex11.c b/mart/ex11/ex11.c
index 503029f..fade86c 100644
--- a/mart/ex11/ex11.c
+++ b/mart/ex11/ex11.c
@@ -13,6 +13,7 @@
 #define LPT1IRQ 7
 #define TICKS 5
 #define BANNERWIDTH 10000
+#define MSGMAX 1000
 #define MAXX 20
 
 RT_TASK intrtask, drawtask;
@@ -20,7 +21,8 @@ RTIME ticks[TICKS+1];
 RTIME tocks[TICKS+1];
 
 unsigned char data[BANNERWIDTH];
-char* message;
+char message[MSGMAX];
+char inputmsg[MSGMAX];
 unsigned int pointer = 0;
 unsigned int msglen;
 
@@ -61,7 +63,7 @@ void taski(void *arg)
 	//Register as interrupt handler
 	RT_INTR intr;
 	rt_intr_create(&intr, NULL, LPT1IRQ, 0);
-	rt_printf("Interrupt created\n");
+	//rt_printf("Interrupt created\n");
 
 	//Initialize and declare the timer variables
 	RTIME tick = rt_timer_read();
@@ -78,7 +80,7 @@ void taski(void *arg)
 			rt_task_create(&drawtask, NULL, 0, 50, 0);
 			period = ticks[TICKS]+tocks[TICKS];
 			rt_task_start(&drawtask, &taskd, &period);
-			rt_printf("tocks is the short stretch\n");
+			//rt_printf("tocks is the short stretch\n");
 		}
 		rt_intr_wait(&intr, TM_INFINITE);
 
@@ -92,7 +94,7 @@ void taski(void *arg)
 			rt_task_create(&drawtask, NULL, 0, 50, 0);
 			period = ticks[TICKS]+tocks[TICKS];
 			rt_task_start(&drawtask, &taskd, &period);
-			rt_printf("ticks is the short stretch\n");
+			//rt_printf("ticks is the short stretch\n");
 		}
 		rt_intr_wait(&intr, TM_INFINITE);
 		//Print average
@@ -101,26 +103,12 @@ void taski(void *arg)
 	}
 }
 
-int main(int argc, char* argv[])
+void make_message(char *msg)
 {
-  if(argc != 2){
-    printf("Usage: %s \"Message\"\n", argv[0]);
-    return 1;
-  }
-  message = argv[1];
-	rt_print_auto_init(1);
-	mlockall(MCL_CURRENT | MCL_FUTURE);
-
-  unsigned int i;
-  for(i=0; i<BANNERWIDTH; i++){
-    data[i] = 0;
-  }
-
-  i=20;
+  unsigned int i=20;
   unsigned char s = 0; 
-  while(i<BANNERWIDTH && s < strlen(message)){
-    char c = message[s];
-    printf("processing: '%c'\n", c);
+  while(i<BANNERWIDTH && s < strlen(msg)){
+    char c = msg[s];
     switch(c){
       case 'A':
       case 'a':
@@ -200,6 +188,26 @@ int main(int argc, char* argv[])
       case 'Z':
       case 'z':
         data[i++] = 0x19; data[i++] = 0x15; data[i++] = 0x13; break;
+      case '0':
+        data[i++] = 0xe; data[i++] = 0x11; data[i++] = 0xe; break;
+      case '1':
+        data[i++] = 0x12; data[i++] = 0x1f; data[i++] = 0x10; break;
+      case '2':
+        data[i++] = 0x12; data[i++] = 0x19; data[i++] = 0x16; break;
+      case '3':
+        data[i++] = 0x15; data[i++] = 0xa; break;
+      case '4':
+        data[i++] = 0x7; data[i++] = 0x4; data[i++] = 0x1f; break;
+      case '5':
+        data[i++] = 0x17; data[i++] = 0x15; data[i++] = 0x9; break;
+      case '6':
+        data[i++] = 0xe; data[i++] = 0x15; data[i++] = 0x9; break;
+      case '7':
+        data[i++] = 0x1; data[i++] = 0x1f; break;
+      case '8':
+        data[i++] = 0x1f; data[i++] = 0x15; data[i++] = 0x1f; break;
+      case '9':
+        data[i++] = 0x12; data[i++] = 0x15; data[i++] = 0x1e; break;
       case '.':
         data[i++] = 0x10; break;
       case ',':
@@ -207,6 +215,14 @@ int main(int argc, char* argv[])
       case '\'':
       case '"':
         data[i++] = 0x1; break;
+      case ':':
+        data[i++] = 0xa; break;
+      case '(':
+        data[i++] = 0xe; data[i++] = 0x11; break;
+      case ')':
+        data[i++] = 0x11; data[i++] = 0xe; break;
+      case '-':
+        data[i++] = 0x4; data[i++] = 0x4; break;
       case ' ':
         i++;
         break;
@@ -219,14 +235,36 @@ int main(int argc, char* argv[])
     s++;
   }
   msglen = i;
+  pointer = 0;
+}
+
+int main(int argc, char* argv[])
+{
+	rt_print_auto_init(1);
+	mlockall(MCL_CURRENT | MCL_FUTURE);
 
+  unsigned int i;
+  for(i=0; i<BANNERWIDTH; i++){
+    data[i] = 0;
+  }
+  
 	// Get permission to write to parallel port
 	ioperm(0x37A, 1, 1);
 	ioperm(0x378, 1, 1);
 	outb(inb(0x37A) | 0x10, 0x37A);
 
+  make_message("abcdefghijklmnopqrstuvwxyz1234567890,.\"()");
+
 	rt_task_create(&intrtask, NULL, 0, 50, 0);
 	rt_task_start(&intrtask, &taski, 0);
 
-	pause();
+  printf("CRTL+C to exit\n");
+  printf("legal characters: abcdefghijklmnopqrstuvwxyz1234567890,.\"()\n");
+  while(1){
+    printf("Type your message(max %d chars): ", MSGMAX);
+    scanf("%[^\n]", inputmsg);
+    getchar();
+    make_message(inputmsg);
+    sleep(0.1);
+  }
 }