Skip to content

Fix & Clean-up Trip + Current Readings #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NicoAleman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix & Clean-up Trip + Current Readings #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions display/res/amps_box.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
19 changes: 9 additions & 10 deletions display/res/trip_box.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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