rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-22 18:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Trunk fixes for heltec mesh pocket. (#6588)

Browse Source 
https://github.com/meshtastic/firmware/pull/6533 was merged
without running trunk. This patch fixes the newly introduced
trunk errors.
This commit is contained in:
Tom Fifield
2025-04-16 07:37:09 +10:00
committed by GitHub
parent 040a34fca8
commit 98411d408a
7 changed files with 79 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boards/heltec_mesh_pocket.json
View File

@@ -50,5 +50,4 @@
}, },
"url": "https://heltec.org/project/meshpocket/", "url": "https://heltec.org/project/meshpocket/",
"vendor": "Heltec" "vendor": "Heltec"
} }

2
src/graphics/EInkDisplay2.cpp
View File

@@ -219,7 +219,7 @@ bool EInkDisplay::connect()
} }
#elif defined(HELTEC_MESH_POCKET) #elif defined(HELTEC_MESH_POCKET)
{ {
spi1=&SPI1; spi1 = &SPI1;
spi1->begin(); spi1->begin();
// VExt already enabled in setup() // VExt already enabled in setup()
// RTC GPIO hold disabled in setup() // RTC GPIO hold disabled in setup()

2
variants/heltec_mesh_pocket/nicheGraphics.h
View File

@@ -34,7 +34,7 @@ void setupNicheGraphics()
// SPI // SPI
// ----------------------------- // -----------------------------
SPIClass *spi1=&SPI1; SPIClass *spi1 = &SPI1;
spi1->begin(); spi1->begin();
// Display is connected to SPI1 // Display is connected to SPI1

2
variants/heltec_mesh_pocket/variant.cpp
View File

@@ -9,5 +9,3 @@ const uint32_t g_ADigitalPinMap[] = {
// P1 // P1
32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47}; 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};

17
variants/heltec_mesh_pocket/variant.h
View File

@@ -49,8 +49,8 @@ No longer populated on PCB
*/ */
#define WIRE_INTERFACES_COUNT 1 #define WIRE_INTERFACES_COUNT 1
#define PIN_WIRE_SDA (32+15) #define PIN_WIRE_SDA (32 + 15)
#define PIN_WIRE_SCL (32+13) #define PIN_WIRE_SCL (32 + 13)
/* /*
* Lora radio * Lora radio
@@ -73,24 +73,22 @@ No longer populated on PCB
// Display (E-Ink) // Display (E-Ink)
#define PIN_EINK_CS 24 #define PIN_EINK_CS 24
#define PIN_EINK_BUSY 32+6 #define PIN_EINK_BUSY 32 + 6
#define PIN_EINK_DC 31 #define PIN_EINK_DC 31
#define PIN_EINK_RES 32+4 #define PIN_EINK_RES 32 + 4
#define PIN_EINK_SCLK 22 #define PIN_EINK_SCLK 22
#define PIN_EINK_MOSI 20 #define PIN_EINK_MOSI 20
#define PIN_SPI1_MISO -1 #define PIN_SPI1_MISO -1
#define PIN_SPI1_MOSI PIN_EINK_MOSI #define PIN_SPI1_MOSI PIN_EINK_MOSI
#define PIN_SPI1_SCK PIN_EINK_SCLK #define PIN_SPI1_SCK PIN_EINK_SCLK
/* /*
* GPS pins * GPS pins
*/ */
#define PIN_SERIAL1_RX 32+5 #define PIN_SERIAL1_RX 32 + 5
#define PIN_SERIAL1_TX 32+7 #define PIN_SERIAL1_TX 32 + 7
/* /*
* SPI Interfaces * SPI Interfaces
@@ -112,7 +110,7 @@ No longer populated on PCB
// it is defined in the anlaolgue pin section of this file // it is defined in the anlaolgue pin section of this file
// and has 12 bit resolution // and has 12 bit resolution
#define ADC_CTRL 32+2 #define ADC_CTRL 32 + 2
#define ADC_CTRL_ENABLED HIGH #define ADC_CTRL_ENABLED HIGH
#define BATTERY_PIN 29 #define BATTERY_PIN 29
#define ADC_RESOLUTION 14 #define ADC_RESOLUTION 14
@@ -131,5 +129,4 @@ No longer populated on PCB
} }
#endif #endif
#endif #endif