Skip to content

Commit 8b1ac6e

Browse files
author
David Schmidt
committed
Prepare for 2.0.1 release
1 parent 5b18fcc commit 8b1ac6e

6 files changed

Lines changed: 18 additions & 15 deletions

File tree

build/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ all
5252
-->
5353

5454
<project name="ADTPro" default="all" basedir="..">
55-
<property name="versionString" value="v.r.m" />
55+
<property name="versionString" value="2.0.1" />
5656
<property name="projdir" value="${basedir}" />
5757
<property name="builddir" value="${basedir}/build" />
5858
<property name="distName" value="ADTPro-${versionString}" />

client/src/main.asm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ entrypoint:
4848
jsr BLOAD ; Load up user parameters, if any
4949
jsr HOME ; Clear screen
5050
jsr PARMINT ; Interpret parameters - may leave a complaint
51+
lda COMMSLOT ; Check if we're on a GS or not (slot will be 7 if so)
52+
cmp #$07 ; The HOMEREQUEST will hang if a connection isn't complete
53+
beq MAINL ; It's a GS... skip it!
5154
jsr HOMEREQUEST ; Probably don't want to do this _every_ time - but at least once is nice
5255
jmp MAINL ; And off we go!
5356

doc/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>org.adtpro</groupId>
55
<artifactId>doc</artifactId>
6-
<version>v.r.m</version>
6+
<version>2.0.1</version>
77
<name>ADTPro</name>
88
<url>http://adtpro.sourceforge.net</url>
99
<inceptionYear>2006</inceptionYear>

doc/removeMaven.re

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
s@v\.r\.m@2.0.0@ig;
1+
s@v\.r\.m@2.0.1@ig;
22
s@\<a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy"\>@<a href="http://sourceforge.net/projects/adtpro"><img src="http://sflogo.sourceforge.net/sflogo.php?group_id=170262&amp;type=13" width="120" height="30" alt="Get Apple Disk Transfer ProDOS at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a>@ig;
33
s@\<img class="builtBy" alt="Built by Maven" src="\./images/logos/maven-feather.png" \/\>@@ig;
44
s@\</body\>@\<script src\=\"http\:\/\/www.google-analytics.com\/urchin.js\" type\=\"text\/javascript\"\>\<\/script\>\<script type\=\"text\/javascript\"\>_uacct \= \"UA-697468-1\";urchinTracker\(\);\<\/script\>\<\/body\>@ig;

doc/src/site/apt/bootstrap.apt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ all the way to making a bootable ADTPro floppy:
9898
There are three phases to the bootstrapping operation, and all should
9999
follow automatically.
100100

101-
If at any point the bootstrapping process seems to stop working, or
102-
pauses for more than 10 seconds or so, press the "ESC" key on the Apple
103-
to attempt to re-start.
104-
105101
The text that flows at first is a program that searches for compatible
106102
serial hardware, which then uses that connection to complete the bootstrapping operation.
107103
Once the bootstrapper is running, the block should be flashing random characters,
@@ -441,11 +437,11 @@ all the way to making a bootable ADTPro floppy:
441437
(i.e. hit reset before any disk loads after turning the machine on).
442438

443439
The defaults now are to send initial bootstrapping data at 9600 baud, with
444-
a 150 millisecond delay after each line. The first few
440+
a 250 millisecond delay after each line. The first few
445441
lines slow down much more than that because they rely on the
446442
BASIC interpreter, which takes extra time to process.
447-
After the Speediboot process takes over, everything else happens even
448-
faster than that.
443+
After the Speediboot process takes over, everything else happens at top speed
444+
no matter what.
449445

450446
The net result is substantially faster bootstrapping than before.
451447
Using the serial configuration dialog box, bootstrapping tab
@@ -455,9 +451,11 @@ all the way to making a bootable ADTPro floppy:
455451

456452
[images/serialConfig2.png]
457453

458-
The defaults for pacing and speed should work fine for communications to any Apple.
454+
The defaults for pacing and speed should work fine for communications to any Apple
455+
or compatible.
459456
If you have trouble with these bootstrapping operations, you may find it necessary
460-
to slow down the baud rate, increase the pacing interval, or both.
457+
to increase the pacing interval, but you should not need to slow down the baud rate.
458+
If you find yourself wanting to do that, chances are something in your connection is wrong.
461459
Again, the important thing is to not have DOS or ProDOS loaded when going through
462460
bootstrapping operations.
463461

@@ -469,4 +467,4 @@ all the way to making a bootable ADTPro floppy:
469467
[images/serialConfig.png]
470468

471469
And if you are using an Imagewriter I cable with an Apple IIc, don't forget to check the
472-
"Apple IIc Serial" box on the Port tab.
470+
"Apple IIc w/ImageWriter Cable" box on the Port tab.

doc/src/site/apt/history.apt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,21 @@
66

77
ADTPro Release History
88

9-
* Unreleased - in CVS now
9+
* 2.0.1 - March 21, 2015
1010

1111
New functionality:
1212

1313
* [Audio] Client sends test stream of data for volume tuning on host side
1414

15+
* [Server] Text bootstrapping data is packed more densely for faster transfer
16+
1517
[]
1618

1719
Bug fixes:
1820

1921
* Server and client agree on more situations where a transfer should be aborted
2022

21-
* [Server] Text bootstrapping data is packed more densely for faster transfer
23+
* [Client] Don't hang on a GS on startup if a connection isn't pre-established
2224

2325
* [Server] Flush the serial send buffer occasionally for our native serial port friends
2426

0 commit comments

Comments
 (0)