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 pull request #747 from vfurman-gh/master

Browse Source 
Removed SX1262_USE_DIO3_FOR_TCXO
This commit is contained in:
Kevin Hester 2021-03-20 10:01:42 +08:00 committed by GitHub
commit 620d336e55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -67,7 +67,7 @@ Router *router = NULL; // Users of router don't care what sort of subclass imple
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Application // Application
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
#if WIRE_INTERFACES_COUNT > 0 #ifndef NO_WIRE
void scanI2Cdevice(void) void scanI2Cdevice(void)
{ {
byte err, addr; byte err, addr;
@ -364,7 +364,7 @@ void setup()
#ifdef I2C_SDA #ifdef I2C_SDA
Wire.begin(I2C_SDA, I2C_SCL); Wire.begin(I2C_SDA, I2C_SCL);
#elif WIRE_INTERFACES_COUNT > 0 #elif !defined(NO_WIRE)
Wire.begin(); Wire.begin();
#endif #endif

2
src/mesh/SX1262Interface.cpp
View File

@ -34,7 +34,7 @@ bool SX1262Interface::init()
pinMode(SX1262_TXEN, OUTPUT); pinMode(SX1262_TXEN, OUTPUT);
#endif #endif
#if !defined(SX1262_E22) && !defined(SX1262_USE_DIO3_FOR_TCXO) #ifndef SX1262_E22
float tcxoVoltage = 0; // None - we use an XTAL float tcxoVoltage = 0; // None - we use an XTAL
#else #else
// Use DIO3 to power tcxo per https://github.com/jgromes/RadioLib/issues/12#issuecomment-520695575 // Use DIO3 to power tcxo per https://github.com/jgromes/RadioLib/issues/12#issuecomment-520695575

2
src/nrf52/main-nrf52.cpp
View File

@ -155,7 +155,7 @@ void nrf52Setup() {
void cpuDeepSleep(uint64_t msecToWake) { void cpuDeepSleep(uint64_t msecToWake) {
// FIXME, configure RTC or button press to wake us // FIXME, configure RTC or button press to wake us
// FIXME, power down SPI, I2C, RAMs // FIXME, power down SPI, I2C, RAMs
#if WIRE_INTERFACES_COUNT > 0 #ifndef NO_WIRE
Wire.end(); Wire.end();
#endif #endif
SPI.end(); SPI.end();

4
variants/lora_isp4520/variant.h
View File

@ -91,7 +91,9 @@
#define BATTERY_PIN 3 #define BATTERY_PIN 3
#define ADC_MULTIPLIER 1.436 #define ADC_MULTIPLIER 1.436
#define SX1262_USE_DIO3_FOR_TCXO #define SX1262_E22 // Not really an E22 but this board clones using DIO3 for tcxo control
#define NO_WIRE
#define NO_GPS #define NO_GPS
#define NO_SCREEN #define NO_SCREEN
#endif #endif