From a0bf9a34b3299983ab952aea90047ff91c8b5602 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Tue, 10 Jan 2023 18:12:40 +0100 Subject: [PATCH] Cleanup --- Config.h | 2 +- Console.h | 48 +-------------------------------------------- RNode_Firmware.ino | 2 +- Release/spiffs.bin | Bin 2031616 -> 2031616 bytes 4 files changed, 3 insertions(+), 49 deletions(-) diff --git a/Config.h b/Config.h index 21b2f6b..5878bd7 100644 --- a/Config.h +++ b/Config.h @@ -201,7 +201,7 @@ #define HAS_CONSOLE true #define HAS_PMU true #define HAS_NP true - #define HAS_SD true + #define HAS_SD false const int pin_cs = 18; const int pin_reset = 23; const int pin_dio = 26; diff --git a/Console.h b/Console.h index 1e5f1e8..12fd046 100644 --- a/Console.h +++ b/Console.h @@ -160,50 +160,4 @@ void console_loop(){ // Internally, this yields the thread and allows // other tasks to run. delay(2); -} - -// void listDir(fs::FS &fs, const char * dirname, uint8_t levels){ -// Serial.printf("Listing directory: %s\r\n", dirname); - -// File root = fs.open(dirname); -// if(!root){ -// Serial.println("- failed to open directory"); -// return; -// } -// if(!root.isDirectory()){ -// Serial.println(" - not a directory"); -// return; -// } - -// File file = root.openNextFile(); -// while(file){ -// if(file.isDirectory()){ -// Serial.print(" DIR : "); -// Serial.println(file.name()); -// if(levels){ -// listDir(fs, file.path(), levels -1); -// } -// } else { -// Serial.print(" FILE: "); -// Serial.print(file.name()); -// Serial.print("\tSIZE: "); -// Serial.println(file.size()); -// } -// file = root.openNextFile(); -// } -// } - -// void readFile(fs::FS &fs, const char * path){ -// Serial.printf("Reading file: %s\r\n", path); - -// File file = fs.open(path); -// if(!file || file.isDirectory()){ -// Serial.println("− failed to open file for reading"); -// return; -// } - -// Serial.println("− read from file:"); -// while(file.available()){ -// Serial.write(file.read()); -// } -// } +} \ No newline at end of file diff --git a/RNode_Firmware.ino b/RNode_Firmware.ino index 4833d3f..3810675 100644 --- a/RNode_Firmware.ino +++ b/RNode_Firmware.ino @@ -266,7 +266,7 @@ void ISR_VECT receive_callback(int packet_size) { bool startRadio() { update_radio_lock(); - if (!radio_online) { + if (!radio_online && !console_active) { if (!radio_locked && hw_ready) { if (!LoRa.begin(lora_freq)) { // The radio could not be started. diff --git a/Release/spiffs.bin b/Release/spiffs.bin index b38f4906965ff4a3d1d17f6e97cbb93ca6f5ea3b..72cb8014826f59325c19e84b8221a21393d26663 100644 GIT binary patch delta 2667 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 OFifP#sHG#j68{6#?BYTI