From 78d0b86b2f0aaaa9f82682448e2c6b6c61959585 Mon Sep 17 00:00:00 2001
From: Terence Boldt <terence@boldt.ca>
Date: Mon, 7 Feb 2022 22:01:06 -0500
Subject: [PATCH] Add version info

---
 .github/ISSUE_TEMPLATE/bug_report.yml     |  28 +++++++++++--
 Apple2/AT28C64B.bin                       | Bin 8192 -> 8192 bytes
 Apple2/MenuFirmware.asm                   |   9 ++---
 Apple2/MenuFirmware.lst                   |  46 +++++++++++-----------
 Apple2/RPi.Command.bin                    | Bin 489 -> 487 bytes
 Apple2/RPi.Command.lst                    |  10 ++---
 RaspberryPi/Apple2-IO-RPi.hdv             | Bin 33553920 -> 33553920 bytes
 RaspberryPi/apple2driver/driver.go        |   3 +-
 RaspberryPi/apple2driver/handlers/exec.go |  10 +++++
 RaspberryPi/apple2driver/info/version.go  |   9 +++++
 10 files changed, 75 insertions(+), 40 deletions(-)
 create mode 100644 RaspberryPi/apple2driver/info/version.go

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index b2e489d..5107404 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -22,12 +22,32 @@ body:
       label: Hardware Version
       description: What version of the hardware are you running?
       options:
-        - Fourth Prototype (Purchased from Terence)
-        - Fourth Prototype (Purchased from third party)
-        - Fourth Prototype (Self-assembled)
         - Fifth Prototype (Purchased from Terence)
-        - Fifth Prototype (Purchased from third party)
         - Fifth Prototype (Self-assembled)
+        - Fifth Prototype (Purchased from third party)
+        - Fourth Prototype (Purchased from Terence)
+        - Fourth Prototype (Self-assembled)
+        - Fourth Prototype (Purchased from third party)
+    validations:
+      required: true
+  - type: dropdown
+    id: firmware-version
+    attributes:
+      label: Firmware Version
+      description: What version of the firmware are you running? (shown on boot screen)
+      options:
+        - 000F
+        - Older (not shown on boot, pre-2022-Feb-07)
+    validations:
+      required: true
+  - type: dropdown
+    id: driver-version
+    attributes:
+      label: Driver Version
+      description: What version of the driver are you running? Check with `RPI a2version`
+      options:
+        - 0022
+        - Older (error calling RPI a2version, pre-2022-Feb-07)
     validations:
       required: true
   - type: dropdown
diff --git a/Apple2/AT28C64B.bin b/Apple2/AT28C64B.bin
index 41aaea0a8d695a1edd41f4445e6ad6507c35a74a..5c5901c9458d96fd53882bd1bca73e20a7e6e605 100644
GIT binary patch
delta 243
zcmZp0XmHq|Ey1{DvW`T@<UJCSj7F2MNhonBxP@C87#O%s{vlxul9a?QDG8R8!Y(NV
smXyXWDGipC!7eESmXyUVDGQdA!!9WYmXt@56o7d}Pfw45fq`8F0HjDtBme*a

delta 404
zcmZp0XmHq|Ey1{FvW`TD5(5-C78K;98tHoa>jnj6_G%<+8W|WF=mH7D$>$`LCjXEy
z25FEaUV|i9gB0-^q`(@aiPs<v)*wT?1{tshS>iRwf;GqyuR#v1L7rF*9C~_s!0=}m
F0RT(DXS4tS

diff --git a/Apple2/MenuFirmware.asm b/Apple2/MenuFirmware.asm
index 11abf23..63e55b8 100644
--- a/Apple2/MenuFirmware.asm
+++ b/Apple2/MenuFirmware.asm
@@ -159,15 +159,12 @@ finishRead:
 end:
  rts
 
-.repeat	187-<end
-.byte 0
-.endrepeat
-
+; NOTE: The text below exactly fills the remaining 256 bytes of firmware
 Text:
 .byte	"Apple2-IO-RPi",$8d
-.byte	"(c)2020-2021 Terence J. Boldt",$8d
+.byte	"(c)2020-2022 Terence J. Boldt",$8d
 .byte   $8d
-.byte	"Waiting for RPi...",$00
+.byte	"Waiting for RPi FW:000F...",$00
 
 .byte      0,0     ;0000 blocks = check status
 .byte      7       ;bit set(0=status 1=read 2=write) unset(3=format, 4/5=number of volumes, 6=interruptable, 7=removable)
diff --git a/Apple2/MenuFirmware.lst b/Apple2/MenuFirmware.lst
index 22ee23f..c70c9a4 100644
--- a/Apple2/MenuFirmware.lst
+++ b/Apple2/MenuFirmware.lst
@@ -82,7 +82,7 @@ Current file: MenuFirmware.asm
 00C725  1  20 C1 FB      jsr BasCalc
 00C728  1  A0 00         ldy #$00
 00C72A  1               PrintString:
-00C72A  1  B9 BC C7      lda Text,y
+00C72A  1  B9 B4 C7      lda Text,y
 00C72D  1  F0 08         beq WaitForRPi
 00C72F  1  09 80         ora #$80
 00C731  1  20 ED FD      jsr PrintChar
@@ -163,29 +163,27 @@ Current file: MenuFirmware.asm
 00C7B3  1               end:
 00C7B3  1  60            rts
 00C7B4  1               
-00C7B4  1  00 00 00 00  .repeat	187-<end
-00C7B8  1  00 00 00 00  
-00C7BC  1               .byte 0
-00C7BC  1               .endrepeat
-00C7BC  1               
-00C7BC  1               Text:
-00C7BC  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
-00C7C0  1  65 32 2D 49  
-00C7C4  1  4F 2D 52 50  
-00C7C8  1  69 8D        
-00C7CA  1  28 63 29 32  .byte	"(c)2020-2021 Terence J. Boldt",$8d
-00C7CE  1  30 32 30 2D  
-00C7D2  1  32 30 32 31  
-00C7D6  1  20 54 65 72  
-00C7DA  1  65 6E 63 65  
-00C7DE  1  20 4A 2E 20  
-00C7E2  1  42 6F 6C 64  
-00C7E6  1  74 8D        
-00C7E8  1  8D           .byte   $8d
-00C7E9  1  57 61 69 74  .byte	"Waiting for RPi...",$00
-00C7ED  1  69 6E 67 20  
-00C7F1  1  66 6F 72 20  
-00C7F5  1  52 50 69 2E  
+00C7B4  1               ; NOTE: The text below exactly fills the remaining 256 bytes of firmware
+00C7B4  1               Text:
+00C7B4  1  41 70 70 6C  .byte	"Apple2-IO-RPi",$8d
+00C7B8  1  65 32 2D 49  
+00C7BC  1  4F 2D 52 50  
+00C7C0  1  69 8D        
+00C7C2  1  28 63 29 32  .byte	"(c)2020-2022 Terence J. Boldt",$8d
+00C7C6  1  30 32 30 2D  
+00C7CA  1  32 30 32 32  
+00C7CE  1  20 54 65 72  
+00C7D2  1  65 6E 63 65  
+00C7D6  1  20 4A 2E 20  
+00C7DA  1  42 6F 6C 64  
+00C7DE  1  74 8D        
+00C7E0  1  8D           .byte   $8d
+00C7E1  1  57 61 69 74  .byte	"Waiting for RPi FW:000F...",$00
+00C7E5  1  69 6E 67 20  
+00C7E9  1  66 6F 72 20  
+00C7ED  1  52 50 69 20  
+00C7F1  1  46 57 3A 30  
+00C7F5  1  30 30 46 2E  
 00C7F9  1  2E 2E 00     
 00C7FC  1               
 00C7FC  1  00 00        .byte      0,0     ;0000 blocks = check status
diff --git a/Apple2/RPi.Command.bin b/Apple2/RPi.Command.bin
index 8d938bc58537618369048e25bb8ef65202b9913b..fbf3950e8785c0f81640a879e7eaca9bc881b8ec 100644
GIT binary patch
delta 10
RcmaFK{G53K<76hr=KvRs1N8s^

delta 9
QcmaFP{E~SA<HUb20Tyip@Bjb+

diff --git a/Apple2/RPi.Command.lst b/Apple2/RPi.Command.lst
index 9c2da1f..09664ff 100644
--- a/Apple2/RPi.Command.lst
+++ b/Apple2/RPi.Command.lst
@@ -92,13 +92,13 @@ Current file: RPi.Command.asm
 002041  1               end:
 002041  1  4C 00 03      jmp $0300
 002044  1               
-002044  1  00 00 00 00  .repeat	255-<end
+002044  1  00 00 00 00  .repeat	253-<end
 002048  1  00 00 00 00  
 00204C  1  00 00 00 00  
-002102  1               .byte 0
-002102  1               .endrepeat
-002102  1               
-002102  1               .org $0300
+002100  1               .byte 0
+002100  1               .endrepeat
+002100  1               
+002100  1               .org $0300
 000300  1                ;
 000300  1                ; FIRST SAVE THE EXTERNAL COMMAND ADDRESS SO YOU WON'T
 000300  1                ; DISCONNECT ANY PREVIOUSLY CONNECTED COMMAND.
diff --git a/RaspberryPi/Apple2-IO-RPi.hdv b/RaspberryPi/Apple2-IO-RPi.hdv
index 1503bd29cf62b64f919bb8d411e6495636840caf..c6b3669d0ca2ea62271ae1acfecf5f03ad388958 100755
GIT binary patch
delta 2647
zcmZ|Pb#T{Z0LStDh8sgcn9}7WL}kEOZz4!IB$QMTq>(a6K|x`3DX0U6g3_rp0s>06
zAWGQMjg(3|e81V9cmA<IUhjMExzAtUyYG{F`%dmuEG`$4t7c^R+@*q!1x0vBOAaY~
z_a^ASn>Hbp!%qc*{x=Iw3lFP5D0D?=ploDdd3t1YU_|=b=s=-Bbo#;QK#8!3lqShh
zQBf)B*P{b54q~z##AFU)vmC@`4&t&L#AOcRvmC@{4id5)BxDW}vm7L54wAAMth}BS
z2+NTkTs@F6JfnI5!N`Vt5Q0!-M;LP8UfhSA$c6in8+j0p2k;>BA|LXj01BcI3Zn>$
zq8N(fAw=L|lt4+8LTNmLGI$h^;c=8jB+8*YDj*6K5setcA`bCLKq8Wmj3-bDPogra
z;3-r^HB?6pJdG68#51Uc+NguNcoxs09_ph38ln*z<9WP*CTNNm(G1P;5?Y`oTA?-C
zpe@>=Jzho!bVMg~Mi;z-SMeHNM^|)1cl1C{^uinHjXro2Z=o;x;cdKw{uqE%48$M|
z#t;m}Fbu~CjKnC6#=CeAV=xx);{$w%G>pS|Oh7s&;v;;FNtldJ@F}KXDyCsNW?&{}
zVK(MqF6LoAKEvl&fQ49u#aM!+Scc{J0xPf*tMDaOV-42gD}0T0SdR_Zh)vjxE!c`}
z*p408iCy>xyRiq~VlTeK_t=O1IDmur0YBm={ET1lD}KZ8IE2GEf}=Qw<2ZqnIEB+V
zgR?k?^Y{Z7a1obq8CUQp{=(n5ifg!z8@P#ExQ&01fjgu5_s7Bnn{4JD6JkP5b`xfD
zn0w8ACa1||?l-wj9usaJFb|r%CZEY~3YdbXkST16n4+ebDQ+Gz5$0i2!jv?nOlk9o
zDPtZrkD13!Srci>newKBi82*Uw23jXCeFm01e0izOtN{xR5DMR%BG5W%2YMg%-zpf
z!_(6y#nd#<m|CW`sblJzXU%h_o~dsdn1-g2X>6W1FPJ8#sd>>fGtJFQriE!~TA9|S
zjcIGznfB&o)4_B!olIxb#k^u(HLsc1O;^*+bT>UrPt(i1VS1ZB=1udK>1+C#x6M1I
zzZqas%|J8A3^qf|P&3R7HzUkQGs=uM@0$0_7&F$qZ$2;|nlv-cj5iZZx|wJ`G9Q~s
zX0rLjd}^kcsb-p)Zf2O7W|o<4=9sx=o|$hxGoPCUW}#VR7Mmqzsaa;0n=i}?v(l_G
zUz*isjah5HGGCi@X1&>9HkwUlv)N*{nr&vg*<p5?UFI9J+w3vln!V;b^S#+;_L~Fd
zp!vc4Xnrz3n_tYY<~Q@ZIb;r-Bj%_%W{#T^=A=1gPMb64tT|`Sn?KA2bJ1Kfm(3OP
gr}@kLZLXSY=DN9IZkk)>w)w|o1lIBT1%g-q3&+O!EdT%j

delta 2207
zcmajbWsnwR6o%pbfW@VxLqu7+mRuS|ftzlm8>Chmku=DMP&yW+8|m&&>FzE8K|o0b
z!3WoI#$S8py=LAybN@PhUcOG)$Cl;{PEaN+M)Hh7*Mmaee8v<FPW{g&=)X;~;Npqz
z1cLsT#Tb(~q*}k&t78XpgatN6hUE(k4hi~qB1_f|<V;wnSwz=}4y{95b?g#aqgq7d
z^L&BuH)VMAWq4GXKl(C%R9PVUvOrW>F#57!R9PtcvQSi6IQp`1R9Pgta?SH1fsi<J
zUzH35gkKC1Q^XR%BDQ!-gorpIu81e%iv;3rkx(QOiA55TR3sD0MGBEpq!RCl)Z$%{
zM!YB97imSPNGH;Z3?ie*Br=OEBCE(IvWpxdOym@~L~fBs<Q4fuxX3RGh=QV!C@hMI
zqN14iKzt~Qi;u*|qJ$_ZN(n@1QAU&%<wSW=K~xl#L}gJ$R29`kbx}inB5I0SqPD0b
z>WX@zzGxsCibkTbXd;@5W}><HRJ0H+MJv%-v=I^FGtpMG6YWI@(NS~~okbV%x#%js
z5Zy#~(L?kUy+m*ErT9vGExr+bL|@TQ^cMrfKp`<m3>HJgQ1Pw!P7D*n#RxG{j1r^8
z7%^6i6XQjsm>|9vKZuE9l9()}h^b<lm@a0BnPQfhE#`>1VxIU>%ohv9La|6J7E8oZ
zu}mx%E5u5%N~{)Z#9FaVtQQ-^MzKk37F)ztu}y3jJH$@0OY9bV#7|<c*eCXj1LB}K
zBo2!s;;1+#j*AoGq&Ou`i!<V^I491F3*w@<Brc09;;OhNu8SMurubRh61T-2@r$@C
z?ulQ;eepm%6u*hz#Ut@pJP}XDGx1#fA^sFE#7ps)cqLvBB`}<T#juzb%YrSoy=5U5
z$KqN%i*E_+ZA)m0EU_iAq?XK*TMA2Qsq7s~ZSPtdd(Ymtv=(aVEWKs0jF!nVTNcY|
z*(|%|urSMMxh%KkvAmYg!Y#iQu!2^|3R@8?YQ^jW`_PKpNA|Imu##5F-rS?Km9er`
z&dOT_t7w(1vQ@FFR?Vtg4g17uS}m(>b*!${v-;M+8d@W3Y)!1GHM8dSskN|{*2-F2
z8;h{dtgW@P_SV5VS|{slUF>t~YF}74>ux=)r}eVl_N9GgU)wj<$NE}7>u&>WpveZ=
zU>jmX?OXfKhS_i%VIysnjkYm1*2dX*i?j*$z5QSlZIVs4DK^!n*>sy>Gi{d5wmCM}
z=Gl)n-xk<HTV#uEi7mBdw%k_ON?T>CZH=w9b++C%*hbrAn{A72wQaWDcGynaWxH*U
z{bYM>pY68;cF+#lVLM_+?U)_66L!*0*=ajtXYHJww+nXBF4<+fVpr{&UAG%{(|)#F
wcH8dQFLu}N*{^or9@s<s&3?B>_Sl}-Q+sC5?GO9YUf4_f%U%T*^E$BpZw{&m@Bjb+

diff --git a/RaspberryPi/apple2driver/driver.go b/RaspberryPi/apple2driver/driver.go
index 7a60955..9607892 100644
--- a/RaspberryPi/apple2driver/driver.go
+++ b/RaspberryPi/apple2driver/driver.go
@@ -17,6 +17,7 @@ import (
 
 	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/a2io"
 	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/handlers"
+	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/info"
 )
 
 const resetCommand = 0
@@ -33,7 +34,7 @@ const shellCommand = 9
 func main() {
 	drive1, drive2 := getDriveFiles()
 
-	fmt.Printf("Starting Apple II RPi...\n")
+	fmt.Printf("Starting Apple II RPi v%s...\n", info.Version)
 
 	comm := a2io.A2Gpio{}
 
diff --git a/RaspberryPi/apple2driver/handlers/exec.go b/RaspberryPi/apple2driver/handlers/exec.go
index 4f1f0f0..6388361 100644
--- a/RaspberryPi/apple2driver/handlers/exec.go
+++ b/RaspberryPi/apple2driver/handlers/exec.go
@@ -14,6 +14,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/tjboldt/Apple2-IO-RPi/RaspberryPi/apple2driver/info"
 )
 
 var forceLowercase = false
@@ -46,6 +48,10 @@ func ExecCommand() {
 		comm.WriteString("Working directory set\r")
 		return
 	}
+	if linuxCommand == "a2version" {
+		a2version()
+		return
+	}
 	if linuxCommand == "a2help" {
 		a2help()
 		return
@@ -181,6 +187,10 @@ func getStdin(stdin io.WriteCloser, done chan bool, inputComplete chan bool, use
 	}
 }
 
+func a2version() {
+	comm.WriteString("\rVersion: " + info.Version + "\r")
+}
+
 func a2help() {
 	comm.WriteString("\r" +
 		"Built-in commands:\r" +
diff --git a/RaspberryPi/apple2driver/info/version.go b/RaspberryPi/apple2driver/info/version.go
new file mode 100644
index 0000000..fa9c573
--- /dev/null
+++ b/RaspberryPi/apple2driver/info/version.go
@@ -0,0 +1,9 @@
+// Copyright Terence J. Boldt (c)2020-2022
+// Use of this source code is governed by an MIT
+// license that can be found in the LICENSE file.
+
+// This file is used for storing the version number
+
+package info
+
+const Version = "0022"