update

jscrane · Jun 5, 2019 · 7f95f87 · 7f95f87
1 parent fe27f87
commit 7f95f87
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -1,8 +1,7 @@
 t ?= esp32
 
-ifeq ($t, lm4f)
-PROCESSOR_FAMILY := lm4f
-BOARD := lplm4f120h5qr
+ifeq ($t, tivac)
+BOARD := EK-LM4F120XL
 CPPFLAGS = -DHARDWARE_H=\"hw/lm4f-utft.h\"
 LIBRARIES = UTFT
 endif
@@ -11,9 +10,8 @@ ifeq ($t, esp8266)
 BOARD := d1_mini
 UPLOAD_SPEED := 921600
 SPIFFS_IMAGE :=
-FLASH_SIZE := 4M1M
-BUILD_FCPU := 80000000L
-
+FLASH_SIZE := 4M
+F_CPU := 80
 CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER \
  -DTFT_WIDTH=240 -DTFT_HEIGHT=320 \
  -DTFT_CS=PIN_D6 -DTFT_DC=PIN_D8 \
@@ -24,13 +22,11 @@ endif
 ifeq ($t, esp32)
 BOARD := node32s
 UPLOAD_SPEED := 921600
-TERMINAL_SPEED := 115200
 SPIFFS_IMAGE :=
-
 CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER -DTFT_CS=5 -DTFT_DC=2 \
  -DTFT_RST=-1 -DTFT_WIDTH=240 -DTFT_HEIGHT=320 \
  -DSPI_FREQUENCY=40000000 -DLOAD_GLCD
 LIBRARIES = TFT_eSPI FS SPIFFS
 endif
 
-include arduino-$t.mk
+include $t.mk
diff --git a/io.cpp b/io.cpp
@@ -1,5 +1,4 @@
 #include <Arduino.h>
-#include <PS2Keyboard.h>
 #include <r65emu.h>
 
 #include "display.h"

diff --git a/pacman.ino b/pacman.ino
@@ -4,7 +4,6 @@
  */
 #include <stdarg.h>
 #include <SPI.h>
-#include <PS2Keyboard.h>
 #include <r65emu.h>
 #include <ports.h>
 #include <z80.h>