From f36d597e816ee5cff3bc85a30a929af57c686342 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 12 Jan 2021 17:47:02 +0100
Subject: [PATCH] Merge issues

---
 radio/src/curves.cpp                         |  5 ++++-
 radio/src/gui/128x64/model_curve_edit.cpp    |  4 ++--
 radio/src/gui/common/stdlcd/model_curves.cpp | 13 +++++--------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/radio/src/curves.cpp b/radio/src/curves.cpp
index a60c3a3a6..fe1dc377b 100644
--- a/radio/src/curves.cpp
+++ b/radio/src/curves.cpp
@@ -360,7 +360,10 @@ point_t getPoint(uint8_t curveIndex, uint8_t index)
 #if !defined(COLORLCD)
 point_t getPoint(uint8_t index)
 {
-  return getPoint(s_currIdxSubMenu, index);
+  point_t result = getPoint(s_currIdxSubMenu, index);
+  result.x = CURVE_CENTER_X + divRoundClosest(result.x * CURVE_SIDE_WIDTH, RESX);
+  result.y = CURVE_CENTER_Y + divRoundClosest(result.y * CURVE_SIDE_WIDTH, RESX);
+  return result;
 }
 
 int applyCurrentCurve(int x)
diff --git a/radio/src/gui/128x64/model_curve_edit.cpp b/radio/src/gui/128x64/model_curve_edit.cpp
index e8272de3c..747df3a55 100644
--- a/radio/src/gui/128x64/model_curve_edit.cpp
+++ b/radio/src/gui/128x64/model_curve_edit.cpp
@@ -219,8 +219,8 @@ void menuModelCurveOne(event_t event)
       lcdDrawNumber(7+2*FW+1, 5*FH, points[i], LEFT|(selectionMode==2?attr:0));
       
       // Selection square
-      lcdDrawFilledRect(point.x-1, point.y-2, 5, 5, SOLID, FORCE);
-      lcdDrawFilledRect(point.x, point.y-1, 3, 3, SOLID);
+      lcdDrawFilledRect(point.x - 2, point.y - 2, 5, 5, SOLID, FORCE);
+      lcdDrawFilledRect(point.x - 1, point.y - 1, 3, 3, SOLID);
       
       if (s_editMode > 0) {
         if (selectionMode == 1)
diff --git a/radio/src/gui/common/stdlcd/model_curves.cpp b/radio/src/gui/common/stdlcd/model_curves.cpp
index 2b3c3cb07..46336baf3 100644
--- a/radio/src/gui/common/stdlcd/model_curves.cpp
+++ b/radio/src/gui/common/stdlcd/model_curves.cpp
@@ -31,15 +31,12 @@
 void drawCurve(coord_t offset)
 {
   drawFunction(applyCurrentCurve, offset);
-  
-  uint8_t i = 0;
-  do {
+
+  CurveHeader & crv = g_model.curves[s_currIdxSubMenu];
+  for (uint8_t i = 0; i < crv.points + 5; i++) {
     point_t point = getPoint(i);
-    i++;
-    if (point.x == 0)
-      break;
-    lcdDrawFilledRect(point.x - offset, point.y - 1, 3, 3, SOLID, FORCE); // do markup square
-  } while (true);
+    lcdDrawFilledRect(point.x - 1 - offset, point.y - 1, 3, 3, SOLID, FORCE); // do markup square
+  }
 }
 
 void menuModelCurvesAll(event_t event)