From 047df76373dfa2ea4d644d82cc3aed9de31e16c3 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sat, 16 Jan 2021 09:53:38 +0800 Subject: [PATCH] move rev 0.1 of the ttgo eink board to eink0.1 --- boards/{eink.json => eink0.1.json} | 2 +- platformio.ini | 12 ++++++------ src/graphics/EInkDisplay.cpp | 1 - variants/{eink => eink0.1}/variant.cpp | 0 variants/{eink => eink0.1}/variant.h | 0 5 files changed, 7 insertions(+), 8 deletions(-) rename boards/{eink.json => eink0.1.json} (97%) rename variants/{eink => eink0.1}/variant.cpp (100%) rename variants/{eink => eink0.1}/variant.h (100%) diff --git a/boards/eink.json b/boards/eink0.1.json similarity index 97% rename from boards/eink.json rename to boards/eink0.1.json index e2414b23f..1c5614896 100644 --- a/boards/eink.json +++ b/boards/eink0.1.json @@ -15,7 +15,7 @@ ], "usb_product": "TTGO_eink", "mcu": "nrf52840", - "variant": "eink", + "variant": "eink0.1", "variants_dir": "variants", "bsp": { "name": "adafruit" diff --git a/platformio.ini b/platformio.ini index 34667d2ca..be9bd710e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [platformio] -default_envs = linux # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here +default_envs = eink0.1 # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here ;default_envs = heltec # lora-relay-v1 # nrf52840dk-geeksville # linux # or if you'd like to change the default to something like lora-relay-v1 put that here [common] @@ -247,15 +247,15 @@ src_filter = ${nrf52_base.src_filter} +<../variants/ppr1> lib_deps = ${arduino_base.lib_deps} -; Prototype eink/nrf52840/sx1262 device -[env:eink] +; First prototype eink/nrf52840/sx1262 device +[env:eink0.1] extends = nrf52_base -board = eink +board = eink0.1 # add our variants files to the include and src paths # define build flags for the TFT_eSPI library -build_flags = ${nrf52_base.build_flags} -Ivariants/eink +build_flags = ${nrf52_base.build_flags} -Ivariants/eink0.1 -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30 -src_filter = ${nrf52_base.src_filter} +<../variants/eink> +src_filter = ${nrf52_base.src_filter} +<../variants/eink0.1> lib_deps = ${arduino_base.lib_deps} https://github.com/geeksville/EPD_Libraries.git diff --git a/src/graphics/EInkDisplay.cpp b/src/graphics/EInkDisplay.cpp index 0d5e8307f..2b530c0cb 100644 --- a/src/graphics/EInkDisplay.cpp +++ b/src/graphics/EInkDisplay.cpp @@ -4,7 +4,6 @@ #include "EInkDisplay.h" #include "SPILock.h" #include "epd1in54.h" // Screen specific library -#include "graphics/configs.h" #include #include // Graphics library and Sprite class diff --git a/variants/eink/variant.cpp b/variants/eink0.1/variant.cpp similarity index 100% rename from variants/eink/variant.cpp rename to variants/eink0.1/variant.cpp diff --git a/variants/eink/variant.h b/variants/eink0.1/variant.h similarity index 100% rename from variants/eink/variant.h rename to variants/eink0.1/variant.h