Merge issues
This commit is contained in:
@@ -360,7 +360,10 @@ point_t getPoint(uint8_t curveIndex, uint8_t index)
|
|||||||
#if !defined(COLORLCD)
|
#if !defined(COLORLCD)
|
||||||
point_t getPoint(uint8_t index)
|
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)
|
int applyCurrentCurve(int x)
|
||||||
|
|||||||
@@ -219,8 +219,8 @@ void menuModelCurveOne(event_t event)
|
|||||||
lcdDrawNumber(7+2*FW+1, 5*FH, points[i], LEFT|(selectionMode==2?attr:0));
|
lcdDrawNumber(7+2*FW+1, 5*FH, points[i], LEFT|(selectionMode==2?attr:0));
|
||||||
|
|
||||||
// Selection square
|
// Selection square
|
||||||
lcdDrawFilledRect(point.x-1, point.y-2, 5, 5, SOLID, FORCE);
|
lcdDrawFilledRect(point.x - 2, point.y - 2, 5, 5, SOLID, FORCE);
|
||||||
lcdDrawFilledRect(point.x, point.y-1, 3, 3, SOLID);
|
lcdDrawFilledRect(point.x - 1, point.y - 1, 3, 3, SOLID);
|
||||||
|
|
||||||
if (s_editMode > 0) {
|
if (s_editMode > 0) {
|
||||||
if (selectionMode == 1)
|
if (selectionMode == 1)
|
||||||
|
|||||||
@@ -31,15 +31,12 @@
|
|||||||
void drawCurve(coord_t offset)
|
void drawCurve(coord_t offset)
|
||||||
{
|
{
|
||||||
drawFunction(applyCurrentCurve, offset);
|
drawFunction(applyCurrentCurve, offset);
|
||||||
|
|
||||||
uint8_t i = 0;
|
CurveHeader & crv = g_model.curves[s_currIdxSubMenu];
|
||||||
do {
|
for (uint8_t i = 0; i < crv.points + 5; i++) {
|
||||||
point_t point = getPoint(i);
|
point_t point = getPoint(i);
|
||||||
i++;
|
lcdDrawFilledRect(point.x - 1 - offset, point.y - 1, 3, 3, SOLID, FORCE); // do markup square
|
||||||
if (point.x == 0)
|
}
|
||||||
break;
|
|
||||||
lcdDrawFilledRect(point.x - offset, point.y - 1, 3, 3, SOLID, FORCE); // do markup square
|
|
||||||
} while (true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void menuModelCurvesAll(event_t event)
|
void menuModelCurvesAll(event_t event)
|
||||||
|
|||||||
Reference in New Issue
Block a user