Compare commits

...

3 Commits

Author SHA1 Message Date
Ben Meadors
9879494fc6 Bump version for release 2022-04-29 07:23:08 -05:00
Ben Meadors
5088940751 Set tx/rx en correctly as well as rf ant switch (#1420) 2022-04-28 20:11:03 -05:00
Ben Meadors
888af31d4f Add extensions to gitignore 2022-04-28 06:58:59 -05:00
3 changed files with 14 additions and 8 deletions

1
.gitignore vendored
View File

@@ -29,3 +29,4 @@ __pycache__
venv/ venv/
release/ release/
.vscode/extensions.json

View File

@@ -65,7 +65,7 @@ bool SX126xInterface<T>::init()
#ifdef SX126X_TXEN #ifdef SX126X_TXEN
// lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
if (res == ERR_NONE) if (res == ERR_NONE)
res = lora.setDio2AsRfSwitch(false); res = lora.setDio2AsRfSwitch(true);
#endif #endif
#if 0 #if 0
@@ -129,9 +129,6 @@ bool SX126xInterface<T>::reconfigure()
err = lora.setSyncWord(syncWord); err = lora.setSyncWord(syncWord);
assert(err == ERR_NONE); assert(err == ERR_NONE);
err = lora.setCurrentLimit(currentLimit);
assert(err == ERR_NONE);
err = lora.setPreambleLength(preambleLength); err = lora.setPreambleLength(preambleLength);
assert(err == ERR_NONE); assert(err == ERR_NONE);
@@ -143,7 +140,7 @@ bool SX126xInterface<T>::reconfigure()
power = 22; power = 22;
err = lora.setOutputPower(power); err = lora.setOutputPower(power);
assert(err == ERR_NONE); assert(err == ERR_NONE);
startReceive(); // restart receiving startReceive(); // restart receiving
return ERR_NONE; return ERR_NONE;
@@ -191,7 +188,11 @@ void SX126xInterface<T>::addReceiveMetadata(MeshPacket *mp)
template<typename T> template<typename T>
void SX126xInterface<T>::configHardwareForSend() void SX126xInterface<T>::configHardwareForSend()
{ {
#ifdef SX126X_TXEN // we have RXEN/TXEN control - turn on TX power / off RX power // If we have RXEN/TXEN control - turn on TX power / off RX power
#ifdef SX126X_RXEN
digitalWrite(SX126X_RXEN, LOW);
#endif
#ifdef SX126X_TXEN
digitalWrite(SX126X_TXEN, HIGH); digitalWrite(SX126X_TXEN, HIGH);
#endif #endif
@@ -210,7 +211,11 @@ void SX126xInterface<T>::startReceive()
setStandby(); setStandby();
#ifdef SX126X_RXEN // we have RXEN/TXEN control - turn on RX power / off TX power // If we have RXEN/TXEN control - turn on RX power / off TX power
#ifdef SX126X_TXEN
digitalWrite(SX126X_TXEN, LOW);
#endif
#ifdef SX126X_RXEN
digitalWrite(SX126X_RXEN, HIGH); digitalWrite(SX126X_RXEN, HIGH);
#endif #endif

View File

@@ -1,4 +1,4 @@
[VERSION] [VERSION]
major = 1 major = 1
minor = 2 minor = 2
build = 62 build = 63