Skip to content

Commit 5af9af1

Browse files
tobozotobozo
committed
Updated examples
1 parent fde7ad9 commit 5af9af1

File tree

5 files changed

+27
-21
lines changed

5 files changed

+27
-21
lines changed

‎examples/IC705Gauge/main/IC705.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,22 +49,22 @@ namespace LGFXMeter
4949
// [ S..3..5..7..8..+10..+30..+60 ]
5050
const ruler_unit_t Units_S[] = {
5151
/*{ idx, angle, label, size, distance, fontFace, fontSize, textDatum }*/
52-
{ 0, 0.0f, "S", 10, 12, &FreeSansBold18pt7b, 1.0f, MC_DATUM },
52+
{ 0, 0.0f, "S", 10, 12, &FreeSansBold12pt7b, 1.0f, MC_DATUM },
5353
{ 1, 0.5f, nullptr, 10, 0, nullptr, 0.0f, MC_DATUM },
5454
{ 2, 1.0f*_14th, nullptr, 5, 0, nullptr, 0.0f, MC_DATUM },
55-
{ 3, 2.0f*_14th, "3", 10, 12, &FreeSansBold12pt7b, 0.95f, MC_DATUM },
55+
{ 3, 2.0f*_14th, "3", 10, 12, &FreeSans12pt7b, 1.0f, MC_DATUM },
5656
{ 4, 3.0f*_14th, nullptr, 5, 0, nullptr, 0.0f, MC_DATUM },
57-
{ 5, 4.0f*_14th, "5", 10, 12, &FreeSansBold12pt7b, 0.95f, MC_DATUM },
57+
{ 5, 4.0f*_14th, "5", 10, 12, &FreeSans12pt7b, 1.0f, MC_DATUM },
5858
{ 6, 5.0f*_14th, nullptr, 5, 0, nullptr, 0.0f, MC_DATUM },
59-
{ 7, 6.0f*_14th, "7", 10, 12, &FreeSansBold12pt7b, 0.95f, MC_DATUM },
59+
{ 7, 6.0f*_14th, "7", 10, 12, &FreeSans12pt7b, 1.0f, MC_DATUM },
6060
{ 8, 7.0f*_14th, nullptr, 5, 0, nullptr, 0.0f, MC_DATUM },
61-
{ 9, 8.0f*_14th, "9", 10, 12, &FreeSansBold12pt7b, 0.95f, MC_DATUM },
62-
{ 10, 9.0f*_14th, "+10", 10, 13, &FreeSansBold9pt7b, 0.8f, MC_DATUM },
61+
{ 9, 8.0f*_14th, "9", 10, 12, &FreeSans12pt7b, 1.0f, MC_DATUM },
62+
{ 10, 9.0f*_14th, "+10", 10, 13, &FreeSans9pt7b, 1.0f, MC_DATUM },
6363
{ 11, 10.0f*_14th, nullptr, 0, 0, nullptr, 0.0f, MC_DATUM },
64-
{ 12, 11.0f*_14th, "+30", 10, 13, &FreeSansBold9pt7b, 0.8f, MC_DATUM },
64+
{ 12, 11.0f*_14th, "+30", 10, 13, &FreeSans9pt7b, 1.0f, MC_DATUM },
6565
{ 13, 12.0f*_14th, nullptr, 0, 0, nullptr, 0.0f, MC_DATUM },
6666
{ 14, 13.0f*_14th, nullptr, 0, 0, nullptr, 0.0f, MC_DATUM },
67-
{ 15, 14.0f*_14th, "+60", 10, 13, &FreeSansBold9pt7b, 0.8f, MC_DATUM },
67+
{ 15, 14.0f*_14th, "+60", 10, 13, &FreeSans9pt7b, 1.0f, MC_DATUM },
6868
};
6969

7070
// in between +10+20+60 red rulers for Units_S
@@ -94,7 +94,7 @@ namespace LGFXMeter
9494
};
9595

9696
// [ SWR..1..1.5..2...3...4..5.10.∞ ]
97-
const char* copyright = "ICSMeter V0.0.2 by F4HWN";
97+
const char* copyright = "LGFXMeter demo by tobozo";
9898
const ruler_unit_t Units_SWR[] = {
9999
/*{ idx, angle, label, size, distance, fontFace, fontSize, textDatum }*/
100100
{ 0, -5.0f, "SWR", 0, 10, &FreeSans12pt7b, 0.5f, TC_DATUM },
@@ -109,7 +109,7 @@ namespace LGFXMeter
109109
{ 9, 66.0f, "10", 8, 10, &FreeSans12pt7b, 0.5f, MC_DATUM },
110110
{ 10, 79.5f, "∞", 8, 10, &FreeSans12pt7b, 0.5f, MC_DATUM },
111111
{ 11, 45.0f, "IC-705", 0, -1, &FreeSansBold18pt7b, 0.65f, TC_DATUM }, // main title ruler
112-
{ 11, 45.0f, "F4HWN", 0, -25, &Orbitron_Light_24, 0.50f, TC_DATUM }, // vanity ruler
112+
{ 11, 45.0f,"@tobozo", 0, -25, &Orbitron_Light_24, 0.50f, TC_DATUM }, // vanity ruler
113113
{ 12, 45.0f, copyright, 0, -40, &Roboto_Thin_24, 0.50f, TC_DATUM }, // copyright ruler
114114
};
115115

‎examples/IC705Gauge/main/main.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,16 @@ void setup()
8484
// - 320*160 gauge with cfg.zoomAA=1.0 will use a 320*160 mask with NO antialias
8585
//
8686
// cfg.zoomAA = psramInit() ? 0.5 : 1.0;
87+
//cfg.zoomAA = 1.0;
8788

8889
// Optionally use pre-rendered arrow and custom shadow
8990
// - Image can be any size (scale will constrained) but smaller is faster, transparent png works
9091
// - Pointy end of the arrow goes on the top
9192
// - Shadow image must have same dimensions as arrow image
92-
//cfg.needleCfg.needleImg = &pixelArrow;
93-
//cfg.needleCfg.shadowImg = &shadowArrow;
94-
//cfg.needleCfg.scaleX = 0.5; // scaling down a stretched image to produce nicer antialiased result
93+
//cfg.needle.img = &pixelArrow;
94+
//cfg.needle.shadow = &shadowArrow;
95+
//cfg.needle.scaleX = 0.5; // scaling down a stretched image to produce nicer antialiased result
96+
//cfg.needle.axis = { GaugeWidth/2, GaugePosY+GaugeHeight }; // will be automatically positioned with a clunky calculation otherwise
9597

9698
// Optionally share a background image between TFT and the gauge sprite
9799
// - Image must be png/jpg/bmp/qoi or byte array

‎examples/VUMeter/main/VUMeter.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace LGFXMeter
6060
{ 13, 70.0f, "+1", 12, 15, &FreeSans12pt7b, 0.8f, MC_DATUM },
6161
{ 14, 80.0f, "+2", 12, 15, &FreeSans12pt7b, 0.8f, MC_DATUM },
6262
{ 15, 90.0f, "+3", 12, 15, &FreeSans12pt7b, 0.8f, MC_DATUM },
63-
{ 16, 45.0f, "VU", 0, -20, &Orbitron_Light_24, 1.5f, TC_DATUM }, // vanity ruler
63+
{ 16, 45.0f, "VU", 0, -20, &Orbitron_Light_24, 1.5f, TC_DATUM }, // main title ruler
6464
};
6565

6666

‎examples/VUMeter/main/main.cpp

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,10 +303,9 @@ void gfxSetup(LGFX_Device* gfx)
303303
.w = GaugeWidth,
304304
.h = GaugeHeight
305305
};
306-
307-
cfg.needleCfg.needleImg = &vuMeterArrow;
308-
cfg.bgImage = &bgImg;
309-
306+
cfg.needle.img = &vuMeterArrow;
307+
cfg.needle.axis = { GaugeWidth/2, GaugePosY+GaugeHeight };
308+
cfg.bgImage = &bgImg;
310309
VUMeterGauge = new Gauge_Class( cfg );
311310
}
312311

@@ -363,6 +362,7 @@ void gfxLoop(LGFX_Device* gfx)
363362
{
364363
static int prev_x[2];
365364
static int peak_x[2];
365+
float avglevel=0, lastavglevel=0;
366366

367367
auto buf = out.getBuffer();
368368
if (buf)
@@ -409,7 +409,11 @@ void gfxLoop(LGFX_Device* gfx)
409409
}
410410
}
411411

412-
VUMeterGauge->drawNeedle( (levels[0]+levels[1])*0.5f );
412+
avglevel = (levels[0]+levels[1])*0.5f;
413+
if( avglevel!=lastavglevel ) {
414+
VUMeterGauge->drawNeedle( avglevel );
415+
lastavglevel = avglevel;
416+
}
413417

414418
gfx->display();
415419
gfx->endWrite();

‎src/LGFXMeter.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
#ifdef __cplusplus
44

5-
#include "lgfx_meter/Gauge_Class.hpp"
5+
#include "lgfx_meter/Gauge_Class.hpp"
66

77
#else
88

9-
#error LGFXMeter requires a C++ compiler, please change file extension to .cc or .cpp
9+
#error "LGFXMeter requires a C++ compiler, please change file extension to .cc or .cpp"
1010

1111
#endif
1212

0 commit comments

Comments
 (0)