]> git.tnoah.ca Git - lora-radio.git/commitdiff
Cleanup
authorMark Qvist <mark@unsigned.io>
Tue, 10 Jan 2023 17:12:40 +0000 (18:12 +0100)
committerMark Qvist <mark@unsigned.io>
Tue, 10 Jan 2023 17:12:40 +0000 (18:12 +0100)
Config.h
Console.h
RNode_Firmware.ino
Release/spiffs.bin

index 21b2f6bf7777c347c26c7220f68fdff6d31b98fc..5878bd73092cd32743451957f85e0f6c7e5695d5 100644 (file)
--- a/Config.h
+++ b/Config.h
                        #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;
index 1e5f1e87d4f709e3087fbe15dae3ebb989edb558..12fd04678c4b2d2a21974f7c0a839874face77c1 100644 (file)
--- 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
index 4833d3f2f011fdae4f41b355f0ad69a0defd5214..3810675730ef4a09b38dfc92f4a635946902d735 100644 (file)
@@ -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.
index b38f4906965ff4a3d1d17f6e97cbb93ca6f5ea3b..72cb8014826f59325c19e84b8221a21393d26663 100644 (file)
Binary files a/Release/spiffs.bin and b/Release/spiffs.bin differ