From 67df19fd74e34ff3f775df5b999752ce7174ef2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simen=20E=2E=20S=C3=B8rensen?= Date: Mon, 3 Apr 2023 11:20:46 +0200 Subject: [PATCH] Add imperial unit conversion Add crude mm to inch converter. Restructure layout with accordion menu. Improve accessibility by assigning label to all entry-forms and check buttons. --- .../OpenMacroRail_Arduino.ino | 2 +- OpenMacroRail_Arduino/webpage.h | 969 ++++++++++++------ 2 files changed, 651 insertions(+), 320 deletions(-) diff --git a/OpenMacroRail_Arduino/OpenMacroRail_Arduino.ino b/OpenMacroRail_Arduino/OpenMacroRail_Arduino.ino index 9b7dc84..dd30490 100644 --- a/OpenMacroRail_Arduino/OpenMacroRail_Arduino.ino +++ b/OpenMacroRail_Arduino/OpenMacroRail_Arduino.ino @@ -432,7 +432,7 @@ void setup(void){ server.on("/refreshStats", [](){ calculateStats(); - String response = "startPoint:"+String(startPoint,3)+" mm,"+"endPoint:"+String(endPoint,3)+" mm,"+"currentPos:"+String(currentPos,3)+" mm,"+"distance:"+String(distance)+" mm,"+"increment:"+String(increment,4)+" mm,"+"remainingPictures:"+String(remainingPictures)+","+"remainingShootingTime:"+String(remainingShootingTime)+" min,"+"totalShootingTime:"+String(totalShootingTime)+" min,"; + String response = "startPoint:"+String(startPoint,3)+","+"endPoint:"+String(endPoint,3)+","+"currentPos:"+String(currentPos,3)+","+"distance:"+String(distance)+","+"increment:"+String(increment,4)+","+"remainingPictures:"+String(remainingPictures)+","+"remainingShootingTime:"+String(remainingShootingTime)+","+"totalShootingTime:"+String(totalShootingTime)+","; server.send(200, "text/plain", response); }); diff --git a/OpenMacroRail_Arduino/webpage.h b/OpenMacroRail_Arduino/webpage.h index 2a13512..ad98921 100644 --- a/OpenMacroRail_Arduino/webpage.h +++ b/OpenMacroRail_Arduino/webpage.h @@ -1,329 +1,660 @@ R"( - - - - - - OpenMacroRail - - - - - - - -
-
-
-

Current position:

-

0.000 mm

-

Jog increment:

-
- - - - - - - - -
-

Number of images:

- -
-
- - -
-
-
-
- - - -
-
-
- -
-
- -
-
-
-
-
Stats:
-
Start point
-
0.0 mm
+ + + + + + OpenMacroRail + + + + + -
Remaining shooting time
-
0.0 min
+ +
+
+
+

Current position:

+

0.000 mm

+

Jog increment:

+
+ + -
Total shooting time
-
0.0 min
+ + -
Settings:
- -
-
Enable LED output
-
- + + +
+ + +
+
+ + +
+
+
+
+ + + +
+
+
+ +
+
+ +
+
+
+ +
+ +
+ + +
+ + +
+ +
+ +
+ +
+
+ +
+ +
+
+
Start point
+
0.0 mm
+ +
End point
+
0.0 mm
+ +
Total movement distance
+
0.0 mm
+ +
Increment
+
0.0 mm
+ +
Remaining pictures
+
0
+ +
Remaining shooting time
+
0.0 min
+ +
Total shooting time
+
0.0 min
+
+
+
+ + + +
+
+ +
+ +
+ +
+
+
+ +
+
mm/s
+
+ +
+
+
+ +
+
mm/s
+
+ +
+
+
+ +
+
s
+
+ +
+
+
+ +
+
s
+
+ +
+
+
+ +
+
mm
+
+
+
+ + + +
+
+ +
+ +
+ +
+ + + + + + + +
+
+
+ +
+
+ +
+
+
+
+
- - -
- -
Shooting speed
-
- -
-
mm/s
- -
Jog speed
-
- -
-
mm/s
- -
Deshake delay
-
- -
-
s
- -
Shoot delay
-
- -
-
s
- -
Overshoot distance
-
- -
-
mm
- -
-
- - - - - - + + + + + + )"