diff --git a/examples/meshtastic/lisp/group.lisp b/examples/meshtastic/lisp/group.lisp index 8b2a22e..f2138f5 100644 --- a/examples/meshtastic/lisp/group.lisp +++ b/examples/meshtastic/lisp/group.lisp @@ -18,10 +18,9 @@ (qjs |addPerson| ui:*group* (list :radio-name lora:*broadcast-name* :custom-name (tr "Broadcast") - :node-num (hex lora:+broadcast-id+) + :node-num lora:+broadcast-id+ :current (equal (app:setting :latest-receiver) lora:*broadcast-name*)))) - (setf (getf person :node-num) (hex (getf person :node-num))) (qjs |addPerson| ui:*group* person)) (defun clear () diff --git a/examples/meshtastic/lisp/messages.lisp b/examples/meshtastic/lisp/messages.lisp index da1695d..9a55a86 100644 --- a/examples/meshtastic/lisp/messages.lisp +++ b/examples/meshtastic/lisp/messages.lisp @@ -28,10 +28,7 @@ (parse-integer x:it :radix 16) ; uid (prin1-to-string message))) (if (or loading (show-message-p message)) - (progn - (setf (getf message :timestamp) (hex (getf message :timestamp)) - (getf message :mid) (hex (getf message :mid))) - (qjs |addMessage| ui:*messages* message)) + (qjs |addMessage| ui:*messages* message) (let* ((sender (getf message :sender)) (unread (1+ (or (app:setting sender :unread-messages) 0)))) (app:change-setting sender unread :sub-key :unread-messages) @@ -47,7 +44,7 @@ (setf (getf message :ack-state) i-state) (db:update-message mid (prin1-to-string message)) (qjs |changeState| ui:*messages* - i-state (hex mid))))) + i-state mid)))) (defun show-messages () (x:when-it (app:setting :latest-receiver) diff --git a/examples/meshtastic/qml/ext/Messages.qml b/examples/meshtastic/qml/ext/Messages.qml index 9c2432c..3b86521 100644 --- a/examples/meshtastic/qml/ext/Messages.qml +++ b/examples/meshtastic/qml/ext/Messages.qml @@ -54,7 +54,7 @@ Rectangle { height: width playing: false source: "../img/semaphore.gif" - currentFrame: model.ackState + currentFrame: model.ackState ? model.ackState.substr(2) : 0 // see 'qml:hex' visible: model.me } @@ -150,7 +150,7 @@ Rectangle { // hack to define all model key _types_ ListElement { receiver: ""; sender: ""; senderName: ""; timestamp: ""; hour: ""; - text: ""; text2: ""; mid: ""; ackState: 0; me: true; hidden: false + text: ""; text2: ""; mid: ""; ackState: ""; me: true; hidden: false } function addMessage(message) { append(message) }