Merge with latest 2.3

radio/src/curves.cpp

@@ -20,7 +20,6 @@
 
 #include "opentx.h"
 
-uint8_t s_curveChan;
 int8_t * curveEnd[MAX_CURVES];
 
 void loadCurves()
@@ -120,7 +119,7 @@ bool isCurveUsed(uint8_t index)
 }
 
 #define CUSTOM_POINT_X(points, count, idx) ((idx)==0 ? -100 : (((idx)==(count)-1) ? 100 : points[(count)+(idx)-1]))
-int32_t compute_tangent(CurveHeader * crv, int8_t * points, int i)
+int32_t compute_tangent(CurveHeader * crv, const int8_t * points, int i)
 {
   int32_t m=0;
     uint8_t num_points = crv->points + 5;
@@ -240,7 +239,7 @@ int intpol(int x, uint8_t idx) // -100, -75, -50, -25, 0 ,25 ,50, 75, 100
   int8_t * points = curveAddress(idx);
   uint8_t count = crv.points+5;
   bool custom = (crv.type == CURVE_TYPE_CUSTOM);
-  int16_t erg = 0;
+  int16_t erg;
 
   x += RESXu;
 
@@ -339,11 +338,6 @@ int applyCustomCurve(int x, uint8_t idx)
     return intpol(x, idx);
 }
 
-point_t getPoint(uint8_t index)
-{
-  return getPoint(s_curveChan, index);
-}
-
 point_t getPoint(uint8_t curveIndex, uint8_t index)
 {
   point_t result = {0, 0};
@@ -363,7 +357,14 @@ point_t getPoint(uint8_t curveIndex, uint8_t index)
   return result;
 }
 
+#if !defined(COLORLCD)
+point_t getPoint(uint8_t index)
+{
+  return getPoint(s_currIdxSubMenu, index);
+}
+
 int applyCurrentCurve(int x)
 {
-  return applyCustomCurve(x, s_curveChan);
+  return applyCustomCurve(x, s_currIdxSubMenu);
 }
+#endif