tomislav/OctoCube
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: tomislav:3d43fa7a84805a718fb54fc573d01835cb309d36
Branches Tags
tomislav:master tomislav:feature/netman
...
compare: tomislav:feature/netman
Branches Tags
tomislav:master tomislav:feature/netman

3 Commits
3d43fa7a84 ... feature/ne

Author SHA1 Message Date
Tomislav Kopić
877d2b1207 Fix include order 2024-11-05 20:41:10 +01:00
Tomislav Kopić
3f20df7571 Fix ping pong scroll logic 2024-11-05 19:39:55 +01:00
Tomislav Kopić
fd3c54d517 Make password entry page pretty 2024-11-05 19:37:32 +01:00
3 changed files with 3 additions and 12 deletions
Expand all files Collapse all files

2
src/main.cpp
View File

@@ -3,10 +3,10 @@
#include <Wire.h>
#include <Adafruit_GFX.h>
#include <Adafruit_SSD1306.h>
#include "netman.h"
#include "functions.h"
#include "bitmaps.h"
#include "octoprint.h"
#include "netman.h"
void setup() {
initSystems();

11
src/netman.h
View File

@@ -328,15 +328,6 @@ void netman::handleRemove() {
// Add SSID to config and save
void netman::handleSelect() {
String ssid = server->arg("ssid");
// Display prompt for password if network is secured
String selectPage = "<!DOCTYPE html><html lang='en'><head><title>Connect to " + ssid + "</title></head><body>";
selectPage += "<h2>Connect to " + ssid + "</h2>";
selectPage += "<form action='/add' method='get'>";
selectPage += "<input type='hidden' name='ssid' value='" + ssid + "'>";
selectPage += "<label>Password:</label><input type='password' name='pass'><br><br>";
selectPage += "<button type='submit'>Connect</button>";
selectPage += "</form></body></html>";
String selectPage = "<!DOCTYPE html><html lang='en'><head><meta charset='UTF-8'><meta name='viewport' content='width=device-width, initial-scale=1.0'><title>Connect to " + ssid + "</title><style>body{font-family:Arial,sans-serif;background-color:#f4f4f9;color:#333;display:flex;align-items:center;justify-content:center;height:100vh;margin:0}.container{width:100%;max-width:300px;padding:20px;background:#fff;border-radius:10px;box-shadow:0 4px 8px rgba(0,0,0,0.2);box-sizing:border-box}h2{margin-top:0;text-align:center;color:#0073e6}label{display:block;margin-bottom:5px;font-weight:bold}input[type='password']{width:100%;padding:8px;margin-bottom:15px;border:1px solid #ccc;border-radius:4px;box-sizing:border-box}button{width:100%;padding:10px;background-color:#0073e6;color:white;border:none;border-radius:4px;cursor:pointer;font-size:16px}button:hover{background-color:#005bb5}</style></head><body><div class='container'><h2>Connect to " + ssid + "</h2><form action='/add' method='get'><input type='hidden' name='ssid' value='" + ssid + "'><label for='pass'>Password:</label><input id='pass' type='password' name='pass' placeholder='Enter Password'><button type='submit'>Connect</button></form></div></body></html>";
server->send(200, "text/html", selectPage);
}

2
src/octoprint.h
View File

@@ -138,7 +138,7 @@ bool fetchPrintingStatus(Adafruit_SSD1306& display) {
display.fillRect(0, 26, displayWidth, 11, BLACK);
// Check if it’s time to scroll based on the delay
if(fileNameWidth > 22) {
if(fileNameWidth > displayWidth) {
if (millis() - lastScrollTime > scrollDelay) {
// Update scroll position based on the current direction
scrollPos += scrollDirection;