david.tahir/QuadMeUp_Crossbow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Basic buttons framework fixes

Browse Source
This commit is contained in:
Pawel Spychalski (DzikuVx)
2018-05-14 17:21:07 +02:00
parent b5cc91c814
commit 9f21d2b493
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crossbow/crossbow.ino
View File

@@ -19,15 +19,15 @@ Copyright (c) 20xx, MPL Contributor1 contrib1@example.net
#define LORA_RST_PIN 4 #define LORA_RST_PIN 4
#define LORA_DI0_PIN 7 #define LORA_DI0_PIN 7
#define BUTTON_0_PIN 11 #define BUTTON_0_PIN 9
#define BUTTON_1_PIN 12 #define BUTTON_1_PIN 10
#elif defined(ARDUINO_SAMD_FEATHER_M0) #elif defined(ARDUINO_SAMD_FEATHER_M0)
#define LORA_SS_PIN 8 #define LORA_SS_PIN 8
#define LORA_RST_PIN 4 #define LORA_RST_PIN 4
#define LORA_DI0_PIN 3 #define LORA_DI0_PIN 3
#define BUTTON_0_PIN 11 //Please verify #define BUTTON_0_PIN 9 //Please verify
#define BUTTON_1_PIN 12 //Please verify #define BUTTON_1_PIN 10 //Please verify
#else #else
#error please select hardware #error please select hardware
#endif #endif
@@ -216,11 +216,7 @@ void setup(void)
LORA_DI0_PIN LORA_DI0_PIN
); );
if (!LoRa.begin(getFrequencyForChannel(radioState.channel))) if (!LoRa.begin(getFrequencyForChannel(radioState.channel))) {
{
#ifdef DEBUG_SERIAL
Serial.println("LoRa init failed. Check your connections.");
#endif
while (true); while (true);
} }
@@ -390,28 +386,14 @@ void loop(void)
//In the beginning just keep jumping forward and try to resync over lost single frames //In the beginning just keep jumping forward and try to resync over lost single frames
if (radioState.failedDwellsCount < 6 && radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME < currentMillis) { if (radioState.failedDwellsCount < 6 && radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME < currentMillis) {
radioState.failedDwellsCount++; radioState.failedDwellsCount++;
#ifdef DEBUG_SERIAL
Serial.print("Sync forward on ch ");
Serial.print(radioState.channel);
Serial.print(" number ");
Serial.println(radioState.failedDwellsCount);
#endif
hopFrequency(&radioState, true, radioState.channel, radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME); hopFrequency(&radioState, true, radioState.channel, radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME);
LoRa.receive(); LoRa.receive();
} }
// If we are loosing more frames, start jumping in the opposite direction since probably we are completely out of sync now // If we are loosing more frames, start jumping in the opposite direction since probably we are completely out of sync now
if (radioState.failedDwellsCount >= 6 && radioState.channelEntryMillis + (RX_CHANNEL_DWELL_TIME * 5) < currentMillis) { if (radioState.failedDwellsCount >= 6 && radioState.channelEntryMillis + (RX_CHANNEL_DWELL_TIME * 5) < currentMillis) {
hopFrequency(&radioState, false, radioState.channel, radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME); //Start jumping in opposite direction to resync hopFrequency(&radioState, false, radioState.channel, radioState.channelEntryMillis + RX_CHANNEL_DWELL_TIME); //Start jumping in opposite direction to resync
LoRa.receive(); LoRa.receive();
#ifdef DEBUG_SERIAL
Serial.println("Sync backward");
#endif
} }
#endif #endif