@@ -1472,22 +1472,22 @@ MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_
1472
1472
MicroViewSlider::MicroViewSlider (uint8_t newx, uint8_t newy, int16_t min, int16_t max, uint8_t sty):MicroViewWidget(newx, newy, min, max) {
1473
1473
1474
1474
switch (sty){
1475
- case WIDGETSTYLE1:
1476
- style=1 ;
1477
- totalTicks=60 ;
1478
- break ;
1479
- case WIDGETSTYLE2:
1480
- style=2 ;
1481
- totalTicks=20 ;
1482
- break ;
1483
- case WIDGETSTYLE3:
1484
- style=3 ;
1485
- totalTicks=40 ;
1486
- break ;
1487
- default :
1488
- style=0 ;
1489
- totalTicks=30 ;
1490
- break ;
1475
+ case WIDGETSTYLE1:
1476
+ style=1 ;
1477
+ totalTicks=60 ;
1478
+ break ;
1479
+ case WIDGETSTYLE2:
1480
+ style=2 ;
1481
+ totalTicks=20 ;
1482
+ break ;
1483
+ case WIDGETSTYLE3:
1484
+ style=3 ;
1485
+ totalTicks=40 ;
1486
+ break ;
1487
+ default :
1488
+ style=0 ;
1489
+ totalTicks=30 ;
1490
+ break ;
1491
1491
}
1492
1492
1493
1493
prevValue=getMinValue ();
@@ -1502,35 +1502,35 @@ MicroViewSlider::MicroViewSlider(uint8_t newx, uint8_t newy, int16_t min, int16_
1502
1502
*/
1503
1503
void MicroViewSlider::drawFace () {
1504
1504
uint8_t offsetX, offsetY, endOffset;
1505
- offsetX=getX ();
1506
- offsetY=getY ();
1505
+ offsetX=getX ();
1506
+ offsetY=getY ();
1507
1507
1508
1508
// Horizontal styles, style 0 or 1
1509
- if (style==0 || style==1 ) {
1510
- endOffset = offsetX + totalTicks + 2 ;
1509
+ if (style==0 || style==1 ) {
1510
+ endOffset = offsetX + totalTicks + 2 ;
1511
1511
// Draw minor ticks
1512
- for (uint8_t i=offsetX+1 ; i<endOffset; i+=2 ) {
1513
- uView.lineV (i, offsetY+5 , 3 );
1514
- }
1512
+ for (uint8_t i=offsetX+1 ; i<endOffset; i+=2 ) {
1513
+ uView.lineV (i, offsetY+5 , 3 );
1514
+ }
1515
1515
// Draw extensions for major ticks
1516
- for (uint8_t i=offsetX+1 ; i<endOffset; i+=10 ) {
1517
- uView.lineV (i, offsetY+3 , 2 );
1516
+ for (uint8_t i=offsetX+1 ; i<endOffset; i+=10 ) {
1517
+ uView.lineV (i, offsetY+3 , 2 );
1518
+ }
1518
1519
}
1519
- }
1520
1520
// Vertical styles, style 2 or 3
1521
- else {
1522
- endOffset = offsetY + totalTicks + 2 ;
1521
+ else {
1522
+ endOffset = offsetY + totalTicks + 2 ;
1523
1523
// Draw minor ticks
1524
- for (uint8_t i=offsetY+1 ; i<=endOffset; i+=2 ) {
1525
- uView.lineH (offsetX, i, 3 );
1526
- }
1524
+ for (uint8_t i=offsetY+1 ; i<=endOffset; i+=2 ) {
1525
+ uView.lineH (offsetX, i, 3 );
1526
+ }
1527
1527
// Draw extensions for major ticks
1528
- for (uint8_t i=offsetY+1 ; i<=endOffset; i+=10 ) {
1529
- uView.lineH (offsetX+3 , i, 2 );
1528
+ for (uint8_t i=offsetY+1 ; i<=endOffset; i+=10 ) {
1529
+ uView.lineH (offsetX+3 , i, 2 );
1530
+ }
1530
1531
}
1531
- }
1532
1532
1533
- }
1533
+ }
1534
1534
1535
1535
/* * \brief Draw widget value.
1536
1536
@@ -1539,8 +1539,8 @@ void MicroViewSlider::drawFace() {
1539
1539
void MicroViewSlider::draw () {
1540
1540
uint8_t offsetX, offsetY;
1541
1541
uint8_t tickPosition=0 ;
1542
- char strBuffer[7 ];
1543
- char formatStr[] = " %1d" ;
1542
+ char strBuffer[7 ];
1543
+ char formatStr[] = " %1d" ;
1544
1544
1545
1545
formatStr[1 ] = ' 0' + getMaxValLen (); // Set the field width for the value range
1546
1546
@@ -1561,43 +1561,43 @@ void MicroViewSlider::draw() {
1561
1561
1562
1562
1563
1563
if (needFirstDraw) {
1564
- sprintf (strBuffer, formatStr, prevValue); // print with fixed width so that blank space will cover larger value
1565
- needFirstDraw=false ;
1564
+ sprintf (strBuffer, formatStr, prevValue); // print with fixed width so that blank space will cover larger value
1565
+ needFirstDraw=false ;
1566
1566
}
1567
1567
else {
1568
- // Draw current pointer
1569
- if (style==0 || style==1 ){ // Horizontal
1570
- tickPosition = ((float )(uint16_t )(getValue ()-getMinValue ())/(float )(uint16_t )(getMaxValue ()-getMinValue ()))*totalTicks;
1571
- uView.lineH (offsetX+tickPosition,offsetY, 3 , WHITE, XOR);
1572
- uView.pixel (offsetX+1 +tickPosition,offsetY+1 , WHITE, XOR);
1573
- }
1574
- else { // Vertical
1575
- tickPosition = ((float )(uint16_t )(getMaxValue ()-getValue ())/(float )(uint16_t )(getMaxValue ()-getMinValue ()))*totalTicks;
1576
- uView.lineV (offsetX+7 , offsetY+tickPosition, 3 , WHITE, XOR);
1577
- uView.pixel (offsetX+6 , offsetY+1 +tickPosition, WHITE, XOR);
1578
- }
1579
-
1580
- sprintf (strBuffer, formatStr, getValue ()); // print with fixed width so that blank space will cover larger value
1581
- prevValue=getValue ();
1568
+ // Draw current pointer
1569
+ if (style==0 || style==1 ){ // Horizontal
1570
+ tickPosition = ((float )(uint16_t )(getValue ()-getMinValue ())/(float )(uint16_t )(getMaxValue ()-getMinValue ()))*totalTicks;
1571
+ uView.lineH (offsetX+tickPosition,offsetY, 3 , WHITE, XOR);
1572
+ uView.pixel (offsetX+1 +tickPosition,offsetY+1 , WHITE, XOR);
1573
+ }
1574
+ else { // Vertical
1575
+ tickPosition = ((float )(uint16_t )(getMaxValue ()-getValue ())/(float )(uint16_t )(getMaxValue ()-getMinValue ()))*totalTicks;
1576
+ uView.lineV (offsetX+7 , offsetY+tickPosition, 3 , WHITE, XOR);
1577
+ uView.pixel (offsetX+6 , offsetY+1 +tickPosition, WHITE, XOR);
1578
+ }
1579
+
1580
+ sprintf (strBuffer, formatStr, getValue ()); // print with fixed width so that blank space will cover larger value
1581
+ prevValue=getValue ();
1582
1582
}
1583
1583
1584
1584
// Draw value
1585
- switch (style){
1586
- case 0 :
1587
- uView.setCursor (offsetX+totalTicks+4 , offsetY+1 );
1588
- break ;
1589
- case 1 :
1590
- uView.setCursor (offsetX, offsetY+10 );
1591
- break ;
1592
- case 2 :
1593
- uView.setCursor (offsetX+1 , offsetY+totalTicks+4 );
1594
- break ;
1595
- default :
1596
- uView.setCursor (offsetX+9 , offsetY);
1597
- break ;
1598
- }
1599
-
1600
- uView.print (strBuffer);
1585
+ switch (style){
1586
+ case 0 :
1587
+ uView.setCursor (offsetX+totalTicks+4 , offsetY+1 );
1588
+ break ;
1589
+ case 1 :
1590
+ uView.setCursor (offsetX, offsetY+10 );
1591
+ break ;
1592
+ case 2 :
1593
+ uView.setCursor (offsetX+1 , offsetY+totalTicks+4 );
1594
+ break ;
1595
+ default :
1596
+ uView.setCursor (offsetX+9 , offsetY);
1597
+ break ;
1598
+ }
1599
+
1600
+ uView.print (strBuffer);
1601
1601
}
1602
1602
1603
1603
// -------------------------------------------------------------------------------------
@@ -1651,7 +1651,7 @@ void MicroViewGauge::drawFace() {
1651
1651
offsetY=getY ();
1652
1652
1653
1653
uView.circle (offsetX,offsetY,radius);
1654
-
1654
+
1655
1655
for (int i=150 ;i<=390 ;i+=30 ) { // Major tick from 150 degree to 390 degree
1656
1656
degreeSec=i*(PI/180 );
1657
1657
fromSecX = cos (degreeSec) * (radius / 1.5 );
@@ -1715,9 +1715,9 @@ void MicroViewGauge::draw() {
1715
1715
1716
1716
// Draw value
1717
1717
if (style>0 )
1718
- uView.setCursor (offsetX-valOffset, offsetY+10 );
1718
+ uView.setCursor (offsetX-valOffset, offsetY+10 );
1719
1719
else
1720
- uView.setCursor (offsetX-valOffset, offsetY+11 );
1720
+ uView.setCursor (offsetX-valOffset, offsetY+11 );
1721
1721
1722
1722
uView.print (strBuffer);
1723
1723
}
0 commit comments