track r65emu library updates

This commit is contained in:
Stephen Crane 2018-11-12 07:47:06 +00:00
parent db9de4bdde
commit 92a161f870
4 changed files with 11 additions and 9 deletions

View File

@ -1,6 +1,7 @@
PROCESSOR_FAMILY := lm4f PROCESSOR_FAMILY := lm4f
BOARD := lplm4f120h5qr BOARD := lplm4f120h5qr
# watch the CPU execute # watch the CPU execute
#LOCAL_CPPFLAGS := -DCPU_DEBUG #CPPFLAGS := -DCPU_DEBUG
CPPFLAGS := -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
include energia10.mk include energia10.mk

View File

@ -7,10 +7,10 @@
#define CPU_INSTRUCTIONS 1000 #define CPU_INSTRUCTIONS 1000
#define TFT_FG VGA_LIME #define TFT_FG GREEN
#define TFT_BG VGA_BLACK #define TFT_BG BLACK
#define PROGRAMS "/apple1/" #define PROGRAMS "/apple1/"
#define KRUSADER 1 #define KRUSADER
#endif #endif

9
io.cpp
View File

@ -1,6 +1,7 @@
#include <UTFT.h> #include <Stream.h>
#include <stdint.h>
#include <memory.h> #include <memory.h>
#include <utftdisplay.h> #include <tftdisplay.h>
#include <sdtape.h> #include <sdtape.h>
#include <keyboard.h> #include <keyboard.h>
#include <timed.h> #include <timed.h>
@ -16,7 +17,7 @@ static unsigned r, c;
static char screen[ROWS][COLS]; static char screen[ROWS][COLS];
void io::reset() { void io::reset() {
UTFTDisplay::begin(TFT_BG, TFT_FG); TFTDisplay::begin(TFT_BG, TFT_FG);
clear(); clear();
_cy += 2; _cy += 2;
@ -97,7 +98,7 @@ void io::draw(char ch, int i, int j) {
if (screen[j][i] != ch) { if (screen[j][i] != ch) {
screen[j][i] = ch; screen[j][i] = ch;
char c[2] = { ch, 0 }; char c[2] = { ch, 0 };
utft.print(c, i*_cx, j*_cy); drawString(c, i*_cx, j*_cy);
} }
} }

2
io.h
View File

@ -2,7 +2,7 @@
#define _IO_H #define _IO_H
// http://mamedev.org/source/src/mess/machine/apple1.c.html // http://mamedev.org/source/src/mess/machine/apple1.c.html
class io: public UTFTDisplay, Keyboard, public pia { class io: public TFTDisplay, Keyboard, public pia {
public: public:
virtual void reset(); virtual void reset();
virtual void down(uint8_t scan); virtual void down(uint8_t scan);