From 1905c9d21c2bfc09b7f76139d23bcc56028b7b88 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Wed, 5 Jun 2019 17:18:24 +0100 Subject: [PATCH] update --- Makefile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index afc37f6..1572e2e 100644 --- a/Makefile +++ b/Makefile @@ -1,17 +1,11 @@ t ?= esp32 -ifeq ($t, avr) -BOARD := uno -CPPFLAGS := -DNO_CHECKPOINT -DNO_DISPLAY_BUFFER -DHARDWARE_H=\"hw/blank.h\" -endif - ifeq ($t, esp8266) BOARD := d1_mini UPLOAD_SPEED := 921600 SPIFFS_DIR := programs FLASH_SIZE := 4M1M -BUILD_FCPU := 80000000L - +F_CPU := 80 CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER \ -DTFT_WIDTH=240 -DTFT_HEIGHT=320 \ -DTFT_CS=PIN_D6 -DTFT_DC=PIN_D8 \ @@ -19,9 +13,8 @@ CPPFLAGS = -DUSER_SETUP_LOADED -DILI9341_DRIVER \ LIBRARIES := TFT_eSPI endif -ifeq ($t, lm4f) -PROCESSOR_FAMILY := lm4f -BOARD := lplm4f120h5qr +ifeq ($t, tivac) +BOARD := EK-LM4F120XL CPPFLAGS := -DDEBUGGING -DHARDWARE_H=\"hw/lm4f-utft-sd.h\" LIBRARIES := UTFT SD SpiRAM endif @@ -29,9 +22,7 @@ endif ifeq ($t, esp32) BOARD := node32s UPLOAD_SPEED := 921600 -TERM_SPEED := 115200 SPIFFS_DIR := programs - CPPFLAGS = -DDEBUGGING -DCPU_DEBUG \ -DUSER_SETUP_LOADED -DILI9341_DRIVER -DTFT_CS=5 -DTFT_DC=2 \ -DTFT_RST=-1 -DTFT_WIDTH=240 -DTFT_HEIGHT=320 \ @@ -39,4 +30,4 @@ CPPFLAGS = -DDEBUGGING -DCPU_DEBUG \ LIBRARIES = TFT_eSPI FS SPIFFS endif -include arduino-$t.mk +include $t.mk