From 1d0f62124368dc9eea8d532aac12072695650b77 Mon Sep 17 00:00:00 2001
From: Dreaded_X <tim.huizinga@gmail.com>
Date: Wed, 22 Jan 2020 20:41:39 +0100
Subject: [PATCH] Added verify

---
 .vimlocal   |  5 ++---
 src/fib.z80 | 19 ++++++++++++++++---
 upload.py   |  6 +++---
 3 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/.vimlocal b/.vimlocal
index d538dbe..bbc5f36 100644
--- a/.vimlocal
+++ b/.vimlocal
@@ -1,3 +1,2 @@
-set makeprg=./tools/build.sh
-map <silent> <F10> :Start ./tools/upload_stm32.sh<cr>
-map <silent> <F20> :Start python.exe rootfs$(pwd)/tools/upload_z80.py rootfs$(pwd)/build/fib.z80<cr>
+set makeprg=./build.sh
+map <silent> <F10> :Start python.exe rootfs$(pwd)/upload.py rootfs$(pwd)/.build/fib.bin<cr>
diff --git a/src/fib.z80 b/src/fib.z80
index 3540d75..06cabed 100644
--- a/src/fib.z80
+++ b/src/fib.z80
@@ -1,11 +1,10 @@
 .org $0000
 main:
 init:
-	ld hl, out+7
+	ld hl, out
 
 	ld a, (amount)
 	ld d, a
-	dec d
 
 	ld a, (y)
 	ld b, a
@@ -25,6 +24,19 @@ loop:
 	dec d
 	jp nz, loop
 
+verify_init:
+	ld hl, out
+
+	ld a, (amount)
+	ld d, a
+
+verify:
+	ld a, (hl)
+	inc hl
+
+	dec d
+	jp nz, verify
+	
 done:
 	halt
 
@@ -35,4 +47,5 @@ x:
 	.db 0
 y:
 	.db 1
-out:
+
+out .equ $1000
diff --git a/upload.py b/upload.py
index e1aa38c..ec51057 100644
--- a/upload.py
+++ b/upload.py
@@ -16,8 +16,8 @@ def progressbar(it, prefix="", size=60, file=sys.stdout):
     file.flush()
 
 def main():
-    if len(sys.argv) == 3:
-        ser = serial.Serial(sys.argv[1], timeout=1, write_timeout=1)
+    if len(sys.argv) == 2:
+        ser = serial.Serial("COM3", timeout=1, write_timeout=1)
         if ser.is_open:
             # Clear out any existing input
             ser.write(b'\n')
@@ -27,7 +27,7 @@ def main():
             ser.write(b'#u\n')
             print(ser.readline())
 
-            path = sys.argv[2]
+            path = sys.argv[1]
             size = os.path.getsize(path)
             ser.write([size])
             i = 0