diff --git a/boards/m5stack-m5paper.json b/boards/m5stack-m5paper.json index f965d51281..6a10a6d320 100644 --- a/boards/m5stack-m5paper.json +++ b/boards/m5stack-m5paper.json @@ -1,33 +1,32 @@ { - "build": { - "arduino": { - "ldscript": "esp32_out.ld", - "partitions": "default_16MB.csv" - }, - "core": "esp32", - "extra_flags": [ - "-DARDUINO_M5Stack_M5Paper", - "-DBOARD_HAS_PSRAM", - "-mfix-esp32-psram-cache-issue", - "-mfix-esp32-psram-cache-strategy=memw" - ], - "f_cpu": "240000000L", - "f_flash": "80000000L", - "flash_mode": "qio", - "mcu": "esp32", - "variant": "m5stack_m5paper" + "build": { + "arduino": { + "ldscript": "esp32_out.ld", + "partitions": "default_16MB.csv" }, - "connectivity": ["wifi", "bluetooth"], - "frameworks": ["arduino", "espidf"], - "name": " M5Stack M5Paper (16 MB FLASH, 8 MB PSRAM)", - "upload": { - "flash_size": "16MB", - "maximum_ram_size": 327680, - "maximum_size": 16777216, - "require_upload_port": true, - "speed": 460800 - }, - "url": "https://docs.m5stack.com/en/core/m5paper", - "vendor": "M5Stack" - } - \ No newline at end of file + "core": "esp32", + "extra_flags": [ + "-DARDUINO_M5Stack_M5Paper", + "-DBOARD_HAS_PSRAM", + "-mfix-esp32-psram-cache-issue", + "-mfix-esp32-psram-cache-strategy=memw" + ], + "f_cpu": "240000000L", + "f_flash": "80000000L", + "flash_mode": "qio", + "mcu": "esp32", + "variant": "m5stack_m5paper" + }, + "connectivity": ["wifi", "bluetooth"], + "frameworks": ["arduino", "espidf"], + "name": " M5Stack M5Paper (16 MB FLASH, 8 MB PSRAM)", + "upload": { + "flash_size": "16MB", + "maximum_ram_size": 327680, + "maximum_size": 16777216, + "require_upload_port": true, + "speed": 460800 + }, + "url": "https://docs.m5stack.com/en/core/m5paper", + "vendor": "M5Stack" +} diff --git a/variants/m5stack_m5paper/pins_arduino.h b/variants/m5stack_m5paper/pins_arduino.h index 322cc88317..7147a1f3b7 100644 --- a/variants/m5stack_m5paper/pins_arduino.h +++ b/variants/m5stack_m5paper/pins_arduino.h @@ -25,7 +25,6 @@ static const uint8_t MOSI = 12; static const uint8_t MISO = 13; static const uint8_t SCK = 14; - static const uint8_t G0 = 0; static const uint8_t G1 = 1; static const uint8_t G2 = 2; @@ -53,7 +52,6 @@ static const uint8_t G37 = 37; static const uint8_t G38 = 38; static const uint8_t G39 = 39; - static const uint8_t DAC1 = 25; static const uint8_t DAC2 = 26; diff --git a/variants/m5stack_m5paper/variant.h b/variants/m5stack_m5paper/variant.h index 93eb1183d5..5eaeb96fda 100644 --- a/variants/m5stack_m5paper/variant.h +++ b/variants/m5stack_m5paper/variant.h @@ -1,9 +1,9 @@ #include "pcf8563.h" -//#define LED_PIN -1 +// #define LED_PIN -1 -#define I2C_SDA 21 -#define I2C_SCL 22 +#define I2C_SDA 21 +#define I2C_SCL 22 // PCF8563 RTC Module #define HAS_RTC 1 @@ -24,12 +24,12 @@ #define ADC_MULTIPLIER 2 #define DEFAULT_VREF 3600 -//Wheel -// Down 37 -// Push 38 -// Up 39 +// Wheel +// Down 37 +// Push 38 +// Up 39 -//#define BUTTON_NEED_PULLUP +// #define BUTTON_NEED_PULLUP #define BUTTON_PIN 38 // #undef RF95_SCK @@ -40,10 +40,10 @@ // #define RF95_SCK 18 //13 // #define RF95_MISO 34 //26 -// #define RF95_MOSI 23 //25 -// #define RF95_NSS 14 -// #define LORA_DIO0 25 -// #define LORA_RESET 26 +// #define RF95_MOSI 23 //25 +// #define RF95_NSS 14 +// #define LORA_DIO0 25 +// #define LORA_RESET 26 // #define LORA_DIO1 RADIOLIB_NC // #define LORA_DIO2 RADIOLIB_NC @@ -62,16 +62,16 @@ #define HAS_EINK 1 #define USE_EINK -#define PIN_EINK_MOSI SPI_MOSI // EPD_MOSI -#define PIN_EINK_MISO SPI_MISO // EPD_MISO -#define PIN_EINK_SCLK SPI_SCK // EPD_SCLK -#define PIN_EINK_CS 15 // EPD_CS -#define PIN_EINK_BUSY 27 // EPD_BUSY +#define PIN_EINK_MOSI SPI_MOSI // EPD_MOSI +#define PIN_EINK_MISO SPI_MISO // EPD_MISO +#define PIN_EINK_SCLK SPI_SCK // EPD_SCLK +#define PIN_EINK_CS 15 // EPD_CS +#define PIN_EINK_BUSY 27 // EPD_BUSY -#define PIN_EINK_EN -1 -#define PIN_EINK_DC -1 // EPD_D/C -#define PIN_EINK_RES -1 // EPD RES +#define PIN_EINK_EN -1 +#define PIN_EINK_DC -1 // EPD_D/C +#define PIN_EINK_RES -1 // EPD RES -#define M5EPD_MAIN_PWR_PIN 2 +#define M5EPD_MAIN_PWR_PIN 2 #define M5EPD_EXT_PWR_EN_PIN 5 #define M5EPD_EPD_PWR_EN_PIN 23