pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 09:42:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:meshtastic/firmware

Browse Source
This commit is contained in:
Thomas Göttgens 2022-11-03 22:32:27 +01:00
commit 20c559382d
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/ExternalNotificationModule.cpp
View File

@ -116,9 +116,6 @@ ExternalNotificationModule::ExternalNotificationModule()
: SinglePortModule("ExternalNotificationModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread(
"ExternalNotificationModule")
{
// restrict to the admin channel for rx
boundChannel = Channels::gpioChannel;
/*
Uncomment the preferences below if you want to use the module
without having to configure it from the PythonAPI or WebUI.
@ -132,6 +129,11 @@ ExternalNotificationModule::ExternalNotificationModule()
// moduleConfig.external_notification.output_ms = 1000;
// moduleConfig.external_notification.output = 13;
if (moduleConfig.external_notification.alert_message) {
// restrict to the gpio channel for rx
boundChannel = Channels::gpioChannel;
}
if (moduleConfig.external_notification.enabled) {
DEBUG_MSG("Initializing External Notification Module\n");

32
variants/feather_diy/variant.h
View File

@ -43,11 +43,11 @@ extern "C" {
#define WIRE_INTERFACES_COUNT 1
#define PIN_WIRE_SDA 22
#define PIN_WIRE_SCL 23
#define PIN_WIRE_SDA (0 + 12) //P0.12 22
#define PIN_WIRE_SCL (0 + 11) //P0.12 23
#define PIN_LED1 3
#define PIN_LED2 4
#define PIN_LED1 (32 + 15) //P1.15 3
#define PIN_LED2 (32 + 10) //P1.10 4
#define LED_BUILTIN PIN_LED1
@ -56,29 +56,29 @@ extern "C" {
#define LED_STATE_ON 1 // State when LED is litted
#define BUTTON_PIN 7
#define BUTTON_PIN (32 + 2) //P1.02 7
/*
* Serial interfaces
*/
#define PIN_SERIAL1_RX 1
#define PIN_SERIAL1_TX 0
#define PIN_SERIAL1_RX (0 + 24) //P0.24 1
#define PIN_SERIAL1_TX (0 + 25) //P0.25 0
#define PIN_SERIAL2_RX (-1)
#define PIN_SERIAL2_TX (-1)
#define SPI_INTERFACES_COUNT 1
#define PIN_SPI_MISO 24
#define PIN_SPI_MOSI 25
#define PIN_SPI_SCK 26
#define PIN_SPI_MISO (0 + 15) //P0.15 24
#define PIN_SPI_MOSI (0 + 13) //P0.13 25
#define PIN_SPI_SCK (0 + 14) //P0.14 26
#define SS 2
#define LORA_DIO0 -1 // a No connect on the SX1262/SX1268 module
#define LORA_RESET 13 // RST for SX1276, and for SX1262/SX1268
#define LORA_DIO1 11 // IRQ for SX1262/SX1268
#define LORA_DIO2 12 // BUSY for SX1262/SX1268
#define LORA_RESET (32 + 9) //P1.09 13 // RST for SX1276, and for SX1262/SX1268
#define LORA_DIO1 (0 + 6) //P0.06 11 // IRQ for SX1262/SX1268
#define LORA_DIO2 (0 + 8) //P0.08 12 // BUSY for SX1262/SX1268
#define LORA_DIO3 // Not connected on PCB, but internally on the TTGO SX1262/SX1268, if DIO3 is high the TXCO is enabled
#define RF95_SCK SCK
@ -87,7 +87,7 @@ extern "C" {
#define RF95_NSS SS
// enables 3.3V periphery like GPS or IO Module
#define PIN_3V3_EN (34)
#define PIN_3V3_EN (-1)
#undef USE_EINK
@ -99,8 +99,8 @@ extern "C" {
#define SX126X_DIO1 LORA_DIO1
#define SX126X_BUSY LORA_DIO2
#define SX126X_RESET LORA_RESET
#define SX126X_RXEN 10
#define SX126X_TXEN 9
#define SX126X_RXEN (0 + 27) //P0.27 10
#define SX126X_TXEN (0 + 26) //P0.26 9
#ifdef EBYTE_E22
// Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch