From 82ba59765c4cd172db9a09a493fa9d46bfb5c233 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 29 Mar 2023 13:07:27 +0200 Subject: [PATCH] trunk it baby --- boards/my-esp32s3-diy-oled.json | 24 +++------- boards/my_esp32s3_diy_eink.json | 24 +++------- variants/MakePython_nRF52840_eink/variant.cpp | 27 +++++------- variants/MakePython_nRF52840_oled/variant.cpp | 27 +++++------- variants/MakePython_nRF52840_oled/variant.h | 44 +++++++++---------- variants/my_esp32s3_diy_eink/pins_arduino.h | 20 ++++----- variants/my_esp32s3_diy_eink/variant.h | 29 ++++++------ variants/my_esp32s3_diy_oled/pins_arduino.h | 20 ++++----- variants/my_esp32s3_diy_oled/variant.h | 19 ++++---- 9 files changed, 96 insertions(+), 138 deletions(-) diff --git a/boards/my-esp32s3-diy-oled.json b/boards/my-esp32s3-diy-oled.json index a72a5e1fa..69a24be0e 100644 --- a/boards/my-esp32s3-diy-oled.json +++ b/boards/my-esp32s3-diy-oled.json @@ -1,6 +1,6 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32s3_out.ld", "memory_type": "qio_opi" }, @@ -15,34 +15,22 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", - "hwids": [ - [ - "0x303A", - "0x1001" - ] - ], + "hwids": [["0x303A", "0x1001"]], "mcu": "esp32s3", "variant": "my-esp32s3-diy-oled" }, - "connectivity": [ - "wifi" - ], + "connectivity": ["wifi"], "debug": { "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], + "onboard_tools": ["esp-builtin"], "openocd_target": "esp32s3.cfg" }, - "frameworks": [ - "arduino", - "espidf" - ], + "frameworks": ["arduino", "espidf"], "name": "Clone ESP32-S3-DevKitC-1 v1.1 (16 MB FLASH, 8 MB PSRAM)", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, - "maximum_size": 16777216, + "maximum_size": 16777216, "use_1200bps_touch": true, "wait_for_upload_port": true, "require_upload_port": true, diff --git a/boards/my_esp32s3_diy_eink.json b/boards/my_esp32s3_diy_eink.json index baff689fd..432424f6e 100644 --- a/boards/my_esp32s3_diy_eink.json +++ b/boards/my_esp32s3_diy_eink.json @@ -1,6 +1,6 @@ { "build": { - "arduino":{ + "arduino": { "ldscript": "esp32s3_out.ld", "memory_type": "qio_opi" }, @@ -15,34 +15,22 @@ "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", - "hwids": [ - [ - "0x303A", - "0x1001" - ] - ], + "hwids": [["0x303A", "0x1001"]], "mcu": "esp32s3", "variant": "my_esp32s3_diy_eink" }, - "connectivity": [ - "wifi" - ], + "connectivity": ["wifi"], "debug": { "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], + "onboard_tools": ["esp-builtin"], "openocd_target": "esp32s3.cfg" }, - "frameworks": [ - "arduino", - "espidf" - ], + "frameworks": ["arduino", "espidf"], "name": "Clone ESP32-S3-DevKitC-1 v1.1 (16 MB FLASH, 8 MB PSRAM)", "upload": { "flash_size": "16MB", "maximum_ram_size": 327680, - "maximum_size": 16777216, + "maximum_size": 16777216, "use_1200bps_touch": true, "wait_for_upload_port": true, "require_upload_port": true, diff --git a/variants/MakePython_nRF52840_eink/variant.cpp b/variants/MakePython_nRF52840_eink/variant.cpp index 5b9288319..8c6bf039c 100644 --- a/variants/MakePython_nRF52840_eink/variant.cpp +++ b/variants/MakePython_nRF52840_eink/variant.cpp @@ -16,28 +16,23 @@ */ #include "variant.h" +#include "nrf.h" #include "wiring_constants.h" #include "wiring_digital.h" -#include "nrf.h" -const uint32_t g_ADigitalPinMap[] = - { - // P0 - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, +const uint32_t g_ADigitalPinMap[] = { + // P0 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - // P1 - 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47}; + // P1 + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}; void initVariant() { - // LED1 & LED2 - pinMode(PIN_LED1, OUTPUT); - ledOff(PIN_LED1); + // LED1 & LED2 + pinMode(PIN_LED1, OUTPUT); + ledOff(PIN_LED1); - pinMode(PIN_LED2, OUTPUT); - ledOff(PIN_LED2); + pinMode(PIN_LED2, OUTPUT); + ledOff(PIN_LED2); } diff --git a/variants/MakePython_nRF52840_oled/variant.cpp b/variants/MakePython_nRF52840_oled/variant.cpp index 5b9288319..8c6bf039c 100644 --- a/variants/MakePython_nRF52840_oled/variant.cpp +++ b/variants/MakePython_nRF52840_oled/variant.cpp @@ -16,28 +16,23 @@ */ #include "variant.h" +#include "nrf.h" #include "wiring_constants.h" #include "wiring_digital.h" -#include "nrf.h" -const uint32_t g_ADigitalPinMap[] = - { - // P0 - 0, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, +const uint32_t g_ADigitalPinMap[] = { + // P0 + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, - // P1 - 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47}; + // P1 + 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}; void initVariant() { - // LED1 & LED2 - pinMode(PIN_LED1, OUTPUT); - ledOff(PIN_LED1); + // LED1 & LED2 + pinMode(PIN_LED1, OUTPUT); + ledOff(PIN_LED1); - pinMode(PIN_LED2, OUTPUT); - ledOff(PIN_LED2); + pinMode(PIN_LED2, OUTPUT); + ledOff(PIN_LED2); } diff --git a/variants/MakePython_nRF52840_oled/variant.h b/variants/MakePython_nRF52840_oled/variant.h index ac54c1531..2f4323dd8 100644 --- a/variants/MakePython_nRF52840_oled/variant.h +++ b/variants/MakePython_nRF52840_oled/variant.h @@ -28,8 +28,8 @@ extern "C" { #define RADIOLIB_GODMODE // LEDs -#define PIN_LED1 (32 + 10) // LED P1.15 -#define PIN_LED2 (-1) // +#define PIN_LED1 (32 + 10) // LED P1.15 +#define PIN_LED2 (-1) // #define LED_BUILTIN PIN_LED1 #define LED_CONN PIN_LED2 @@ -37,25 +37,24 @@ extern "C" { #define LED_GREEN PIN_LED1 #define LED_BLUE PIN_LED2 -#define LED_STATE_ON 0 // State when LED is litted +#define LED_STATE_ON 0 // State when LED is litted /* * Buttons */ -#define PIN_BUTTON1 (32 + 15) // P1.15 Built in button +#define PIN_BUTTON1 (32 + 15) // P1.15 Built in button /* * Analog pins */ -#define PIN_A0 (-1) +#define PIN_A0 (-1) static const uint8_t A0 = PIN_A0; #define ADC_RESOLUTION 14 // Other pins -#define PIN_AREF (-1) // AREF Not yet used - +#define PIN_AREF (-1) // AREF Not yet used static const uint8_t AREF = PIN_AREF; @@ -74,11 +73,11 @@ static const uint8_t AREF = PIN_AREF; */ #define SPI_INTERFACES_COUNT 1 -#define PIN_SPI_MISO (0 + 31) // MISO P0.31 -#define PIN_SPI_MOSI (0 + 30) // MOSI P0.30 -#define PIN_SPI_SCK (0 + 29) // SCK P0.29 +#define PIN_SPI_MISO (0 + 31) // MISO P0.31 +#define PIN_SPI_MOSI (0 + 30) // MOSI P0.30 +#define PIN_SPI_SCK (0 + 29) // SCK P0.29 -static const uint8_t SS = (32 + 15); // LORA_CS P1.15 +static const uint8_t SS = (32 + 15); // LORA_CS P1.15 static const uint8_t MOSI = PIN_SPI_MOSI; static const uint8_t MISO = PIN_SPI_MISO; static const uint8_t SCK = PIN_SPI_SCK; @@ -88,22 +87,21 @@ static const uint8_t SCK = PIN_SPI_SCK; */ #define WIRE_INTERFACES_COUNT 1 -#define PIN_WIRE_SDA (0 + 26) // SDA -#define PIN_WIRE_SCL (0 + 27) // SCL +#define PIN_WIRE_SDA (0 + 26) // SDA +#define PIN_WIRE_SCL (0 + 27) // SCL // E-Byte E28 2.4 Ghz LoRa module #define USE_SX1280 -#define LORA_RESET (0 + 5) -#define SX128X_CS (0 + 23) -#define SX128X_DIO1 (0 + 4) -#define SX128X_BUSY (0 + 7) -//#define SX128X_TXEN (32 + 9) -//#define SX128X_RXEN (0 + 12) +#define LORA_RESET (0 + 5) +#define SX128X_CS (0 + 23) +#define SX128X_DIO1 (0 + 4) +#define SX128X_BUSY (0 + 7) +//#define SX128X_TXEN (32 + 9) +//#define SX128X_RXEN (0 + 12) #define SX128X_RESET LORA_RESET - -#define PIN_GPS_EN (-1) -#define PIN_GPS_PPS (-1) // Pulse per second input from the GPS +#define PIN_GPS_EN (-1) +#define PIN_GPS_PPS (-1) // Pulse per second input from the GPS #define GPS_RX_PIN PIN_SERIAL1_RX #define GPS_TX_PIN PIN_SERIAL1_TX @@ -125,7 +123,7 @@ static const uint8_t SCK = PIN_SPI_SCK; #undef AREF_VOLTAGE #define AREF_VOLTAGE 3.0 #define VBAT_AR_INTERNAL AR_INTERNAL_3_0 -#define ADC_MULTIPLIER VBAT_DIVIDER_COMP //REAL_VBAT_MV_PER_LSB +#define ADC_MULTIPLIER VBAT_DIVIDER_COMP // REAL_VBAT_MV_PER_LSB #define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x) #ifdef __cplusplus diff --git a/variants/my_esp32s3_diy_eink/pins_arduino.h b/variants/my_esp32s3_diy_eink/pins_arduino.h index fc71c914d..1f276899c 100644 --- a/variants/my_esp32s3_diy_eink/pins_arduino.h +++ b/variants/my_esp32s3_diy_eink/pins_arduino.h @@ -7,24 +7,22 @@ #define USB_PID 0x1001 #define EXTERNAL_NUM_INTERRUPTS 46 -#define NUM_DIGITAL_PINS 48 -#define NUM_ANALOG_INPUTS 20 +#define NUM_DIGITAL_PINS 48 +#define NUM_ANALOG_INPUTS 20 -#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) -#define digitalPinToInterrupt(p) (((p)<48)?(p):-1) -#define digitalPinHasPWM(p) (p < 46) +#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1) +#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1) +#define digitalPinHasPWM(p) (p < 46) // The default Wire will be mapped to PMU and RTC static const uint8_t SDA = 18; static const uint8_t SCL = 17; // Default SPI will be mapped to Radio -static const uint8_t MISO = 3; -static const uint8_t SCK = 5; -static const uint8_t MOSI = 6; -static const uint8_t SS = 7; - - +static const uint8_t MISO = 3; +static const uint8_t SCK = 5; +static const uint8_t MOSI = 6; +static const uint8_t SS = 7; //#define SPI_MOSI (11) //#define SPI_SCK (14) diff --git a/variants/my_esp32s3_diy_eink/variant.h b/variants/my_esp32s3_diy_eink/variant.h index 20b1c8908..288daf9ff 100644 --- a/variants/my_esp32s3_diy_eink/variant.h +++ b/variants/my_esp32s3_diy_eink/variant.h @@ -8,23 +8,22 @@ //#define USE_SSD1306 -#define I2C_SDA 18 //1 // I2C pins for this board -#define I2C_SCL 17 //2 +#define I2C_SDA 18 // 1 // I2C pins for this board +#define I2C_SCL 17 // 2 //#define LED_PIN 38 // This is a RGB LED not a standard LED -#define BUTTON_PIN 0 // This is the BOOT button +#define BUTTON_PIN 0 // This is the BOOT button #define BUTTON_NEED_PULLUP - //#define USE_RF95 // RFM95/SX127x //#define USE_SX1262 #define USE_SX1280 -#define RF95_MISO 3 -#define RF95_SCK 5 -#define RF95_MOSI 6 -#define RF95_NSS 7 +#define RF95_MISO 3 +#define RF95_SCK 5 +#define RF95_MOSI 6 +#define RF95_NSS 7 #define LORA_RESET 8 #define LORA_DIO1 16 @@ -46,12 +45,12 @@ #endif #define USE_EINK - /* +/* * eink display pins */ -#define PIN_EINK_CS 13 -#define PIN_EINK_BUSY 2 -#define PIN_EINK_DC 1 -#define PIN_EINK_RES (-1) -#define PIN_EINK_SCLK 5 -#define PIN_EINK_MOSI 6 +#define PIN_EINK_CS 13 +#define PIN_EINK_BUSY 2 +#define PIN_EINK_DC 1 +#define PIN_EINK_RES (-1) +#define PIN_EINK_SCLK 5 +#define PIN_EINK_MOSI 6 diff --git a/variants/my_esp32s3_diy_oled/pins_arduino.h b/variants/my_esp32s3_diy_oled/pins_arduino.h index fc71c914d..1f276899c 100644 --- a/variants/my_esp32s3_diy_oled/pins_arduino.h +++ b/variants/my_esp32s3_diy_oled/pins_arduino.h @@ -7,24 +7,22 @@ #define USB_PID 0x1001 #define EXTERNAL_NUM_INTERRUPTS 46 -#define NUM_DIGITAL_PINS 48 -#define NUM_ANALOG_INPUTS 20 +#define NUM_DIGITAL_PINS 48 +#define NUM_ANALOG_INPUTS 20 -#define analogInputToDigitalPin(p) (((p)<20)?(analogChannelToDigitalPin(p)):-1) -#define digitalPinToInterrupt(p) (((p)<48)?(p):-1) -#define digitalPinHasPWM(p) (p < 46) +#define analogInputToDigitalPin(p) (((p) < 20) ? (analogChannelToDigitalPin(p)) : -1) +#define digitalPinToInterrupt(p) (((p) < 48) ? (p) : -1) +#define digitalPinHasPWM(p) (p < 46) // The default Wire will be mapped to PMU and RTC static const uint8_t SDA = 18; static const uint8_t SCL = 17; // Default SPI will be mapped to Radio -static const uint8_t MISO = 3; -static const uint8_t SCK = 5; -static const uint8_t MOSI = 6; -static const uint8_t SS = 7; - - +static const uint8_t MISO = 3; +static const uint8_t SCK = 5; +static const uint8_t MOSI = 6; +static const uint8_t SS = 7; //#define SPI_MOSI (11) //#define SPI_SCK (14) diff --git a/variants/my_esp32s3_diy_oled/variant.h b/variants/my_esp32s3_diy_oled/variant.h index d87c1e985..9eda00791 100644 --- a/variants/my_esp32s3_diy_oled/variant.h +++ b/variants/my_esp32s3_diy_oled/variant.h @@ -8,23 +8,22 @@ #define USE_SSD1306 -#define I2C_SDA 18 //1 // I2C pins for this board -#define I2C_SCL 17 //2 +#define I2C_SDA 18 // 1 // I2C pins for this board +#define I2C_SCL 17 // 2 //#define LED_PIN 38 // This is a RGB LED not a standard LED -#define BUTTON_PIN 0 // This is the BOOT button +#define BUTTON_PIN 0 // This is the BOOT button #define BUTTON_NEED_PULLUP - //#define USE_RF95 // RFM95/SX127x //#define USE_SX1262 #define USE_SX1280 -#define RF95_MISO 3 -#define RF95_SCK 5 -#define RF95_MOSI 6 -#define RF95_NSS 7 +#define RF95_MISO 3 +#define RF95_SCK 5 +#define RF95_MOSI 6 +#define RF95_NSS 7 #define LORA_RESET 8 #define LORA_DIO1 16 @@ -46,12 +45,12 @@ #endif //#define USE_EINK - /* +/* * eink display pins */ //#define PIN_EINK_CS 13 //#define PIN_EINK_BUSY 2 //#define PIN_EINK_DC 1 //#define PIN_EINK_RES (-1) -//#define PIN_EINK_SCLK 5 +//#define PIN_EINK_SCLK 5 //#define PIN_EINK_MOSI 6