Skip to content

Reactivate threshold function #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Reactivate threshold function #47

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11396e2
force wifi scanning
AxelHamburch Dec 14, 2024
e511180
Correction of the position
AxelHamburch Dec 15, 2024
25054b2
Activate threshold
AxelHamburch Jan 20, 2025
9715626
User feedback improved
AxelHamburch Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 66 additions & 4 deletions bitcoinSwitch/bitcoinSwitch.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,13 @@ void setup() {
readFiles(); // get the saved details and store in global variables

if (triggerConfig == true || ssid == "" || ssid == "null") {
Serial.println("Launch serial config");
Serial.println(">>>>>>>>>>>>>><<<<<<<<<<<<<<");
Serial.println(">>> Launch serial config <<<");
Serial.println(">>> Waiting for upload <<<");
Serial.println(">>>>>>>>>>>>>><<<<<<<<<<<<<<");
configOverSerialPort();
} else {
WiFi.setScanMethod(WIFI_ALL_CHANNEL_SCAN); // Force scanning for all APs, not just the first one
WiFi.begin(ssid.c_str(), wifiPassword.c_str());
Serial.print("Connecting to WiFi");
while (WiFi.status() != WL_CONNECTED) {
Expand Down Expand Up @@ -133,10 +137,10 @@ void loop() {
JsonObject payment = doc["payment"];
payment_amount = payment["amount"];
thresholdSum = thresholdSum + payment_amount;
Serial.println("thresholdSum: " + String(thresholdSum));
Serial.println("thresholdAmount: " + String((thresholdAmount * 1000)));
Serial.println("thresholdPin: " + String(thresholdPin));
Serial.println("thresholdSum: " + String(thresholdSum) + " mSats");
Serial.println("thresholdAmount: " + String((thresholdAmount * 1000)) + " mSats");
if (thresholdSum >= (thresholdAmount * 1000)) {
Serial.println("Threshold value reached, switch pin " + String(thresholdPin) + " for " + String(thresholdTime) + " ms.");
pinMode(thresholdPin, OUTPUT);
digitalWrite(thresholdPin, HIGH);
delay(thresholdTime);
Expand Down Expand Up @@ -243,6 +247,64 @@ void readFiles() {
Serial.println("LNbits server: " + lnbitsServer);
Serial.println("LNbits API url: " + apiUrl);
Serial.println("Switch device ID: " + deviceId);

// For threshold options
if (thresholdInkey == "")
{ // check thresholdInkey is not set above
thresholdInkey = getJsonValue(doc, "thresholdInkey");
Serial.println("");
Serial.println("Threshold invoice key used from memory");
Serial.println("Threshold invoice key: " + thresholdInkey);
}
else
{
Serial.println("");
Serial.println("Threshold invoice key hardcoded");
Serial.println("Threshold invoice key: " + thresholdInkey);
}
if (thresholdAmount == 0)
{ // check thresholdAmount is not set above
String thresholdAmountString = getJsonValue(doc, "thresholdAmount");
thresholdAmount = thresholdAmountString.toInt();
Serial.println("");
Serial.println("Threshold amount used from memory");
Serial.println("Threshold amount: " + String(thresholdAmount));
}
else
{
Serial.println("");
Serial.println("Threshold amount hardcoded");
Serial.println("Threshold amount: " + String(thresholdAmount));
}
if (thresholdPin == 0)
{ // check thresholdPin is not set above
String thresholdPinString = getJsonValue(doc, "thresholdPin");
thresholdPin = thresholdPinString.toInt();
Serial.println("");
Serial.println("Threshold pin to trigger used from memory");
Serial.println("Threshold pin to trigger: " + String(thresholdPin));
}
else
{
Serial.println("");
Serial.println("Threshold pin to trigger hardcoded");
Serial.println("Threshold pin to trigger: " + String(thresholdPin));
}
if (thresholdTime == 0)
{ // check thresholdPin is not set above
String thresholdTimeString = getJsonValue(doc, "thresholdTime");
thresholdTime = thresholdTimeString.toInt();
Serial.println("");
Serial.println("Threshold time used from memory");
Serial.println("Threshold time: " + String(thresholdTime));
}
else
{
Serial.println("");
Serial.println("Threshold time hardcoded");
Serial.println("Threshold time: " + String(thresholdTime));
}
Serial.println("");
}
paramFile.close();
}
Expand Down
Loading