From dc7272c289b540436f50284c0959f305f963b8b7 Mon Sep 17 00:00:00 2001 From: Nico Aleman Date: Thu, 30 Jan 2025 17:24:04 -0800 Subject: [PATCH] Fix & Clean-up Trip + Current Readings - Scale of Trip Distance fixed (may be incorrect elsewhere? Worth investigating) - Formatting of Distance fixed to be more legible - Formatting of Amps fixed to be more legible --- display/res/amps_box.lisp | 4 +--- display/res/trip_box.lisp | 19 +++++++++---------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/display/res/amps_box.lisp b/display/res/amps_box.lisp index 49d5501..834fbc1 100644 --- a/display/res/amps_box.lisp +++ b/display/res/amps_box.lisp @@ -1,9 +1,7 @@ @const-start (defun write_amps (amp px py){ (def amp_box (img-buffer 'indexed2 55 14)) - (setvar 'amp (to-i (* 10 amp))) - (txt-block-l amp_box 1 0 0 font_9x14 (str-from-n amp "%04dA")) - (txt-block-c amp_box 1 28 0 font_9x14 ".") + (txt-block-l amp_box 1 0 0 font_9x14 (str-from-n amp "%3.0fA")) ;; Could set to %1.0fA or %2.0fA if we want to be more left aligned more often (disp-render amp_box px py '(0 0xFFFFFF)) }) @const-end \ No newline at end of file diff --git a/display/res/trip_box.lisp b/display/res/trip_box.lisp index 33f4ae0..7549941 100644 --- a/display/res/trip_box.lisp +++ b/display/res/trip_box.lisp @@ -3,17 +3,16 @@ (def trip_box (img-buffer 'indexed2 64 14)) - (if (= km_mi 0){ - (setq dist (* dist 0.6213)) - (setq dist (to-i dist)) - (txt-block-l trip_box 1 0 0 font_9x14 (str-from-n dist "%05dmi")) - } - { - (setq dist (to-i dist)) - (txt-block-l trip_box 1 0 0 font_9x14 (str-from-n dist "%05dkm")) - }) + (setq dist (* dist 0.00001)) ;; Not sure why dist is scaled down so much? This fixes scale. + + (if (= km_mi 0) + (setq dist (* dist 0.6213))) + (txt-block-l trip_box 1 0 0 font_9x14 + (str-from-n dist + (if (= km_mi 0) + (if (> dist 999.9) "999.9mi" "%5.1fmi") + (if (> dist 999.9) "999.9km" "%5.1fkm")))) - (txt-block-l trip_box 1 14 0 font_9x14 ".") (disp-render trip_box px py '(0 0xFFFFFF)) }) @const-end \ No newline at end of file