Rearranged source and demos, instructions are now in the manual

.gitignore

@@ -35,6 +35,7 @@
 *.i*86
 *.x86_64
 *.hex
+tek4010
 
 # Debug files
 *.dSYM/

ICEMD_demo.sh → demos/ICEMD_demo.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 # rricharz 2019
 
-wait5s() {
+wait1s() {
 # let tek4010 wait 5 seconds (not this script, which just shuffles stuff into the buffer!)
-for i in {1..100}
+for i in {1..15}
   do
     printf '\007'
   done
@@ -18,7 +18,7 @@ do
     printf '\033\014'
     echo tek4010 is displaying "$filename"
     cat "$filename"
-    wait5s
+    wait1s
   done
 
 done

demo.sh → demos/demo.sh

@@ -1,36 +1,32 @@
 #!/bin/bash
 # rricharz 2019
 
-wait5s() {
-# let tek4010 wait 5 seconds (not this script, which just shuffles stuff into the buffer!)
-for i in {1..100}
+wait1s() {
+# let tek4010 wait 2 seconds (not this script, which just shuffles stuff into the buffer!)
+for i in {1..15}
   do
     printf '\007'
   done
 }
 
-head -n 26 tek4010.c
-
-wait5s
 # erase screen
     printf '\033\014'
 
 cat pltfiles/00README.txt
 
-wait5s
-wait5s
+wait1s
 
 cat dodekagon.plt
 
-wait5s
+wait1s
 
 for filename in pltfiles/*.plt
 do
     # erase screen
     printf '\033\014'
     echo tek4010 is displaying "$filename"
     cat "$filename"
-    wait5s
+    wait1s
 done
 
 

fdemo.sh → demos/fdemo.sh

@@ -1,25 +1,25 @@
 #!/bin/bash
 # rricharz 2019
 
-wait2s() {
+wait1s() {
 # let tek4010 wait 5 seconds (not this script, which just shuffles stuff into the buffer!)
-for i in {1..30}
+for i in {1..15}
   do
     printf '\007'
   done
 }
 
 cat dodekagon.plt
 
-wait2s
+wait1s
 
 for filename in pltfiles/*.plt
 do
     # erase screen
     printf '\033\014'
     printf '\0338'
     cat "$filename"
-    wait2s
+    wait1s
 done
 
 for filename in pltfiles/More_pltfiles/*.plt
@@ -28,7 +28,7 @@ do
     printf '\033\014'
     printf '\0338'
     cat "$filename"
-    wait2s
+    wait1s
 done
 
 for filename in pltfiles/ICEMD_pltfiles/*.plt
@@ -37,7 +37,7 @@ do
     printf '\033\014'
     printf '\033:'
     cat "$filename"
-    wait2s
+    wait1s
 done
 
 for filename in pltfiles//PointPlot/*.plt
@@ -46,7 +46,7 @@ do
     printf '\033\014'
     printf '\0338'
     cat "$filename"
-    wait2s
+    wait1s
 done
 
 

gdemo.sh → demos/gdemo.sh

@@ -2,9 +2,9 @@
 # gdemo, run with tek4010 to display grayscale images
 # rricharz 2019
 
-wait2s() {
+wait1s() {
 # let tek4010 wait 2 seconds (not this script, which just shuffles stuff into the buffer!)
-for i in {1..30}
+for i in {1..15}
   do
     printf '\007'
   done
@@ -15,7 +15,7 @@ do
     # erase screen
     printf '\033\014'
     cat "$filename"
-    wait2s
+    wait1s
 done
 
 

idemo.sh → demos/idemo.sh

@@ -2,7 +2,7 @@
 # idemo, run with tek4010 to display ICEMD vector data
 # rricharz 2019
 
-wait2s() {
+wait1s() {
 # let tek4010 wait 2 seconds (not this script, which just shuffles stuff into the buffer!)
 for i in {1..30}
   do
@@ -20,7 +20,7 @@ do
     printf '<033:'
     echo tek4010 is displaying "$filename"
     cat "$filename"
-    wait2s
+    wait1s
   done
 
 done

demos/readme

@@ -0,0 +1,3 @@
+Usage:
+Go to your Tek4010 directory
+Type tek4010 demos/demo.sh

install

@@ -7,4 +7,5 @@
 cp tek4010 ~/bin
 chmod +x ~/bin/tek4010
 
-echo "tek4010 installed"
+echo "tek4010 installed."
+echo "Reboot if this is the first time tek4010 is installed"

makefile

@@ -4,12 +4,11 @@ CFLAGS = -std=c99 `pkg-config --cflags gtk+-3.0`
 
 all: tek4010
 
-tek4010: main.c main.h tube.c tube.h tek4010.c ards.c
-	$(CC) -o tek4010 main.c tube.c tek4010.c ards.c $(LIBS) $(CFLAGS)
+tek4010: src/main.c src/main.h src/tube.c src/tube.h src/tek4010.c src/ards.c
+	$(CC) -o tek4010 src/main.c src/tube.c src/tek4010.c src/ards.c $(LIBS) $(CFLAGS)
 
 install: tek4010
 	./install
 
 .PHONY : clean
-clean :
 	-rm -f tek4010

tube.c → src/tube.c

@@ -28,11 +28,12 @@
 #define DEBUGMAX 0              // exit after DEBUGMAX chars, 0 means no exit
 
 #define WRITE_TROUGH_INTENSITY  0.5             // green only
-#define NORMAL_INTENSITY        0.8
-#define CURSOR_INTENSITY        0.8
+#define NORMAL_INTENSITY        0.7
+#define CURSOR_INTENSITY        0.7
 #define BRIGHT_SPOT_COLOR       1.0
 #define BRIGHT_SPOT_COLOR_HALF  0.6
 #define BLACK_COLOR             0.08            // effect of flood gun
+#define FADE                    0.3				// lower value means slower fading
 
 #define _GNU_SOURCE
 
@@ -586,7 +587,7 @@ void tube_clearPersistent(cairo_t *cr, cairo_t *cr2)
 void tube_clearSecond(cairo_t *cr2)
 // clear second surface
 { 
-        cairo_set_source_rgba(cr2, 0, 0, 0, 0.2);
+        cairo_set_source_rgba(cr2, 0, 0, 0, FADE);
         cairo_set_operator(cr2, CAIRO_OPERATOR_MULTIPLY);
         cairo_paint(cr2);
         cairo_set_operator(cr2, CAIRO_OPERATOR_OVER);
@@ -877,7 +878,7 @@ void tube_drawVector(cairo_t *cr, cairo_t *cr2)
 
 
                 // draw the bright spot, high intensity
-                cairo_set_line_width (cr, pensize + defocussed);
+                cairo_set_line_width (cr, (pensize+1) + defocussed);
                 cairo_set_source_rgb(cr2, 0, BRIGHT_SPOT_COLOR, 0);                       
                 cairo_move_to(cr2, tube_x0, windowHeight - tube_y0);
                 cairo_line_to(cr2, tube_x2, windowHeight - tube_y2);