diff --git a/client/carts/kipperterm.s b/client/carts/kipperterm.s index 7894122..6cb3937 100644 --- a/client/carts/kipperterm.s +++ b/client/carts/kipperterm.s @@ -66,8 +66,7 @@ .word cold_init ;cold start vector .word warm_init ;warm start vector .byte $C3,$C2,$CD,$38,$30 ; "CBM80" -.byte $0,$0,$0 ;reserved for future use -.byte $0,$0,$0 ;reserved for future use +.byte "KIPTRM" .byte $0,$0,$0 ;reserved for future use .byte $0,$0,$0 ;reserved for future use .byte $0,$0,$0 ;reserved for future use diff --git a/client/carts/set_ip_config.rb b/client/carts/set_ip_config.rb index fa1b748..d211d16 100644 --- a/client/carts/set_ip_config.rb +++ b/client/carts/set_ip_config.rb @@ -43,7 +43,7 @@ end filebytes=File.open(filename,"rb").read -start_of_kipper_cart_image=filebytes.index("80KIPPER") +start_of_kipper_cart_image=filebytes.index("80KIP") if start_of_kipper_cart_image.nil? then puts "file '#{filename}' does not appear to be a kipper cartridge image" exit diff --git a/client/ip65/vt100_c64.s b/client/ip65/vt100_c64.s index e193bff..cd09bfd 100644 --- a/client/ip65/vt100_c64.s +++ b/client/ip65/vt100_c64.s @@ -1,4 +1,5 @@ ; vt100 emulation for C64 +; vt100 emulation for C64 ; originally from CaTer - Copyright Lars Stollenwerk 2003 ; CaTer homepage is http://formica.nusseis.de/Cater/ ; converted for use with ip65 by Jonno Downes, 2009. @@ -836,7 +837,7 @@ vt100_transform_outbound_char: rts : cmp #$ff - beq cursor_sequence ; send a string + beq output_string cmp #$fe beq command_key ; command key ;default - send (possibly transformed) single char @@ -851,7 +852,7 @@ rts ; ------------------------------------- -cursor_sequence: +output_string: tya ; restore original key ; --- crsr U --- @@ -863,12 +864,18 @@ cursor_sequence: ; --- crsr L --- @not_U: cmp #$9d ; test crsr L - bne @done + bne @not_L ldax #ansi_cursor_left ldy #2 rts +@not_L: + cmp #$0d ;test CR + bne @not_CR + ldax #crlf + ldy #2 + rts -@done: +@not_CR: ldy #0 ;must be some kind of error rts @@ -1538,7 +1545,7 @@ ansi_cursor_up: .byte esc, brace, $41, $00 ; esc [ A ansi_cursor_down: .byte esc, brace, $42, $00 ; esc [ B ansi_cursor_right: .byte esc, brace, $43, $00 ; esc [ C ansi_cursor_left: .byte esc, brace, $44, $00 ; esc [ D - +crlf: .byte $0d,$0a,0 ; ------------------------------------- ; table ASCII to PETSCII @@ -1831,7 +1838,7 @@ petscii_to_ascii: .byte $0a ; $0a .byte $0b ; $0b .byte $0c ; $0c - .byte $0d ; $0d CR + .byte $ff ; $0d CR .byte $0e ; $0e .byte $0f ; $0f .byte $10 ; $10