xmodem was broken

git-svn-id: http://svn.code.sf.net/p/netboot65/code@300 93682198-c243-4bdb-bd91-e943c89aac3b

client/kipperterm2/Makefile

@@ -22,9 +22,10 @@ all: ip65 drivers  kipperterm2.prg kt2wiz.prg kipperterm2.d64
 
 
 kipperterm2.o: kipperterm2.s $(INCFILES) ../inc/telnet.i ../inc/config_menu.i ../inc/gopher.i
+	ruby -e "puts '.byte \"' + Time.now.strftime('%Y-%m-%d')+'\"'" > timestamp.i
 	$(AS) $(AFLAGS) -o $@ $<
 
-%.o: %.s $(INCFILES) 
+%.o: %.s $(INCFILES)
 	$(AS) $(AFLAGS) $<
 
 %.prg: %.o $(IP65LIB) $(C64RRNETLIB) $(INCFILES) ../cfg/c64fullprg.cfg
@@ -33,12 +34,12 @@ kipperterm2.o: kipperterm2.s $(INCFILES) ../inc/telnet.i ../inc/config_menu.i ..
 
 kt2wiz.prg: kipperterm2.o $(IP65WIZNETLIB) $(C64WIZNETLIB) $(INCFILES) ../cfg/c64fullprg.cfg
 	$(LD) -m  kt2wiz.map -vm -C ../cfg/c64fullprg.cfg -o  kt2wiz.prg  $(AFLAGS) $< $(IP65WIZNETLIB) $(C64WIZNETLIB)  
-	cp kt2wiz.prg ../../server/boot/autoexec.prg
+#	cp kt2wiz.prg ../../server/boot/autoexec.prg
 
 
 kipperterm2.d64: kipperterm2.prg kt2wiz.prg addresses.txt abe.bas
 	ripxplore.rb --init CbmDos $@ -a kipperterm2.prg
-	ripxplore.rb $@ -a 80columns -t C64Prg
+#	ripxplore.rb $@ -a 80columns -t C64Prg
 	ripxplore.rb $@ -a addresses.txt -t C64Seq
 	ripxplore.rb $@ -a abe -t C64Prg
 	cp kipperterm2.d64 ../../server/boot

client/kipperterm2/kipperterm2.s

@@ -120,7 +120,8 @@ init_failed:
   print_failed
   jsr print_errorcode
   jsr wait_for_keypress  
-  jmp exit_to_basic
+  
+  jmp exit_to_basic 
 
 print_main_menu:
   jsr cls  
@@ -514,9 +515,21 @@ xmodem_download:
   jmp wait_for_keypress
   
 open_dl_file:  
-  lda #temp_filename_end-temp_filename_start
-  ldx #<temp_filename_start
-  ldy #>temp_filename_start
+
+  ;scratch the file first (if it exists)
+  ;first copy the "S:"
+  ldx #0
+: 
+  lda scratch_cmd,x
+  sta command_buffer,x
+  inx
+  cmp #':'
+  bne :-
+  jsr copy_tmp_filename_and_execute_cmd
+
+  lda #temp_filename_end-temp_filename
+  ldx #<temp_filename
+  ldy #>temp_filename
 
 
 open_file:
@@ -568,14 +581,13 @@ rename_file:
 ;AX points at new filename
   stax  copy_src
   ldx #0
-  ldy #0
   ;first the "RENAME0:"
 
 : 
-  lda rename_cmd,y
+  lda rename_cmd,x
   sta command_buffer,x
   inx
-  iny
+
   cmp #':'
   bne :-
   
@@ -595,6 +607,7 @@ rename_file:
   sta command_buffer,x
   inx
 
+copy_tmp_filename_and_execute_cmd:
   ;now the old filename
   ldy #0
 :  
@@ -609,7 +622,6 @@ rename_file:
   txa ;filename length
   ldx #<command_buffer
   ldy #>command_buffer
-  
   jsr $FFBD     ; call SETNAM
   lda #$0F      ; filenumber 15
   ldx cfg_default_drive
@@ -619,9 +631,13 @@ rename_file:
   lda #$0F      ; filenumber 15
   jsr $FFC3     ; call CLOSE  
   rts
+
+  
+scratch_cmd:
+  .byte "S:"
   
 rename_cmd:
-  .byte "RENAME0:"
+  .byte "RENAME:"
 
 exit_telnet:
 exit_gopher:
@@ -677,7 +693,6 @@ address_book_fail_msg:
 dir_listing_fail_msg:
 	.byte "directory listing failed",10,0
 
-temp_filename_start:  .byte "@"
 temp_filename:
 .byte "XMODEM.TMP,P,W"  ; @ means 'overwrite if existing', ',P,W' is required to make this an output file
 temp_filename_end:
@@ -703,6 +718,9 @@ credits:
 .byte 10,10
 .byte "Build "
 .include "../inc/version.i"
+.byte " ("
+.include "timestamp.i"
+.byte ")"
 .byte 10,10
 
 .byte 0

client/kipperterm2/timestamp.i

@@ -0,0 +1 @@
+.byte "2011-01-08"