From 55bc9ca5355d98e864878184a8025215030042bc Mon Sep 17 00:00:00 2001 From: alicegetm <aliceg3@illinois.edu> Date: Wed, 30 Nov 2022 11:12:07 -0600 Subject: [PATCH] updated Ui and with tensions --- .../test_webpage_sensors.ino | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/arduino_code/test_webpage_sensors/test_webpage_sensors.ino b/arduino_code/test_webpage_sensors/test_webpage_sensors.ino index 671f9be..18f0089 100644 --- a/arduino_code/test_webpage_sensors/test_webpage_sensors.ino +++ b/arduino_code/test_webpage_sensors/test_webpage_sensors.ino @@ -12,7 +12,7 @@ #include <MultiStepper.h> // Replace with your network credentials -const char* ssid = "Jack"; +const char* ssid = "Alice"; const char* password = "temp_pass1234"; const char* input_parameter1 = "output"; @@ -36,6 +36,8 @@ const char* input_parameter2 = "state"; #define MOTORTORQUE .6 +float MOTORTENSION = MOTORTORQUE / .1778; + Stepper motor1(200, motor1IN1, motor1IN2, motor1IN3, motor1IN4); Stepper motor2(200, motor2IN1, motor2IN2, motor2IN3, motor2IN4); @@ -99,7 +101,7 @@ const char index_html[] PROGMEM = R"rawliteral( <h2>Remotely Adjustable Boot</h2> <p> <i class="fas fa-thermometer-half" style="color:#4a32a8;"></i> - <span class="sensorlabel">Pressure LEFT - Prescribed Pressure: %PRESSURE1GOAL% mmHg</span> + <b><span class="sensorlabel">Pressure LEFT - Prescribed Pressure: %PRESSURE1GOAL% mmHg</span></b> <br /> <span id="pressure1" class="statuslabel">%PRESSURE1%</span> <sup class="units">mmHg</sup> @@ -110,7 +112,7 @@ const char index_html[] PROGMEM = R"rawliteral( </p> <p> <i class="fas fa-thermometer-half" style="color:#4a32a8;"></i> - <span class="sensorlabel">Pressure RIGHT - Prescribed Pressure: %PRESSURE2GOAL% mmHg</span> + <b><span class="sensorlabel">Pressure RIGHT - Prescribed Pressure: %PRESSURE2GOAL% mmHg</span></b> <br /> <span id="pressure2" class="statuslabel">%PRESSURE2%</span> <sup class="units">mmHg</sup> @@ -121,14 +123,14 @@ const char index_html[] PROGMEM = R"rawliteral( </p> <p> <i class="fas fa-wrench" style="color:#4a32a8;"></i> - <span class="sensorlabel">Ankle Motor - Prescribed Torque: %MOTORTORQUE% N*m</span> + <b><span class="sensorlabel">Ankle Motor - Prescribed Tension: %MOTORTENSION% N*m</span></b> <br /> <span class="sensorlabel">Status:</span> <span id="motor1status" class="statuslabel">%motor1STATUS%</span> </p> <p> <i class="fas fa-wrench" style="color:#4a32a8;"></i> - <span class="sensorlabel">Foot Motor - Prescribed Torque: %MOTORTORQUE% N*m</span> + <b><span class="sensorlabel">Foot Motor - Prescribed Tension: %MOTORTENSION% N*m</span></b> <br /> <span class="sensorlabel">Status:</span> <span id="motor2status" class="statuslabel">%motor2STATUS%</span> @@ -251,8 +253,8 @@ String processor(const String& var){ else if(var == "motor2STATUS"){ return String(motor2status); } - else if (var == "MOTORTORQUE"){ - return String(MOTORTORQUE); + else if (var == "MOTORTENSION"){ + return String(MOTORTENSION); } else if(var == "BUTTONPLACEHOLDER"){ String buttons = ""; @@ -460,4 +462,4 @@ void loop(){ } } -} +} \ No newline at end of file -- GitLab