Page anchor ongoing work

lib/obp60task/ConfigMenu.cpp

@@ -0,0 +1,101 @@
+/*
+  Menu system for online configuration
+*/
+#include "ConfigMenu.h"
+
+ConfigMenuItem::ConfigMenuItem(String itemtype, String itemlabel) {
+    if (! (itemtype == "int" or itemtype == "bool")) {
+        valtype = "int";
+    } else {
+        valtype = itemtype;
+    }
+    label = itemlabel;
+    min = 0;
+    max = std::numeric_limits<uint16_t>::max();
+}
+
+void ConfigMenuItem::setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> valsteps) {
+    min = valmin;
+    max = valmax;
+    steps = valsteps;
+};
+
+bool ConfigMenuItem::setValue(uint16_t newval) {
+    if (valtype == "int") {
+        if (newval >= min and newval <= max) {
+            value = newval;
+            return true;
+        }
+        return false; // out of range
+    } else if (valtype == "bool") {
+        value = (newval != 0) ? 1 : 0;
+        return true;
+    }
+    return false; // invalid type
+};
+
+void ConfigMenuItem::setPos(int8_t newpos) {
+    position = newpos;
+};
+
+int8_t ConfigMenuItem::getPos() {
+    return position;
+};
+
+ConfigMenu::ConfigMenu(String menutitle, uint16_t menu_x, uint16_t menu_y) {
+    title = menutitle;
+    x = menu_x;
+    y = menu_y;
+};
+
+ConfigMenuItem* ConfigMenu::addItem(String key, String label, String valtype) {
+    if (items.find(key) != items.end()) {
+        // duplicate keys not allowed
+        return nullptr;
+    }
+    ConfigMenuItem itm(valtype, "Test1");
+    return &itm;
+    // map.insert(std::pair<String, ConfigMenuItem>(itm));
+    // Append key to index
+    int8_t ix = items.size();
+    index[ix] = key;
+    itm.setPos(ix);
+};
+
+void ConfigMenu::setItemDimension(uint16_t itemwidth, uint16_t itemheight) {
+    w = itemwidth;
+    h = itemheight;
+};
+
+void ConfigMenu::setItemActive(String key) {
+    uint8_t ix = 
+    activeitem = ix;
+};
+
+ConfigMenuItem* ConfigMenu::getActiveItem() {
+    return nullptr;
+};
+
+ConfigMenuItem* ConfigMenu::getItemByIndex(uint8_t index) {
+    return nullptr;
+};
+
+ConfigMenuItem* ConfigMenu::getItemByKey(String Key) {
+    return nullptr;
+};
+
+uint8_t ConfigMenu::getItemCount() {
+    return items.size();
+};
+
+Point ConfigMenu::getXY() {
+    return {x, y};
+}
+
+/*
+void getRect();
+void getItemRect();
+*/
+
+
+

lib/obp60task/ConfigMenu.h

@@ -0,0 +1,51 @@
+#pragma once
+
+#include <Arduino.h>
+#include <vector>
+#include <map>
+#include "Graphics.h"  // for Point and Rect
+
+class ConfigMenuItem {
+private:
+    String label;
+    uint16_t value;
+    String unit;
+    String valtype; // "int" | "bool"
+    uint16_t min;
+    uint16_t max;
+    std::vector<uint16_t> steps;
+    uint16_t step;
+    int8_t position; // counted fom 0
+
+public:
+    ConfigMenuItem(String itemtype, String itemlabel);
+    void setRange(uint16_t valmin, uint16_t valmax, std::vector<uint16_t> steps);
+    bool setValue(uint16_t newval);
+    void setPos(int8_t newpos);
+    int8_t getPos();
+};
+
+class ConfigMenu {
+private:
+    String title;
+    std::map <String,ConfigMenuItem> items;
+    std::map <uint8_t,String> index;
+    int8_t activeitem = -1; // refers to position of item
+    uint16_t x;
+    uint16_t y;
+    uint16_t w;
+    uint16_t h;
+
+public:
+    ConfigMenu(String title, uint16_t menu_x, uint16_t menu_y);
+    ConfigMenuItem* addItem(String key, String label, String valtype);
+    void setItemDimension(uint16_t itemwidth, uint16_t itemheight);
+    void setItemActive(String key);
+    ConfigMenuItem* getActiveItem();
+    ConfigMenuItem* getItemByIndex(uint8_t index);
+    ConfigMenuItem* getItemByKey(String key);
+    uint8_t getItemCount();
+    Point getXY();
+    /* void getRect();
+    void getItemRect(); */
+};

lib/obp60task/Graphics.cpp

@@ -0,0 +1,25 @@
+/*
+Generic graphics functions
+
+*/
+#include <math.h>
+#include "Graphics.h"
+
+Point rotatePoint(const Point& origin, const Point& p, double angle) {
+    // rotate poind around origin by degrees
+    Point rotated;
+    double phi = angle * M_PI / 180.0;
+    double dx = p.x - origin.x;
+    double dy = p.y - origin.y;
+    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
+    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
+    return rotated;
+}
+
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
+    std::vector<Point> rotatedPoints;
+    for (const auto& p : pts) {
+         rotatedPoints.push_back(rotatePoint(origin, p, angle));
+    }
+     return rotatedPoints;
+}

lib/obp60task/Graphics.h

@@ -0,0 +1,17 @@
+#pragma once
+#include <vector>
+
+struct Point {
+    double x;
+    double y;
+};
+
+struct Rect {
+    double x;
+    double y;
+    double w;
+    double h;
+};
+
+Point rotatePoint(const Point& origin, const Point& p, double angle);
+std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);

lib/obp60task/OBP60Extensions.cpp

@@ -276,30 +276,20 @@ String xdrDelete(String input){
     return input;
 }
 
-Point rotatePoint(const Point& origin, const Point& p, double angle) {
-    // rotate poind around origin by degrees
-    Point rotated;
-    double phi = angle * M_PI / 180.0;
-    double dx = p.x - origin.x;
-    double dy = p.y - origin.y;
-    rotated.x = origin.x + cos(phi) * dx - sin(phi) * dy;
-    rotated.y = origin.y + sin(phi) * dx + cos(phi) * dy;
-    return rotated;
-}
-
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle) {
-    std::vector<Point> rotatedPoints;
-    for (const auto& p : pts) {
-         rotatedPoints.push_back(rotatePoint(origin, p, angle));
-    }
-     return rotatedPoints;
-}
-
 void fillPoly4(const std::vector<Point>& p4, uint16_t color) {
     getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[1].x, p4[1].y, p4[2].x, p4[2].y, color);
     getdisplay().fillTriangle(p4[0].x, p4[0].y, p4[2].x, p4[2].y, p4[3].x, p4[3].y, color);
 }
 
+void drawPoly(const std::vector<Point>& points, uint16_t color) {
+    size_t polysize = points.size();
+    for (size_t i = 0; i < polysize - 1; i++) {
+        getdisplay().drawLine(points[i].x, points[i].y, points[i+1].x, points[i+1].y, color);
+    }
+    // close path
+    getdisplay().drawLine(points[polysize-1].x, points[polysize-1].y, points[0].x, points[0].y, color);
+}
+
 // Split string into words, whitespace separated
 std::vector<String> split(const String &s) {
     std::vector<String> words;

lib/obp60task/OBP60Extensions.h

@@ -4,6 +4,7 @@
 #include <Arduino.h>
 #include "OBP60Hardware.h"
 #include "LedSpiTask.h"
+#include "Graphics.h"
 #include <GxEPD2_BW.h>                  // E-paper lib V2
 #include <Adafruit_FRAM_I2C.h>          // I2C FRAM
 
@@ -62,13 +63,8 @@ GxEPD2_BW<GxEPD2_420_SE0420NQ04, GxEPD2_420_SE0420NQ04::HEIGHT> & getdisplay();
 #define PAGE_UPDATE 1      // page wants display to update
 #define PAGE_HIBERNATE 2   // page wants displey to hibernate
 
-struct Point {
-    double x;
-    double y;
-};
-Point rotatePoint(const Point& origin, const Point& p, double angle);
-std::vector<Point> rotatePoints(const Point& origin, const std::vector<Point>& pts, double angle);
 void fillPoly4(const std::vector<Point>& p4, uint16_t color);
+void drawPoly(const std::vector<Point>& points, uint16_t color);
  
 void deepSleep(CommonData &common);
 

lib/obp60task/PageAnchor.cpp

@@ -2,6 +2,7 @@
 
 #include "Pagedata.h"
 #include "OBP60Extensions.h"
+#include "ConfigMenu.h"
 
 /*
   Anchor overview with additional associated data
@@ -55,6 +56,9 @@ class PageAnchor : public Page
     bool holdvalues = false;
     String flashLED;
     String backlightMode;
+    String lengthformat;
+
+    int scale = 50; // Radius of display circle in meter
 
     bool alarm = false;
     bool alarm_enabled = false;
@@ -71,15 +75,19 @@ class PageAnchor : public Page
 
     char mode = 'N'; // (N)ormal, (C)onfig
 
+    // ConfigMenu menu;
+
     void displayModeNormal(PageData &pageData) {
 
         // Boatvalues: DBS, HDT, AWS, AWD, LAT, LON, HDOP
         GwApi::BoatValue *bv_dbs = pageData.values[0]; // DBS
         String sval_dbs = formatValue(bv_dbs, *commonData).svalue;
+        String sunit_dbs = formatValue(bv_dbs, *commonData).unit; 
         GwApi::BoatValue *bv_hdt = pageData.values[1]; // HDT
         String sval_hdt = formatValue(bv_hdt, *commonData).svalue;
         GwApi::BoatValue *bv_aws = pageData.values[2]; // AWS
         String sval_aws = formatValue(bv_aws, *commonData).svalue;
+        String sunit_aws = formatValue(bv_aws, *commonData).unit; 
         GwApi::BoatValue *bv_awd = pageData.values[3]; // AWD
         String sval_awd = formatValue(bv_awd, *commonData).svalue;
         GwApi::BoatValue *bv_lat = pageData.values[4]; // LAT
@@ -88,65 +96,115 @@ class PageAnchor : public Page
         String sval_lon = formatValue(bv_lon, *commonData).svalue;
         GwApi::BoatValue *bv_hdop = pageData.values[6]; // HDOP
         String sval_hdop = formatValue(bv_hdop, *commonData).svalue;
+        String sunit_hdop = formatValue(bv_hdop, *commonData).unit; 
+
+        LOG_DEBUG(GwLog::DEBUG,"Drawing at PageAnchor; DBS=%f, HDT=%f, AWS=%f", bv_dbs->value, bv_hdt->value, bv_aws->value);
 
         Point c = {200, 150}; // center = anchor position
         uint16_t r = 125;
 
         Point b = {200, 180}; // boat position while dropping anchor
 
-        std::vector<Point> pts_boat = { // polygon lines
+        const std::vector<Point> pts_boat = { // polygon lines
             {b.x - 5, b.y},
             {b.x - 5, b.y - 10},
             {b.x, b.y - 16},
-            {b.x + 5, b.y - 10}
+            {b.x + 5, b.y - 10},
+            {b.x + 5, b.y}
         };
         //rotatePoints und dann Linien zeichnen
         // TODO rotate boat according to current heading
-        //fillPoly4(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
+        //drawPoly(rotatePoints(c, pts, RadToDeg(value2)), commonData->fgcolor);
+        drawPoly(pts_boat, commonData->fgcolor);
+
+        /*size_t polysize = pts_boat.size();
+        for (size_t i = 0; i < polysize - 1; i++) {
+            getdisplay().drawLine(pts_boat[i].x, pts_boat[i].y, pts_boat[i+1].x, pts_boat[i+1].y, commonData->fgcolor);
+        }
+        // close path
+        getdisplay().drawLine(pts_boat[polysize-1].x, pts_boat[polysize-1].y, pts_boat[0].x, pts_boat[0].y, commonData->fgcolor);
+        */
 
         // Draw wind arrow
-        /*
+        const std::vector<Point> pts_wind = {
-        if self._bd.awa.value:
+            {c.x, c.y - r + 25},
-            p = ((cx, cy - r + 25), (cx - 12, cy - r - 4), (cx, cy - r + 6), (cx + 12, cy - r - 4), (cx, cy - r + 25))
+            {c.x - 12, c.y - r - 4},
-            wind = self.rotate((cx, cy), p, self._bd.awa.value)
+            {c.x, c.y - r + 6},
-            ctx.move_to(*wind[0])
+            {c.x + 12, c.y - r - 4}
-            for point in wind[1:]:
+        };
-                ctx.line_to(*point)
+        if (bv_awd->valid) {
-            ctx.fill()
+            fillPoly4(rotatePoints(c, pts_wind, bv_awd->value), commonData->fgcolor);
-        */
+        }
 
         // Title and corner value headings
         getdisplay().setTextColor(commonData->fgcolor);
-        getdisplay().setFont(&Ubuntu_Bold10pt8b);
+        getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(8, 48);
         getdisplay().print("Anchor");
 
+        getdisplay().setFont(&Ubuntu_Bold10pt8b);
         getdisplay().setCursor(8, 200);
         getdisplay().print("Depth");
-
+        drawTextRalign(392, 38, "Chain");
-        drawTextRalign(392, 50, "Chain");
         drawTextRalign(392, 200, "Wind");
 
+        // Units
+        getdisplay().setCursor(8, 272);
+        getdisplay().print(sunit_dbs);
+        drawTextRalign(392, 272, sunit_aws);
+        drawTextRalign(392, 100, lengthformat); // chain unit not implemented
+
         // Corner values
         getdisplay().setFont(&Ubuntu_Bold8pt8b);
-        getdisplay().setCursor(2, 70);
+        getdisplay().setCursor(8, 70);
         getdisplay().print("Alarm: ");
         getdisplay().print(alarm_enabled ? "On" : "Off");
 
-        // Units
+        getdisplay().setCursor(8, 90);
+        getdisplay().print("HDOP");
+        getdisplay().setCursor(8, 106);
+        if (bv_hdop->valid) {
+            getdisplay().print(round(bv_hdop->value), 0);
+            getdisplay().print(sunit_hdop);
+        } else {
+            getdisplay().print("n/a");
+        }
 
         // Values
         getdisplay().setFont(&DSEG7Classic_BoldItalic20pt7b);
+        // Current chain used
+        getdisplay().setCursor(328, 85);
+        getdisplay().print("27");
+
         // Depth
         getdisplay().setCursor(8, 250);
-        //getdisplay().print(sval_dbs);
+        getdisplay().print(sval_dbs);
-        getdisplay().print("6.4");
         // Wind
-        getdisplay().setCursor(320, 250);
+        getdisplay().setCursor(328, 250);
-        //getdisplay().print(sval_aws);
+        getdisplay().print(sval_aws);
-        getdisplay().print("12");
 
         getdisplay().drawCircle(c.x, c.y, r, commonData->fgcolor);
+        getdisplay().drawCircle(c.x, c.y, r + 1, commonData->fgcolor);
+ 
+        // zoom scale
+        getdisplay().drawLine(c.x + 10, c.y, c.x + r - 4, c.y, commonData->fgcolor);
+        // arrow left
+        getdisplay().drawLine(c.x + 10, c.y, c.x + 16, c.y - 4, commonData->fgcolor);
+        getdisplay().drawLine(c.x + 10, c.y, c.x + 16, c.y + 4, commonData->fgcolor);
+        // arrow right
+        getdisplay().drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y - 4, commonData->fgcolor);
+        getdisplay().drawLine(c.x + r - 4, c.y, c.x + r - 10, c.y + 4, commonData->fgcolor);
+        getdisplay().setFont(&Ubuntu_Bold8pt8b);
+        drawTextCenter(c.x + r / 2, c.y + 8, String(scale) + "m");
+ 
+        // alarm range circle
+        if (alarm_enabled) {
+            // alarm range in meter has to be smaller than the scale in meter
+            // r and r_range are pixel values
+            uint16_t r_range = int(alarm_range * r / scale);
+            LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Alarm range = %d", r_range);
+            getdisplay().drawCircle(c.x, c.y, r_range, commonData->fgcolor);
+        }
  
         // draw anchor symbol (as bitmap)
         getdisplay().drawXBitmap(c.x - anchor_width / 2, c.y - anchor_height / 2,
@@ -155,14 +213,25 @@ class PageAnchor : public Page
     }
 
     void displayModeConfig() {
+
+        // LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Mode=%c", mode);
+
         getdisplay().setTextColor(commonData->fgcolor);
         getdisplay().setFont(&Ubuntu_Bold12pt8b);
         getdisplay().setCursor(8, 48);
         getdisplay().print("Anchor configuration");
+        
+        // TODO
+        // show lat/lon for anchor pos
+        // show lat/lon for boat pos
+        // show distance anchor <-> boat
+
     }
 
 public:
-    PageAnchor(CommonData &common){
+    PageAnchor(CommonData &common) 
+    // : menu("Options", 80, 20)
+    {
         commonData = &common;
         config = commonData->config;
         logger = commonData->logger;
@@ -173,10 +242,32 @@ class PageAnchor : public Page
         holdvalues = config->getBool(config->holdvalues);
         flashLED = config->getString(config->flashLED);
         backlightMode = config->getString(config->backlight);
-        chainLength = config->getInt(config->chainLength);
+        lengthformat = config->getString(config->lengthFormat);
+        chain_length = config->getInt(config->chainLength);
        
         chain = 0;
         anchor_set = false;
+        alarm_range = 30;
+        /*
+        // Initialize config menu
+        ConfigMenuItem *newitem;
+        menu.setItemDimension(120, 20);
+        newitem = menu.addItem("chain", "Chain out", "int");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu.addItem("chainmax", "Chain max", "int");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu.addItem("zoom", "Zoom", "int");
+        newitem->setRange(0, 200, {1, });
+        newitem = menu.addItem("range", "Alarm range", "int");
+        newitem->setRange(0, 200, {1, 5, 10});
+        // START only for OBP40 
+        newitem = menu.addItem("anchor", "Anchor down", "bool");
+        newitem = menu.addItem("anchor_lat", "Adjust anchor lat.", "int");
+        newitem->setRange(0, 200, {1, 5, 10});
+        newitem = menu.addItem("anchor_lon", "Adjust anchor lon.", "int");
+        newitem->setRange(0, 200, {1, 5, 10});
+        // STOP only for OBP40
+        menu.setItemActive("chain"); */
      }
 
     void setupKeys(){
@@ -211,7 +302,6 @@ class PageAnchor : public Page
     int displayPage(PageData &pageData){
 
         // Logging boat values
-        LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor");
         LOG_DEBUG(GwLog::LOG,"Drawing at PageAnchor; Mode=%c", mode);
 
         // Set display in partial refresh mode