mirror of
https://github.com/meshtastic/firmware.git
synced 2025-10-05 22:42:08 +00:00
Compare commits
No commits in common. "98411d408a3a57436a61122629627ddff447d8c1" and "ecd9f015d8f079a0170a06afdc1243655f5867db" have entirely different histories.
98411d408a
...
ecd9f015d8
@ -50,4 +50,5 @@
|
|||||||
},
|
},
|
||||||
"url": "https://heltec.org/project/meshpocket/",
|
"url": "https://heltec.org/project/meshpocket/",
|
||||||
"vendor": "Heltec"
|
"vendor": "Heltec"
|
||||||
}
|
}
|
||||||
|
|
@ -93,8 +93,8 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/nic
|
|||||||
; Common libs for communicating over TCP/IP networks such as MQTT
|
; Common libs for communicating over TCP/IP networks such as MQTT
|
||||||
[networking_base]
|
[networking_base]
|
||||||
lib_deps =
|
lib_deps =
|
||||||
# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
|
# renovate: datasource=custom.pio depName=PubSubClient packageName=knolleary/library/PubSubClient
|
||||||
thingsboard/TBPubSubClient@2.12.1
|
knolleary/PubSubClient@2.8
|
||||||
# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
|
# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
|
||||||
arduino-libraries/NTPClient@3.2.1
|
arduino-libraries/NTPClient@3.2.1
|
||||||
# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
|
# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
|
||||||
|
@ -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()
|
||||||
|
@ -281,7 +281,7 @@ struct PubSubConfig {
|
|||||||
#if HAS_NETWORKING
|
#if HAS_NETWORKING
|
||||||
bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &client)
|
bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &client)
|
||||||
{
|
{
|
||||||
pubSub.setBufferSize(1024, 1024);
|
pubSub.setBufferSize(1024);
|
||||||
pubSub.setClient(client);
|
pubSub.setClient(client);
|
||||||
pubSub.setServer(config.serverAddr.c_str(), config.serverPort);
|
pubSub.setServer(config.serverAddr.c_str(), config.serverPort);
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -9,3 +9,5 @@ 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};
|
||||||
|
|
||||||
|
|
||||||
|
@ -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,22 +73,24 @@ 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
|
||||||
@ -110,7 +112,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
|
||||||
@ -129,4 +131,5 @@ No longer populated on PCB
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
Reference in New Issue
Block a user