pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-02-26 22:33:24 +00:00
Code Issues Actions4 Packages Projects Releases Wiki Activity

Merge branch 'master' into Heltec-V1

Browse Source
This commit is contained in:
Ben Meadors 2022-01-01 14:11:52 -06:00 committed by GitHub
commit de1d5d61ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions

3
.gitignore vendored
View File

@ -23,3 +23,6 @@ flash.uf2
cmake-build* cmake-build*
__pycache__ __pycache__
*.swp
*.swo
*~

BIN
bin/.promote-release.sh.swp
View File

Binary file not shown.

1
src/configuration.h
View File

@ -244,6 +244,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define BUTTON_PIN 39 // The middle button GPIO on the T-Beam #define BUTTON_PIN 39 // The middle button GPIO on the T-Beam
#define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Plugin (#975). #define EXT_NOTIFY_OUT 12 // Overridden default pin to use for Ext Notify Plugin (#975).
#define LED_PIN 2 // add status LED (compatible with core-pcb and DIY targets)
#define LORA_DIO0 26 // a No connect on the SX1262/SX1268 module #define LORA_DIO0 26 // a No connect on the SX1262/SX1268 module
#define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268 #define LORA_RESET 23 // RST for SX1276, and for SX1262/SX1268

2
src/mqtt/MQTT.cpp
View File

@ -95,7 +95,7 @@ void MQTT::reconnect()
} }
pubSub.setServer(serverAddr, serverPort); pubSub.setServer(serverAddr, serverPort);
DEBUG_MSG("Connecting to MQTT server %s, port: %d, username: %s, password %s\n", serverAddr, serverPort, mqttUsername, mqttPassword); DEBUG_MSG("Connecting to MQTT server %s, port: %d, username: %s, password: %s\n", serverAddr, serverPort, mqttUsername, mqttPassword);
auto myStatus = (statusTopic + owner.id); auto myStatus = (statusTopic + owner.id);
bool connected = pubSub.connect(owner.id, mqttUsername, mqttPassword, myStatus.c_str(), 1, true, "offline"); bool connected = pubSub.connect(owner.id, mqttUsername, mqttPassword, myStatus.c_str(), 1, true, "offline");
if (connected) { if (connected) {