15 files changed, 121 insertions, 71 deletions
diff --git a/comp/lucas-standen-NEA/code/execution/exec b/comp/lucas-standen-NEA/code/execution/exec
deleted file mode 100755
index d69d951..0000000
--- a/comp/lucas-standen-NEA/code/execution/exec
+++ /dev/null
diff --git a/comp/lucas-standen-NEA/code2/examples/helloworld/main b/comp/lucas-standen-NEA/code2/examples/helloworld/main
deleted file mode 100755
index 653d84c..0000000
--- a/comp/lucas-standen-NEA/code2/examples/helloworld/main
+++ /dev/null
diff --git a/comp/lucas-standen-NEA/code2/examples/helloworldadv/main b/comp/lucas-standen-NEA/code2/examples/helloworldadv/main
deleted file mode 100755
index 593fe40..0000000
--- a/comp/lucas-standen-NEA/code2/examples/helloworldadv/main
+++ /dev/null
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example/dvd.png b/comp/lucas-standen-NEA/code2/examples/raylib_example/dvd.png
deleted file mode 100644
index 8e219f7..0000000
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example/dvd.png
+++ /dev/null
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example/main b/comp/lucas-standen-NEA/code2/examples/raylib_example/main
deleted file mode 100755
index b124ebf..0000000
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example/main
+++ /dev/null
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example/main.zpy b/comp/lucas-standen-NEA/code2/examples/raylib_example/main.zpy
deleted file mode 100644
index cd6a382..0000000
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example/main.zpy
+++ /dev/null
@@ -1,37 +0,0 @@
-//# this function is my main loop
-(defun main int)
-	(InitWindow 800 800 "test test")
-	(SetTargetFPS 60)
-
-	(let img:Image (LoadImage "dvd.png"))
-	(let tex:Texture (LoadTextureFromImage img))
-	(UnloadImage img)
-
-	(let x:int (randint 4 9))
-	(let y:int (randint 4 9))
-	(let xd:int (randint 3 5))
-	(let yd:int (randint 3 5))
-
-	(for i:int 0 (= (WindowShouldClose) 0) 0)
-		(BeginDrawing)
-		(ClearBackground RAYWHITE)
-		(DrawTexture tex x y WHITE)
-		(EndDrawing)
-
-		(set x (+ x xd))
-		(set y (+ y yd))
-
-		(if (> x 750))
-			(set xd -xd)
-		(elif (< x 0))
-			(set xd -xd)
-		(endif)
-		(if (> y 750))
-			(set yd -yd)
-		(elif (< y 0))
-			(set yd -yd)
-		(endif)
-
-	(endfor)
-	(CloseWindow)
-(endfun)
diff --git a/comp/lucas-standen-NEA/code2/examples/raylib_example/zpybuild.sh b/comp/lucas-standen-NEA/code2/examples/raylib_example/zpybuild.sh
deleted file mode 100644
index 3916f3b..0000000
--- a/comp/lucas-standen-NEA/code2/examples/raylib_example/zpybuild.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-zpy ./main.zpy -c -o main.c -i raylib.h
-cc main.c /usr/local/share/zpylib/zpylib.o -o main -I/usr/local/share/zpylib/include -Wno-implicit-function-declaration -lraylib -lm
-rm -rf main.c
diff --git a/comp/lucas-standen-NEA/code2/zpypkg/Makefile b/comp/lucas-standen-NEA/code2/zpypkg/Makefile
index dc86e53..ad21210 100644
--- a/comp/lucas-standen-NEA/code2/zpypkg/Makefile
+++ b/comp/lucas-standen-NEA/code2/zpypkg/Makefile
@@ -1,4 +1,4 @@
-install: zpypkg
-	cp zpypkg /usr/local/bin/zpypkg
+install: zpypkg.sh
+	cp zpypkg.sh /usr/local/bin/zpypkg
 uninstall:
 	rm /usr/local/bin/zpypkg
diff --git a/comp/lucas-standen-NEA/code2/zpypkg/zpypkg b/comp/lucas-standen-NEA/code2/zpypkg/zpypkg.sh
index 95e59c8..95e59c8 100755
--- a/comp/lucas-standen-NEA/code2/zpypkg/zpypkg
+++ b/comp/lucas-standen-NEA/code2/zpypkg/zpypkg.sh
diff --git a/electronics/asm/mem.ba~ b/electronics/asm/mem.ba~
deleted file mode 100644
index 62c8d54..0000000
--- a/electronics/asm/mem.ba~
+++ /dev/null
@@ -1,28 +0,0 @@
-start: 
-init: 
-	clrf    PORTA           ; make sure port A output latches are low 
-	clrf    PORTB           ; make sure port B output latches are low 
-	bsf     STATUS,RP0      ; select memory bank 1 
-	movlw 	b'11111111'     ; set port A data direction to inputs 
-	movwf 	TRISA         
-	movlw 	b'00000000'     ; set port B data direction to outputs 
-	movwf 	TRISB          
-	bcf     STATUS,RP0      ; select memory bank 0 
-	goto    main 
-;; for this program use the 2k 8 bit mem chip, with WE on B2, OE on B3, and the memorys 3 least
-;; sig bits to B4-B6 (inclusive), all other pins on the mem chip need to be held low, and an led 
-;; needs to be on B1
-;; when B1 goes high move the 3 pins from the microcontroler to leds and see the value
-main: 
-	movlw	b'01111000' 
-	movwf	PORTB		; make we high, oe low, and 3 pins high
-	call	wait1000ms
-
-	movlw	b'00000110' 
-	movwf	PORTB		; make we low, oe high, and 3 pins low 
-
-noend:
-	goto 	noend
-
-	END		        ; ends the program
-
diff --git a/electronics/asm/signalplayback.asm b/electronics/asm/signalplayback.asm
new file mode 100644
index 0000000..9e412f1
--- /dev/null
+++ b/electronics/asm/signalplayback.asm
@@ -0,0 +1,40 @@
+start: 
+init: 
+	clrf    PORTA          	; make sure port A output latches are low 
+	clrf    PORTB          	; make sure port B output latches are low 
+	bsf     STATUS,RP0     	; select memory bank 1 
+	movlw 	b'11111111'    	; set port A data direction to inputs 
+	movwf   TRISA         
+	movlw   b'00000000'    	; set port B data direction to outputs 
+	movwf   TRISB          
+	bcf     STATUS,RP0     	; select memory bank 0 
+
+	bsf	INTCON, INT0IE
+	bsf	INTCON, GIE
+
+	counter1 EQU B8
+
+	goto    main 
+
+interrupt:
+	movf B0, W
+	movwf counter1
+	goto countdown
+
+countdown:
+	call wait1000ms
+	decfsz counter1, F
+	goto countdown
+
+	bcf INTCON, INT0IF
+	
+	retfie
+
+main: 
+	call 	readadc0
+	movf	B0, W
+	movwf	PORTB
+
+	goto 	main
+
+	END		       	; ends the program
diff --git a/electronics/asm/temp.asm b/electronics/asm/temp.asm
new file mode 100644
index 0000000..c6d808d
--- /dev/null
+++ b/electronics/asm/temp.asm
@@ -0,0 +1,39 @@
+start: 
+init: 
+	clrf    PORTA          	; make sure port A output latches are low 
+	clrf    PORTB          	; make sure port B output latches are low 
+	bsf     STATUS,RP0     	; select memory bank 1 
+	movlw 	b'11111111'    	; set port A data direction to inputs 
+	movwf   TRISA         
+	movlw   b'00000000'    	; set port B data direction to outputs 
+	movwf   TRISB          
+	bcf     STATUS,RP0     	; select memory bank 0 
+
+	;bsf	INTCON, INT0IE
+	;bsf	INTCON, GIE
+
+	rawtemp EQU B5
+
+	goto    main 
+
+showme:
+	movlw 255
+	movwf PORTB
+	return
+
+main: 
+	call 	readadc1
+	movf	B1, W
+	movwf	rawtemp
+
+	call 	readadc0
+	movf	B0, W
+
+	subwf	rawtemp, w
+	
+	btfsc	STATUS, 2
+	call 	showme
+
+	goto 	main
+
+	END		       	; ends the program
diff --git a/electronics/asm/temp.err b/electronics/asm/temp.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/electronics/asm/temp.err
diff --git a/electronics/asm/timer.asm b/electronics/asm/timer.asm
new file mode 100644
index 0000000..9e412f1
--- /dev/null
+++ b/electronics/asm/timer.asm
@@ -0,0 +1,40 @@
+start: 
+init: 
+	clrf    PORTA          	; make sure port A output latches are low 
+	clrf    PORTB          	; make sure port B output latches are low 
+	bsf     STATUS,RP0     	; select memory bank 1 
+	movlw 	b'11111111'    	; set port A data direction to inputs 
+	movwf   TRISA         
+	movlw   b'00000000'    	; set port B data direction to outputs 
+	movwf   TRISB          
+	bcf     STATUS,RP0     	; select memory bank 0 
+
+	bsf	INTCON, INT0IE
+	bsf	INTCON, GIE
+
+	counter1 EQU B8
+
+	goto    main 
+
+interrupt:
+	movf B0, W
+	movwf counter1
+	goto countdown
+
+countdown:
+	call wait1000ms
+	decfsz counter1, F
+	goto countdown
+
+	bcf INTCON, INT0IF
+	
+	retfie
+
+main: 
+	call 	readadc0
+	movf	B0, W
+	movwf	PORTB
+
+	goto 	main
+
+	END		       	; ends the program
diff --git a/electronics/asm/timer.err b/electronics/asm/timer.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/electronics/asm/timer.err