Skip to content

Commit dd23967

Browse files
jurkovic-nikolajurkovic-nikola
committed
lcd cleanup
1 parent c788686 commit dd23967

File tree

1 file changed

+46
-47
lines changed

1 file changed

+46
-47
lines changed

‎src/devices/lcd/lcd.go

+46-47
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func calculateIntXY(fontSize float64, value int) (int, int) {
264264
}
265265

266266
func calculateStringXY(fontSize float64, value string) (int, int) {
267-
opts := opentype.FaceOptions{Size: fontSize, DPI: 72, Hinting: 2}
267+
opts := opentype.FaceOptions{Size: fontSize, DPI: 72, Hinting: 0}
268268
fontFace, err := opentype.NewFace(lcd.sfntFont, &opts)
269269
if err != nil {
270270
logger.Log(logger.Fields{"error": err}).Error("Unable to process font face")
@@ -298,99 +298,99 @@ func GenerateScreenImage(imageType uint8, value, value1, value2, value3 int) []b
298298
case DisplayLiquid:
299299
{
300300
x, y := calculateStringXY(40, "LIQUID TEMP")
301-
drawString(x, y-120, 40, c, "LIQUID TEMP", rgba)
301+
drawString(x, y-120, 40, "LIQUID TEMP", rgba)
302302

303303
x, y = calculateStringXY(40, "[ °C ]")
304-
drawString(x, y+120, 40, c, "[ °C ]", rgba)
304+
drawString(x, y+120, 40, "[ °C ]", rgba)
305305

306306
x, y = calculateStringXY(240, strconv.Itoa(value))
307-
drawString(x, y, 240, c, strconv.Itoa(value), rgba)
307+
drawString(x, y, 240, strconv.Itoa(value), rgba)
308308
}
309309
case DisplayGPU:
310310
{
311311
x, y := calculateStringXY(40, "GPU TEMP")
312-
drawString(x, y-120, 40, c, "GPU TEMP", rgba)
312+
drawString(x, y-120, 40, "GPU TEMP", rgba)
313313

314314
x, y = calculateStringXY(40, "[ °C ]")
315-
drawString(x, y+120, 40, c, "[ °C ]", rgba)
315+
drawString(x, y+120, 40, "[ °C ]", rgba)
316316

317317
x, y = calculateStringXY(240, strconv.Itoa(value))
318-
drawString(x, y, 240, c, strconv.Itoa(value), rgba)
318+
drawString(x, y, 240, strconv.Itoa(value), rgba)
319319
}
320320
case DisplayCPU:
321321
{
322322
x, y := calculateStringXY(40, "CPU TEMP")
323-
drawString(x, y-120, 40, c, "CPU TEMP", rgba)
323+
drawString(x, y-120, 40, "CPU TEMP", rgba)
324324

325325
x, y = calculateStringXY(40, "[ °C ]")
326-
drawString(x, y+120, 40, c, "[ °C ]", rgba)
326+
drawString(x, y+120, 40, "[ °C ]", rgba)
327327

328328
x, y = calculateStringXY(240, strconv.Itoa(value))
329-
drawString(x, y, 240, c, strconv.Itoa(value), rgba)
329+
drawString(x, y, 240, strconv.Itoa(value), rgba)
330330
}
331331
case DisplayPump:
332332
{
333333
x, y := calculateStringXY(40, "PUMP SPEED")
334-
drawString(x, y-120, 40, c, "PUMP SPEED", rgba)
334+
drawString(x, y-120, 40, "PUMP SPEED", rgba)
335335

336336
x, y = calculateStringXY(40, "[ RPM ]")
337-
drawString(x, y+120, 40, c, "[ RPM ]", rgba)
337+
drawString(x, y+120, 40, "[ RPM ]", rgba)
338338

339339
x, y = calculateStringXY(200, strconv.Itoa(value))
340-
drawString(x, y, 200, c, strconv.Itoa(value), rgba)
340+
drawString(x, y, 200, strconv.Itoa(value), rgba)
341341
}
342342
case DisplayAllInOne:
343343
{
344344
x, y := calculateStringXY(40, "LIQUID")
345-
drawString(x-80, y-110, 40, c, "LIQUID", rgba)
345+
drawString(x-80, y-110, 40, "LIQUID", rgba)
346346

347347
x, y = calculateStringXY(40, "CPU")
348-
drawString(x+80, y-110, 40, c, "CPU", rgba)
348+
drawString(x+80, y-110, 40, "CPU", rgba)
349349

350350
x, y = calculateStringXY(40, "PUMP")
351-
drawString(x, y+130, 40, c, "PUMP", rgba)
351+
drawString(x, y+130, 40, "PUMP", rgba)
352352

353353
x, y = calculateStringXY(100, strconv.Itoa(value))
354-
drawString(x-80, y-40, 100, c, strconv.Itoa(value), rgba)
354+
drawString(x-80, y-40, 100, strconv.Itoa(value), rgba)
355355

356356
x, y = calculateStringXY(100, strconv.Itoa(value1))
357-
drawString(x+80, y-40, 100, c, strconv.Itoa(value1), rgba)
357+
drawString(x+80, y-40, 100, strconv.Itoa(value1), rgba)
358358

359359
x, y = calculateStringXY(100, strconv.Itoa(value2))
360-
drawString(x, y+60, 100, c, strconv.Itoa(value2), rgba)
360+
drawString(x, y+60, 100, strconv.Itoa(value2), rgba)
361361
}
362362
case DisplayLiquidCPU:
363363
{
364-
drawString(120+int(c.PointToFixed(24)>>6), 110+int(c.PointToFixed(24)>>6), 40, c, "LIQUID", rgba)
365-
drawString(280+int(c.PointToFixed(24)>>6), 110+int(c.PointToFixed(24)>>6), 40, c, "CPU", rgba)
366-
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, c, "[ °C ]", rgba)
367-
drawString(95+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, c, strconv.Itoa(value), rgba)
368-
drawString(250+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, c, strconv.Itoa(value1), rgba)
364+
drawString(120+int(c.PointToFixed(24)>>6), 110+int(c.PointToFixed(24)>>6), 40, "LIQUID", rgba)
365+
drawString(280+int(c.PointToFixed(24)>>6), 110+int(c.PointToFixed(24)>>6), 40, "CPU", rgba)
366+
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, "[ °C ]", rgba)
367+
drawString(95+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, strconv.Itoa(value), rgba)
368+
drawString(250+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, strconv.Itoa(value1), rgba)
369369
}
370370
case DisplayCpuGpuTemp:
371371
{
372-
drawString(120+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, c, "CPU", rgba)
373-
drawString(270+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, c, "GPU", rgba)
374-
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, c, "[ °C ]", rgba)
375-
drawString(90+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, c, strconv.Itoa(value), rgba)
376-
drawString(240+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, c, strconv.Itoa(value1), rgba)
372+
drawString(120+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, "CPU", rgba)
373+
drawString(270+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, "GPU", rgba)
374+
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, "[ °C ]", rgba)
375+
drawString(90+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, strconv.Itoa(value), rgba)
376+
drawString(240+int(c.PointToFixed(24)>>6), 270+int(c.PointToFixed(24)>>6), 160, strconv.Itoa(value1), rgba)
377377
}
378378
case DisplayCpuGpuLoadTemp:
379379
{
380-
drawString(130+int(c.PointToFixed(24)>>6), 140+int(c.PointToFixed(24)>>6), 40, c, "CPU", rgba)
381-
drawString(270+int(c.PointToFixed(24)>>6), 140+int(c.PointToFixed(24)>>6), 40, c, "GPU", rgba)
382-
drawString(190+int(c.PointToFixed(24)>>6), 90+int(c.PointToFixed(24)>>6), 40, c, "[ °C ]", rgba)
383-
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, c, "[ % ]", rgba)
384-
drawString(120+int(c.PointToFixed(24)>>6), 220+int(c.PointToFixed(24)>>6), 80, c, fmt.Sprintf("%02d", value), rgba)
385-
drawString(260+int(c.PointToFixed(24)>>6), 220+int(c.PointToFixed(24)>>6), 80, c, fmt.Sprintf("%02d", value1), rgba)
386-
drawString(120+int(c.PointToFixed(24)>>6), 290+int(c.PointToFixed(24)>>6), 80, c, fmt.Sprintf("%02d", value2), rgba)
387-
drawString(260+int(c.PointToFixed(24)>>6), 290+int(c.PointToFixed(24)>>6), 80, c, fmt.Sprintf("%02d", value3), rgba)
380+
drawString(130+int(c.PointToFixed(24)>>6), 140+int(c.PointToFixed(24)>>6), 40, "CPU", rgba)
381+
drawString(270+int(c.PointToFixed(24)>>6), 140+int(c.PointToFixed(24)>>6), 40, "GPU", rgba)
382+
drawString(190+int(c.PointToFixed(24)>>6), 90+int(c.PointToFixed(24)>>6), 40, "[ °C ]", rgba)
383+
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, "[ % ]", rgba)
384+
drawString(120+int(c.PointToFixed(24)>>6), 220+int(c.PointToFixed(24)>>6), 80, fmt.Sprintf("%02d", value), rgba)
385+
drawString(260+int(c.PointToFixed(24)>>6), 220+int(c.PointToFixed(24)>>6), 80, fmt.Sprintf("%02d", value1), rgba)
386+
drawString(120+int(c.PointToFixed(24)>>6), 290+int(c.PointToFixed(24)>>6), 80, fmt.Sprintf("%02d", value2), rgba)
387+
drawString(260+int(c.PointToFixed(24)>>6), 290+int(c.PointToFixed(24)>>6), 80, fmt.Sprintf("%02d", value3), rgba)
388388
}
389389
case DisplayCpuGpuLoad:
390390
{
391-
drawString(120+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, c, "CPU", rgba)
392-
drawString(270+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, c, "GPU", rgba)
393-
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, c, "[ % ]", rgba)
391+
drawString(120+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, "CPU", rgba)
392+
drawString(270+int(c.PointToFixed(24)>>6), 120+int(c.PointToFixed(24)>>6), 40, "GPU", rgba)
393+
drawString(190+int(c.PointToFixed(24)>>6), 350+int(c.PointToFixed(24)>>6), 40, "[ % ]", rgba)
394394

395395
reduce := 0
396396
bounds, _ := font.BoundString(basicfont.Face7x13, strconv.Itoa(value))
@@ -399,23 +399,23 @@ func GenerateScreenImage(imageType uint8, value, value1, value2, value3 int) []b
399399
reduce = 30
400400
}
401401
x := 100 + textWidth - reduce
402-
drawString(x, 270+int(c.PointToFixed(24)>>6), 160, c, fmt.Sprintf("%02d", value), rgba)
402+
drawString(x, 270+int(c.PointToFixed(24)>>6), 160, fmt.Sprintf("%02d", value), rgba)
403403

404404
bounds, _ = font.BoundString(basicfont.Face7x13, strconv.Itoa(value1))
405405
textWidth = (bounds.Max.X - bounds.Min.X).Floor()
406406
if value == 100 {
407407
reduce = 30
408408
}
409409
x = 240 + textWidth + 15 - reduce
410-
drawString(x, 270+int(c.PointToFixed(24)>>6), 160, c, fmt.Sprintf("%02d", value1), rgba)
410+
drawString(x, 270+int(c.PointToFixed(24)>>6), 160, fmt.Sprintf("%02d", value1), rgba)
411411
}
412412
case DisplayTime:
413413
{
414414
x, y := calculateStringXY(70, common.GetDate())
415-
drawString(x, y-50, 70, c, common.GetDate(), rgba)
415+
drawString(x, y-50, 70, common.GetDate(), rgba)
416416

417417
x, y = calculateStringXY(130, common.GetTime())
418-
drawString(x, y+50, 130, c, common.GetTime(), rgba)
418+
drawString(x, y+50, 130, common.GetTime(), rgba)
419419
}
420420
}
421421

@@ -444,14 +444,13 @@ func drawString(x, y int, fontSite float64, c *freetype.Context, text string) *f
444444
*/
445445

446446
// drawString will create a new string for image
447-
func drawString(x, y int, fontSite float64, c *freetype.Context, text string, rgba *image.RGBA) {
448-
c.SetFontSize(fontSite)
447+
func drawString(x, y int, fontSite float64, text string, rgba *image.RGBA) {
449448
pt := freetype.Pt(x, y)
450-
451449
opts := opentype.FaceOptions{Size: fontSite, DPI: 72, Hinting: 0}
452450
fontFace, err := opentype.NewFace(lcd.sfntFont, &opts)
453451
if err != nil {
454452
logger.Log(logger.Fields{"error": err}).Error("Unable to process font face")
453+
return
455454
}
456455
d := &font.Drawer{
457456
Dst: rgba,

0 commit comments

Comments
 (0)