Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy Wireless Paper variant files #4238

Merged
merged 3 commits into from
Jul 6, 2024
Merged

Tidy Wireless Paper variant files #4238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ff7d16
Quick tidy of pins_arduino.h
todd-herbert Jul 6, 2024
3eb3de9
Tidy variant.h
todd-herbert Jul 6, 2024
5fa5b81
Change deprecated ADC attenuation parameter
todd-herbert Jul 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions variants/heltec_wireless_paper/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

#include <stdint.h>

#define WIFI_Kit_32 true
#define DISPLAY_HEIGHT 64
#define DISPLAY_WIDTH 128

static const uint8_t LED_BUILTIN = 35;
static const uint8_t LED_BUILTIN = 18;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN

Expand Down Expand Up @@ -65,6 +61,6 @@ static const uint8_t LED = 18;

static const uint8_t RST_LoRa = 12;
static const uint8_t BUSY_LoRa = 13;
static const uint8_t DIO0 = 14;
static const uint8_t DIO1 = 14;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This constant actually isn't used by Meshtastic code-base. Board schematic does show DIO1 connected to GPIO14 though, not DIO0.


#endif /* Pins_Arduino_h */
28 changes: 11 additions & 17 deletions variants/heltec_wireless_paper/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,41 @@
#define LED_PIN 18
#define BUTTON_PIN 0

// Enable bus for external periherals
// I2C
#define I2C_SDA SDA
#define I2C_SCL SCL

// Display (E-Ink)
#define USE_EINK

/*
* eink display pins
*/
#define PIN_EINK_CS 4
#define PIN_EINK_BUSY 7
#define PIN_EINK_DC 5
#define PIN_EINK_RES 6
#define PIN_EINK_SCLK 3
#define PIN_EINK_MOSI 2

/*
* SPI interfaces
*/
// SPI
#define SPI_INTERFACES_COUNT 2
#define PIN_SPI_MISO 10 // MISO
#define PIN_SPI_MOSI 11 // MOSI
#define PIN_SPI_SCK 9 // SCK

#define PIN_SPI_MISO 10 // MISO P0.17
#define PIN_SPI_MOSI 11 // MOSI P0.15
#define PIN_SPI_SCK 9 // SCK P0.13

#define VEXT_ENABLE 45 // active low, powers the oled display and the lora antenna boost
#define BUTTON_PIN 0

// Power
#define VEXT_ENABLE 45 // Active low, powers the E-Ink display
#define ADC_CTRL 19
#define BATTERY_PIN 20
#define ADC_CHANNEL ADC2_GPIO20_CHANNEL
#define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1
#define BAT_MEASURE_ADC_UNIT 2 // Use ADC2
#define ADC_ATTENUATION ADC_ATTEN_DB_11 // Voltage divider output is quite high
#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ADC_ATTEN_DB_11 is now deprecated; identical to ADC_ATTEN_DB_12. This change removes compiler warning.


// LoRa
#define USE_SX1262

#define LORA_DIO0 -1 // a No connect on the SX1262 module
#define LORA_RESET 12
#define LORA_DIO1 14 // SX1262 IRQ
#define LORA_DIO2 13 // SX1262 BUSY
#define LORA_DIO3 // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled

#define LORA_SCK 9
#define LORA_MISO 11
Expand Down
8 changes: 2 additions & 6 deletions variants/heltec_wireless_paper_v1/pins_arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@

#include <stdint.h>

#define WIFI_Kit_32 true
#define DISPLAY_HEIGHT 64
#define DISPLAY_WIDTH 128

static const uint8_t LED_BUILTIN = 35;
static const uint8_t LED_BUILTIN = 18;
#define BUILTIN_LED LED_BUILTIN // backward compatibility
#define LED_BUILTIN LED_BUILTIN

Expand Down Expand Up @@ -65,6 +61,6 @@ static const uint8_t LED = 18;

static const uint8_t RST_LoRa = 12;
static const uint8_t BUSY_LoRa = 13;
static const uint8_t DIO0 = 14;
static const uint8_t DIO1 = 14;

#endif /* Pins_Arduino_h */
28 changes: 11 additions & 17 deletions variants/heltec_wireless_paper_v1/variant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,47 +1,41 @@
#define LED_PIN 18
#define BUTTON_PIN 0

// Enable bus for external periherals
// I2C
#define I2C_SDA SDA
#define I2C_SCL SCL

// Display (E-Ink)
#define USE_EINK

/*
* eink display pins
*/
#define PIN_EINK_CS 4
#define PIN_EINK_BUSY 7
#define PIN_EINK_DC 5
#define PIN_EINK_RES 6
#define PIN_EINK_SCLK 3
#define PIN_EINK_MOSI 2

/*
* SPI interfaces
*/
// SPI
#define SPI_INTERFACES_COUNT 2
#define PIN_SPI_MISO 10 // MISO
#define PIN_SPI_MOSI 11 // MOSI
#define PIN_SPI_SCK 9 // SCK

#define PIN_SPI_MISO 10 // MISO P0.17
#define PIN_SPI_MOSI 11 // MOSI P0.15
#define PIN_SPI_SCK 9 // SCK P0.13

#define VEXT_ENABLE 45 // active low, powers the oled display and the lora antenna boost
#define BUTTON_PIN 0

// Power
#define VEXT_ENABLE 45 // Active low, powers the E-Ink display
#define ADC_CTRL 19
#define BATTERY_PIN 20
#define ADC_CHANNEL ADC2_GPIO20_CHANNEL
#define ADC_MULTIPLIER 2 // Voltage divider is roughly 1:1
#define BAT_MEASURE_ADC_UNIT 2 // Use ADC2
#define ADC_ATTENUATION ADC_ATTEN_DB_11 // Voltage divider output is quite high
#define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high

// LoRa
#define USE_SX1262

#define LORA_DIO0 -1 // a No connect on the SX1262 module
#define LORA_RESET 12
#define LORA_DIO1 14 // SX1262 IRQ
#define LORA_DIO2 13 // SX1262 BUSY
#define LORA_DIO3 // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TXCO is enabled

#define LORA_SCK 9
#define LORA_MISO 11
Expand Down
Loading