Merge branch 'pulllonline' into main

lnbits · Aug 20, 2024 · d2c45c4 · d2c45c4
2 parents 765e468 + 620955b
commit d2c45c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 517 deletions.
diff --git a/.github/workflows/arduino.yml b/.github/workflows/arduino.yml
@@ -17,7 +17,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fqbn: ${{ matrix.fqbn }}
           platforms: |
-            - name: esp32:[email protected].17
+            - name: esp32:[email protected].1
               source-url: https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json
           sketch-paths: |
             - lnpos/lnpos.ino

diff --git a/build.sh b/build.sh
@@ -4,11 +4,11 @@ arduino-cli config --additional-urls https://raw.githubusercontent.com/espressif
 arduino-cli core update-index
 arduino-cli upgrade
 # uBitcoin is broken on esp32 3.x.x
-arduino-cli core install esp32:[email protected].17
+arduino-cli core install esp32:[email protected].1 
 arduino-cli lib install ArduinoJson Base64 Keypad uBitcoin
 arduino-cli compile \
     --build-property "build.partitions=min_spiffs" \
     --build-property "upload.maximum_size=1966080" \
     --library ./libraries/TFT_eSPI \
     --library ./libraries/QRCode \
-    --build-path build --fqbn esp32:esp32:ttgo-lora32 lnpos
+    --build-path build --fqbn esp32:esp32:ttgo-lora32-oled-v1 lnpos
diff --git a/lnpos/100_config.ino b/lnpos/100_config.ino
@@ -128,14 +128,10 @@ void readFiles()
       lnurlPoS = getJsonValue(doc, "config_lnurlpos");
       lnurlATM = getJsonValue(doc, "config_lnurlatm");
       masterKey = getJsonValue(doc, "config_masterkey");
-      lnbitsServer = getJsonValue(doc, "config_server");
-      invoice = getJsonValue(doc, "config_invoice");
       lncurrency = getJsonValue(doc, "config_lncurrency");
       lnurlATMMS = getJsonValue(doc, "config_lnurlatmms");
       lnurlATMPin = getJsonValue(doc, "config_lnurlatmpin");
       decimalplaces = getJsonValue(doc, "config_decimalplaces");
-      ssid = getJsonValue(doc, "config_wifi_ssid");
-      password = getJsonValue(doc, "config_wifi_password");
     }
 
     ////////LNURL PoS string/////////
@@ -191,34 +187,6 @@ void readFiles()
       Serial.println("MasterKey not set");
     }
 
-    //////////Lnbits Server/////////
-    if (lnbitsServer != "null" || lnbitsServer != "")
-    {
-      Serial.println("");
-      Serial.println("lnbitsServer used from memory");
-      Serial.println("lnbitsServer: " + lnbitsServer);
-    }
-    else
-    {
-      Serial.println("lnbitsServer not set");
-    }
-
-    /////////LNbits Server///////
-    if (invoice != "null" || invoice != "")
-    {
-      Serial.println("");
-      Serial.println("invoice key used from memory");
-      Serial.println("invoice key: " + invoice);
-      if (invoice != "")
-      {
-        menuItemCheck[0] = 1;
-      }
-    }
-    else
-    {
-      Serial.println("invoice key not set");
-    }
-
     /////////PoS Currency///////
     if (lncurrency != "null" || lncurrency != "")
     {
@@ -267,30 +235,6 @@ void readFiles()
     {
       Serial.println("no. fiat decimal places not set");
     }
-
-    /////////WiFi SSID///////
-    if (ssid != "null" || ssid != "")
-    {
-      Serial.println("");
-      Serial.println("WiFi SSID used from memory");
-      Serial.println("WiFi SSID: " + ssid);
-    }
-    else
-    {
-      Serial.println("WiFi SSID not set");
-    }
-
-    /////////WiFi password///////
-    if (decimalplaces != "null" || decimalplaces != "")
-    {
-      Serial.println("");
-      Serial.println("WiFi password used from memory");
-      Serial.println("WiFi password: " + password);
-    }
-    else
-    {
-      Serial.println("WiFi password not set");
-    }
   }
   paramFile.close();
 }