Skip to content

Commit

Permalink
Added licence text to source files.
Browse files Browse the repository at this point in the history
  • Loading branch information
Threetwosevensixseven committed Feb 20, 2020
1 parent 5a5746a commit 4506f56
Show file tree
Hide file tree
Showing 14 changed files with 202 additions and 16 deletions.
19 changes: 19 additions & 0 deletions build/TBBluePublish.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
:: Set current directory and paths
::@echo off
C:
CD %~dp0
CD ..\

copy .\dot\ESPUPDATE. ..\tbblue\dot\ESPUPDATE
copy .\build\readme.txt ..\tbblue\src\asm\espupdate\*.*
copy .\build\get*.??t ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\AppendFW.exe.config ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\CombineFW.exe.config ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\NormalizeESPLogs.exe.config ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\PackageFW.exe.config ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\ZXVersion.exe.config ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\builddot.bat ..\tbblue\src\asm\espupdate\build\*.*
copy .\build\*.bas ..\tbblue\src\asm\espupdate\build\*.*
copy .\src\asm\*.asm ..\tbblue\src\asm\espupdate\src\asm\*.*

pause
10 changes: 10 additions & 0 deletions build/get-tools.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,15 @@ if exist "%~dpn0.txt" (
copy "%~dpn0.txt" "%~dpn0.ps1"
) else goto :scriptexists
:scriptexists

@echo off
C:
CD %~dp0
cd ..
md fw
cd fw
md ESP8266_FULL_V3.3_SPUGS
cd ..\build

PowerShell.exe -NoProfile -ExecutionPolicy Bypass -Command "& '%~dpn0.ps1'"
PAUSE
8 changes: 6 additions & 2 deletions build/get-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@ if (([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::
function download-tool {
Param (
[string]$fn,
[string]$url = "https://github.com/Threetwosevensixseven/espupdate/raw/master/build/"
[string]$url = "https://github.com/Threetwosevensixseven/espupdate/raw/master/build/",
[string]$dest = ""
)
$force = $true;
if ((-not $force) -and (Test-Path $fn)) {
Write-Output "$fn already exists, not downloading"
} else {
Write-Output "Downloading $fn..."
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
wget "$url$fn" -outfile "$fn"
wget "$url$fn" -outfile "$dest$fn"
Write-Output "Downloaded $fn"
}
}
Expand All @@ -30,4 +31,7 @@ download-tool zlib64.dll
download-tool hdfmonkey.exe
download-tool pskill.exe
download-tool ZXVersion.exe
download-tool ESP8266_stub_data.bin https://github.com/Threetwosevensixseven/espupdate/raw/master/fw/ESP8266_FULL_V3.3_SPUGS/ ..\fw\ESP8266_FULL_V3.3_SPUGS\
download-tool ESP8266_stub_text.bin https://github.com/Threetwosevensixseven/espupdate/raw/master/fw/ESP8266_FULL_V3.3_SPUGS/ ..\fw\ESP8266_FULL_V3.3_SPUGS\
download-tool esptool.py https://github.com/Threetwosevensixseven/espupdate/raw/master/fw/ESP8266_FULL_V3.3_SPUGS/ ..\fw\ESP8266_FULL_V3.3_SPUGS\
download-tool zeustest.exe http://www.desdes.com/products/oldfiles/
41 changes: 41 additions & 0 deletions build/readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

To build ESPUPDATE on Windows 10 from source you obtained from the ZX Spectrum Next� distro or gitlab repository:

DO THIS ONCE:
=============
Browse to the "build" directory.
Doubleclick on "get-tools.bat".
Wait while several tools and binaries are downloaded.
When prompted "Press any key to continue", press a key.

DO THIS EVERY TIME YOU WANT TO BUILD:
=====================================
Browse to the "build" directory.
Doubleclick on "zeustest.exe".
Do File >> Open, then browse to the "src\asm" directory.
Select "main.asm" and click the Open button.
In Zeus, on the "Zeus (assembler)" tab, click the Assemble button.
The dot command will be build in the "dot" folder as "ESPUPATE".
Copy this file to the dot folder on your Next SD card.

INFO
====
The latest full source and build tools for ESPUPATE are always available at:
https://github.com/Threetwosevensixseven/espupdate

ESPUPDATE is � 2020 Robin Verhagen-Guest, and licensed under Apache 2.0
(https://github.com/Threetwosevensixseven/espupdate/blob/master/LICENSE)
ZX Spectrum Next is a trademark of SpecNext Ltd.
Binary file modified dot/ESPUPDATE
Binary file not shown.
14 changes: 14 additions & 0 deletions src/asm/constants.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; constants.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

; Application
CoreMinVersion equ $3100 ; 3.01.00 has ESP control pins (zero day update)
DotBank1: equ 30
Expand Down
14 changes: 14 additions & 0 deletions src/asm/esp.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; esp.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

SLIP proc
Sync: db $C0 ; SLIP Frame start - timeout 5
db $00 ; Request
Expand Down
14 changes: 14 additions & 0 deletions src/asm/esxDOS.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; esxDOS.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

; NOTE: File paths use the slash character ('/') as directory separator (UNIX style)

esxDOS proc
Expand Down
14 changes: 14 additions & 0 deletions src/asm/general.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; general.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

InstallErrorHandler proc ; Our error handler gets called by the OS if SCROLL? N happens
ld hl, ErrorHandler ; during printing, or any other ROM errors get thrown. We trap
Rst8(esxDOS.M_ERRH) ; the error in our ErrorHandler routine to give us a chance to
Expand Down
16 changes: 15 additions & 1 deletion src/asm/macros.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; macros.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

include "version.asm", 1 ; Auto-generated by ..\build\cspect.bat or builddot.bat. Has
; date/time and git commit counts generated by an external tool.
Border macro(Colour)
Expand Down Expand Up @@ -277,7 +291,7 @@ DisableReadValidate macro()
ld (ESPSendCmdWithDataProc.ValidateProcSMC), hl ; disabling routine. Invoke
mend ; DisableReadValidate() afterwards.

EnableReadValidate macro()
EnableReadValidate macro()
ld hl, ESPValidateCmdProc ; Parameterised wrapper for the ESP SLIP buffer read validate
ld (ESPSendCmdWithDataProc.ValidateProcSMC), hl ; re-enabling routine. Invoke after
mend ; EnableReadValidate().
Expand Down
14 changes: 14 additions & 0 deletions src/asm/print.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; msg.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

Msg proc
Startup: db "ESP UPDATE TOOL v1.", BuildNoValue//, VerSuffix
//db " (", BuildTimeSecsValue, ")"
Expand Down
14 changes: 14 additions & 0 deletions src/asm/stub.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; stub.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

LowerCodeStart equ Start ; This marks the end of the lower 8K of the dot command which is loaded
LowerCodeLen equ $-Start ; automatically by NextZXOS. LowerCodeLen should always be smaller than $2000.

Expand Down
14 changes: 14 additions & 0 deletions src/asm/vars.asm
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
; vars.asm

; Copyright 2020 Robin Verhagen-Guest
;
; Licensed under the Apache License, Version 2.0 (the "License");
; you may not use this file except in compliance with the License.
; You may obtain a copy of the License at
;
; http://www.apache.org/licenses/LICENSE-2.0
;
; Unless required by applicable law or agreed to in writing, software
; distributed under the License is distributed on an "AS IS" BASIS,
; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
; See the License for the specific language governing permissions and
; limitations under the License.

; Application
SavedArgs: dw 0
SavedArgsLen dw 0
Expand Down
26 changes: 13 additions & 13 deletions src/asm/version.asm
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
; version.asm
;
; Auto-generated by ZXVersion.exe
; On 16 Feb 2020 at 19:47
; On 19 Feb 2020 at 19:46

BuildNo macro()
db "68"
db "69"
mend

BuildNoValue equ "68"
BuildNoWidth equ 0 + FW6 + FW8
BuildNoValue equ "69"
BuildNoWidth equ 0 + FW6 + FW9



BuildDate macro()
db "16 Feb 2020"
db "19 Feb 2020"
mend

BuildDateValue equ "16 Feb 2020"
BuildDateWidth equ 0 + FW1 + FW6 + FWSpace + FWF + FWe + FWb + FWSpace + FW2 + FW0 + FW2 + FW0
BuildDateValue equ "19 Feb 2020"
BuildDateWidth equ 0 + FW1 + FW9 + FWSpace + FWF + FWe + FWb + FWSpace + FW2 + FW0 + FW2 + FW0



BuildTime macro()
db "19:47"
db "19:46"
mend

BuildTimeValue equ "19:47"
BuildTimeWidth equ 0 + FW1 + FW9 + FWColon + FW4 + FW7
BuildTimeValue equ "19:46"
BuildTimeWidth equ 0 + FW1 + FW9 + FWColon + FW4 + FW6



BuildTimeSecs macro()
db "19:47:48"
db "19:46:47"
mend

BuildTimeSecsValue equ "19:47:48"
BuildTimeSecsWidth equ 0 + FW1 + FW9 + FWColon + FW4 + FW7 + FWColon + FW4 + FW8
BuildTimeSecsValue equ "19:46:47"
BuildTimeSecsWidth equ 0 + FW1 + FW9 + FWColon + FW4 + FW6 + FWColon + FW4 + FW7

0 comments on commit 4506f56

Please sign in to comment.