Allow TABS in config

[clinton/Smoothieware.git] / src / modules / utils / panel / screens / WatchScreen.cpp

diff --git a/src/modules/utils/panel/screens/WatchScreen.cpp b/src/modules/utils/panel/screens/WatchScreen.cpp
index ce7dbd2..cc55dc4 100644 (file)
--- a/src/modules/utils/panel/screens/WatchScreen.cpp
+++ b/src/modules/utils/panel/screens/WatchScreen.cpp
@@ -14,9 +14,17 @@
 #include "libs/utils.h"
 #include "modules/tools/temperaturecontrol/TemperatureControlPublicAccess.h"
 #include "modules/robot/RobotPublicAccess.h"
+#include "modules/robot/Conveyor.h"
 #include "modules/utils/player/PlayerPublicAccess.h"
+#include "NetworkPublicAccess.h"
+#include "PublicData.h"
+#include "checksumm.h"
+#include "Pauser.h"
 
+#include <math.h>
+#include <string.h>
 #include <string>
+
 using namespace std;
 static const uint8_t icons[] = { // 115x19 - 3 bytes each: he1, he2, he3, bed, fan
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0xFF, 0xE0,
@@ -46,6 +54,7 @@ WatchScreen::WatchScreen()
 {
     speed_changed = false;
     issue_change_speed = false;
+    ipstr = NULL;
 }
 
 void WatchScreen::on_enter()
@@ -155,6 +164,7 @@ void WatchScreen::get_temp_data()
         this->bedtarget = -1;
     }
 
+
     ok = THEKERNEL->public_data->get_value( temperature_control_checksum, hotend_checksum, current_temperature_checksum, &returned_data );
     if (ok) {
         struct pad_temperature temp =  *static_cast<struct pad_temperature *>(returned_data);
@@ -170,25 +180,25 @@ void WatchScreen::get_temp_data()
 }
 
 // fetch the data we are displaying
-double WatchScreen::get_current_speed()
+float WatchScreen::get_current_speed()
 {
     void *returned_data;
 
     bool ok = THEKERNEL->public_data->get_value( robot_checksum, speed_override_percent_checksum, &returned_data );
     if (ok) {
-        double cs = *static_cast<double *>(returned_data);
+        float cs = *static_cast<float *>(returned_data);
         return cs;
     }
     return 0.0;
 }
 
-void WatchScreen::get_current_pos(double *cp)
+void WatchScreen::get_current_pos(float *cp)
 {
     void *returned_data;
 
     bool ok = THEKERNEL->public_data->get_value( robot_checksum, current_position_checksum, &returned_data );
     if (ok) {
-        double *p = static_cast<double *>(returned_data);
+        float *p = static_cast<float *>(returned_data);
         cp[0] = p[0];
         cp[1] = p[1];
         cp[2] = p[2];
@@ -234,7 +244,16 @@ const char *WatchScreen::get_status()
     if (panel->is_playing())
         return panel->get_playing_file();
 
-    return "Smoothie ready";
+    if (!THEKERNEL->conveyor->queue.is_empty()) {
+        return "Printing";
+    }
+
+    const char *ip = get_network();
+    if (ip == NULL) {
+        return "Smoothie ready";
+    } else {
+        return ip;
+    }
 }
 
 void WatchScreen::set_speed()
@@ -245,3 +264,24 @@ void WatchScreen::set_speed()
     string g(buf, n);
     send_gcode(g);
 }
+
+const char *WatchScreen::get_network()
+{
+    void *returned_data;
+
+    bool ok = THEKERNEL->public_data->get_value( network_checksum, get_ip_checksum, &returned_data );
+    if (ok) {
+        uint8_t *ipaddr = (uint8_t *)returned_data;
+        char buf[20];
+        int n = snprintf(buf, sizeof(buf), "IP %d.%d.%d.%d", ipaddr[0], ipaddr[1], ipaddr[2], ipaddr[3]);
+        buf[n] = 0;
+        if (this->ipstr == NULL) {
+            this->ipstr = (char *)malloc(n + 1);
+        }
+        strcpy(this->ipstr, buf);
+
+        return this->ipstr;
+    }
+
+    return NULL;
+}