ske087/ArduinoC6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
ske087
2025-03-05 13:18:47 +02:00
parent bd639d9af2
commit 1dc9c36514
5 changed files with 284 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
Flask-monitoring/app.py Normal file
View File

@@ -0,0 +1,91 @@
from flask import Flask, request, jsonify, render_template, redirect, url_for
from flask_sqlalchemy import SQLAlchemy
from datetime import datetime, timedelta
import os
app = Flask(__name__)
app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///logs.db'
app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
db = SQLAlchemy(app)
class Log(db.Model):
id = db.Column(db.Integer, primary_key=True)
hostname = db.Column(db.String(100), nullable=False)
message = db.Column(db.String(500), nullable=False)
timestamp = db.Column(db.DateTime, default=datetime.utcnow)
# Create the database if it does not exist
if not os.path.exists('instance/logs.db'):
with app.app_context():
db.create_all()
# Flag to check if tables are created
tables_created = False
@app.before_request
def create_tables():
global tables_created
if not tables_created:
db.create_all()
tables_created = True
@app.route('/log', methods=['POST'])
def log_message():
data = request.get_json()
hostname = data.get('hostname')
message = data.get('message')
if hostname and message:
new_log = Log(hostname=hostname, message=message)
db.session.add(new_log)
db.session.commit()
return jsonify({'status': 'success', 'message': 'Log saved'}), 201
return jsonify({'status': 'error', 'message': 'Invalid data'}), 400
@app.route('/logs', methods=['GET'])
def get_logs():
logs = Log.query.all()
return jsonify([{'id': log.id, 'hostname': log.hostname, 'message': log.message, 'timestamp': log.timestamp} for log in logs])
@app.route('/cleanup', methods=['DELETE'])
def cleanup_logs():
cutoff_date = datetime.utcnow() - timedelta(days=10)
Log.query.filter(Log.timestamp < cutoff_date).delete()
db.session.commit()
return jsonify({'status': 'success', 'message': 'Old logs deleted'})
@app.route('/')
def index():
# Get the latest log entry for each board
latest_logs = db.session.query(Log).order_by(Log.timestamp.desc()).all()
boards = {}
for log in latest_logs:
if log.hostname not in boards:
boards[log.hostname] = log
# Determine the status of each board
board_status = []
for hostname, log in boards.items():
time_diff = datetime.utcnow() - log.timestamp
status = 'Online' if time_diff.total_seconds() <= 20 else 'Possible Offline'
board_status.append({'hostname': hostname, 'status': status, 'last_seen': log.timestamp})
return render_template('index.html', boards=board_status)
@app.route('/board/<hostname>')
def view_board(hostname):
logs = Log.query.filter_by(hostname=hostname).order_by(Log.timestamp.desc()).all()
return render_template('board.html', hostname=hostname, logs=logs)
@app.route('/delete_board/<hostname>', methods=['POST'])
def delete_board(hostname):
Log.query.filter_by(hostname=hostname).delete()
db.session.commit()
return redirect(url_for('index'))
@app.route('/board/<hostname>/logs', methods=['GET'])
def get_board_logs(hostname):
logs = Log.query.filter_by(hostname=hostname).order_by(Log.timestamp.desc()).all()
return jsonify({'logs': [{'timestamp': log.timestamp, 'message': log.message} for log in logs]})
if __name__ == '__main__':
app.run(host='0.0.0.0', port=5000)

93
Flask-monitoring/templates/board.html Normal file
View File

@@ -0,0 +1,93 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Board Logs - {{ hostname }}</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<style>
body {
background-color: #f8f9fa;
}
.card {
border: 1px solid #dee2e6;
border-radius: 0.25rem;
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
}
.card-title {
font-size: 1.25rem;
font-weight: 500;
}
.card-text {
font-size: 1rem;
color: #6c757d;
}
.timer {
font-size: 1rem;
color: #6c757d;
text-align: right;
}
</style>
<script>
function updateLogs() {
fetch('{{ url_for("get_board_logs", hostname=hostname) }}')
.then(response => response.json())
.then(data => {
const logsContainer = document.getElementById('logs-container');
logsContainer.innerHTML = '';
data.logs.forEach(log => {
const logItem = document.createElement('li');
logItem.className = 'list-group-item';
logItem.innerHTML = `<strong>${log.timestamp}</strong>: ${log.message}`;
logsContainer.appendChild(logItem);
});
});
}
function startTimer() {
let timer = 5;
setInterval(() => {
if (timer === 0) {
updateLogs();
timer = 5;
}
document.getElementById('timer').innerText = `Next update in ${timer} seconds`;
timer--;
}, 1000);
}
window.onload = startTimer;
</script>
</head>
<body>
<div class="container mt-5">
<div class="row mb-4">
<div class="col-md-6">
<form action="{{ url_for('delete_board', hostname=hostname) }}" method="post">
<button type="submit" class="btn btn-danger">Delete Board</button>
<a href="{{ url_for('index') }}" class="btn btn-secondary">Back to Home</a>
</form>
</div>
<div class="col-md-6 timer">
<span id="timer">Next update in 5 seconds</span>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="card mb-4">
<div class="card-body">
<h5 class="card-title">Logs for {{ hostname }}</h5>
<ul class="list-group" id="logs-container">
{% for log in logs %}
<li class="list-group-item">
<strong>{{ log.timestamp }}</strong>: {{ log.message }}
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

58
Flask-monitoring/templates/index.html Normal file
View File

@@ -0,0 +1,58 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>ESP Board Status</title>
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
<style>
body {
background-color: #f8f9fa;
}
.card {
border: 1px solid #dee2e6;
border-radius: 0.25rem;
box-shadow: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
}
.card-title {
font-size: 1.25rem;
font-weight: 500;
}
.card-text {
font-size: 1rem;
color: #6c757d;
}
.status-online {
color: #28a745;
font-weight: bold;
}
.status-offline {
color: #dc3545;
font-weight: bold;
}
</style>
</head>
<body>
<div class="container mt-5">
<h1 class="text-center mb-4">ESP Board Status</h1>
<div class="row">
{% for board in boards %}
<div class="col-md-4">
<div class="card mb-4">
<div class="card-body">
<h5 class="card-title">{{ board.hostname }}</h5>
<p class="card-text">Status:
<span class="{{ 'status-online' if board.status == 'Online' else 'status-offline' }}">
{{ board.status }}
</span>
</p>
<p class="card-text">Last Seen: {{ board.last_seen }}</p>
<a href="{{ url_for('view_board', hostname=board.hostname) }}" class="btn btn-primary">View Logs</a>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</body>
</html>

BIN
instance/logs.db Normal file
View File

Binary file not shown.

45
wifi_set_and_server/wifi_set_and_server.ino
View File

@@ -3,9 +3,10 @@
#include <EEPROM.h> // Include the EEPROM library for storing WiFi settings #include <EEPROM.h> // Include the EEPROM library for storing WiFi settings
#include <WiFiManager.h> // Include the WiFiManager library for managing WiFi connections #include <WiFiManager.h> // Include the WiFiManager library for managing WiFi connections
#include "esp_mac.h" // Include the esp_mac library for MAC address functions #include "esp_mac.h" // Include the esp_mac library for MAC address functions
#include <HTTPClient.h> // Include the HTTPClient library for sending logs
// Version of the code // Version of the code
//ver 0.0.4 //ver 0.0.11
// Constants for Access Point mode // Constants for Access Point mode
const char* ap_ssid = "ESP32-AP"; // SSID for the Access Point mode const char* ap_ssid = "ESP32-AP"; // SSID for the Access Point mode
@@ -22,10 +23,30 @@ WebServer server(80);
// Variables to store WiFi settings // Variables to store WiFi settings
String ssid, password, static_ip, netmask, gateway, hostname; String ssid, password, static_ip, netmask, gateway, hostname;
String logServerIP, logServerPort;
bool isAPMode = false; // Flag to indicate if the board is in AP mode bool isAPMode = false; // Flag to indicate if the board is in AP mode
// Variable to keep track of the last status print time // Variable to keep track of the last status print time
unsigned long lastStatusPrintTime = 0; unsigned long lastStatusPrintTime = 0;
unsigned long lastLogTime = 0; // Variable to keep track of the last log time
// Function to send logs to the log server
void sendLog(String message) {
if (WiFi.status() == WL_CONNECTED && logServerIP.length() > 0 && logServerPort.length() > 0) {
HTTPClient http;
String url = "http://" + logServerIP + ":" + logServerPort + "/log";
http.begin(url);
http.addHeader("Content-Type", "application/json");
String payload = "{\"hostname\": \"" + hostname + "\", \"message\": \"" + message + "\"}";
int httpResponseCode = http.POST(payload);
http.end();
if (httpResponseCode > 0) {
Serial.println("Log sent successfully: " + message);
} else {
Serial.println("Error sending log: " + message);
}
}
}
// Handle the root URL ("/") and serve the configuration page // Handle the root URL ("/") and serve the configuration page
void handleRoot() { void handleRoot() {
@@ -63,6 +84,10 @@ void handleRoot() {
html += "<input type='text' id='gateway' name='gateway' value='" + gateway + "'><br>"; html += "<input type='text' id='gateway' name='gateway' value='" + gateway + "'><br>";
html += "<label for='hostname'>Hostname:</label>"; html += "<label for='hostname'>Hostname:</label>";
html += "<input type='text' id='hostname' name='hostname' value='" + hostname + "'><br>"; html += "<input type='text' id='hostname' name='hostname' value='" + hostname + "'><br>";
html += "<label for='log_server_ip'>Log Server IP:</label>";
html += "<input type='text' id='log_server_ip' name='log_server_ip' value='" + logServerIP + "'><br>";
html += "<label for='log_server_port'>Log Server Port:</label>";
html += "<input type='text' id='log_server_port' name='log_server_port' value='" + logServerPort + "'><br>";
html += "<label for='mac_address'>MAC Address:</label>"; html += "<label for='mac_address'>MAC Address:</label>";
html += "<input type='text' id='mac_address' name='mac_address' value='" + macAddress + "' readonly><br>"; html += "<input type='text' id='mac_address' name='mac_address' value='" + macAddress + "' readonly><br>";
html += "<input type='submit' value='Save'>"; html += "<input type='submit' value='Save'>";
@@ -119,6 +144,8 @@ void handleSave() {
netmask = server.arg("netmask"); netmask = server.arg("netmask");
gateway = server.arg("gateway"); gateway = server.arg("gateway");
hostname = server.arg("hostname"); hostname = server.arg("hostname");
logServerIP = server.arg("log_server_ip");
logServerPort = server.arg("log_server_port");
// Save the WiFi settings to EEPROM // Save the WiFi settings to EEPROM
saveSettings(); saveSettings();
@@ -139,8 +166,10 @@ void handleRelay() {
if (relay >= 0 && relay < 4) { if (relay >= 0 && relay < 4) {
if (action == "on") { if (action == "on") {
digitalWrite(relayPins[relay], HIGH); digitalWrite(relayPins[relay], HIGH);
sendLog("Relay " + String(relay + 1) + " turned ON");
} else if (action == "off") { } else if (action == "off") {
digitalWrite(relayPins[relay], LOW); digitalWrite(relayPins[relay], LOW);
sendLog("Relay " + String(relay + 1) + " turned OFF");
} }
} }
@@ -157,6 +186,8 @@ void saveSettings() {
EEPROM.writeString(96, netmask); EEPROM.writeString(96, netmask);
EEPROM.writeString(128, gateway); EEPROM.writeString(128, gateway);
EEPROM.writeString(160, hostname); EEPROM.writeString(160, hostname);
EEPROM.writeString(192, logServerIP);
EEPROM.writeString(224, logServerPort);
EEPROM.commit(); EEPROM.commit();
} }
@@ -168,12 +199,14 @@ void loadSettings() {
netmask = EEPROM.readString(96); netmask = EEPROM.readString(96);
gateway = EEPROM.readString(128); gateway = EEPROM.readString(128);
hostname = EEPROM.readString(160); hostname = EEPROM.readString(160);
logServerIP = EEPROM.readString(192);
logServerPort = EEPROM.readString(224);
} }
void setup() { void setup() {
Serial.begin(115200); // Start the serial communication Serial.begin(115200); // Start the serial communication
Serial.println("Setup started"); Serial.println("Setup started");
EEPROM.begin(192); // Initialize EEPROM with a size of 192 bytes EEPROM.begin(256); // Initialize EEPROM with a size of 256 bytes
pinMode(userLedPin, OUTPUT); // Set the user LED pin as output pinMode(userLedPin, OUTPUT); // Set the user LED pin as output
digitalWrite(userLedPin, LOW); // Turn off the user LED digitalWrite(userLedPin, LOW); // Turn off the user LED
@@ -248,6 +281,12 @@ void loop() {
server.handleClient(); // Handle client requests server.handleClient(); // Handle client requests
blinkLed(); // Blink the LED to indicate the mode blinkLed(); // Blink the LED to indicate the mode
printStatus(); // Print the status of the board printStatus(); // Print the status of the board
// Send a log message every 20 seconds
if (millis() - lastLogTime >= 20000) {
sendLog("Board is functioning");
lastLogTime = millis();
}
} }
// Blink the LED to indicate the mode (AP mode or client mode) // Blink the LED to indicate the mode (AP mode or client mode)
@@ -344,4 +383,4 @@ String getInterfaceMacAddress(esp_mac_type_t interface) {
} }
return mac; return mac;
} }