diff --git a/Software/Apple1SRAM/1pinKBD.spin b/Software/Apple1SRAM/1pinKBD.spin index dac3ff4..54ab003 100644 Binary files a/Software/Apple1SRAM/1pinKBD.spin and b/Software/Apple1SRAM/1pinKBD.spin differ diff --git a/Software/Apple1SRAM/Apple1.spin b/Software/Apple1SRAM/Apple1.spin index b80d3fe..1a26ecf 100644 --- a/Software/Apple1SRAM/Apple1.spin +++ b/Software/Apple1SRAM/Apple1.spin @@ -1,6 +1,6 @@ ''*************************************************************************** ''* L-STAR, Apple-1 replica with minimal hardware -''* Copyright (C) 2014 Jac Goudsmit +''* Copyright (C) 2014-2016 Jac Goudsmit ''* ''* Some of the code in this project was based on the following projects, ''* all under MIT license unless otherwise mentioned: @@ -46,11 +46,14 @@ PUB main | i 'waitcnt(clkfreq + cnt) ' Init serial, keyboard and TV - term.Start(hw#pin_RX, hw#pin_TX, -1 {hw#pin_KBDATA}, hw#pin_TV, BAUDRATE) - term.str(string("L-STAR (C) 2014-2016 JAC GOUDSMIT",13)) - term.str(string("SIM.ROM BYTES: ")) + ' + ' TIP: If you don't use a PS/2 keyboard (only serial port), + ' change the third parameter to -1 + term.Start(hw#pin_RX, hw#pin_TX, hw#pin_KBDATA, hw#pin_TV, BAUDRATE) + term.str(string("L-STAR (C) 2014-2016 Jac Goudsmit", 13)) + term.str(string("Simulated ROM bytes: ")) term.dec(@RomEnd-@RomFile) - term.str(string(13,13)) + term.tx(13) ' Initialize the clock before starting any cogs that wait for it clock1.Init(1_000_000) @@ -66,6 +69,8 @@ PUB main | i sram.Init(RAMSIZE) sram.Start + term.str(string("Reset the 6502 to start.", 13, 13)) + ' Start the clock clock1.Activate diff --git a/Software/Apple1SRAM/SerKbd1TV.spin b/Software/Apple1SRAM/SerKbd1TV.spin index bc2b2a2..c28b829 100644 --- a/Software/Apple1SRAM/SerKbd1TV.spin +++ b/Software/Apple1SRAM/SerKbd1TV.spin @@ -24,8 +24,9 @@ PUB Start(rxpin, txpin, kbdatapin, tvpin, baudrate) | t if (kbdatapin => 0) str(string("Hit SPACE on the PS/2 keyboard...")) t := kb.calckbdtime(kbdatapin) - kb.start(kbdatapin, t & $FFFF, t >> 16) - havekb := 1 + kb.start(kbdatapin, t & $FFFF, t >> 16, 6) ' 6=Numlock on, Capslock on, Scrollock off + havekb := 1 + tx(13) PUB str(s)