diff options
Diffstat (limited to 'ebus-racket/ebus')
| -rw-r--r-- | ebus-racket/ebus/layer7.rkt | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ebus-racket/ebus/layer7.rkt b/ebus-racket/ebus/layer7.rkt index b43a58a..b2947a0 100644 --- a/ebus-racket/ebus/layer7.rkt +++ b/ebus-racket/ebus/layer7.rkt @@ -71,14 +71,14 @@ (make-hash (list (list 'bit (lambda (name field offset payload) (list name 'bit (field-decoder-bit (list-ref payload offset))))) + (list 'byte (lambda (name field offset payload) + (list name 'byte (field-decoder-byte (list-ref payload offset))))) (list 'bcd (lambda (name field offset payload) (list name 'bcd (field-decoder-bcd (list-ref payload offset))))) (list 'data1b (lambda (name field offset payload) (list name 'data1b (field-decoder-data1b (list-ref payload offset))))) (list 'data1c (lambda (name field offset payload) (list name 'data1b (field-decoder-data1c (list-ref payload offset))))) - (list 'byte (lambda (name field offset payload) - (list name 'byte (list-ref payload offset)))) (list 'data2b (lambda (name field offset payload) (list name 'data2b (field-decoder-data2b (list-ref payload offset) @@ -97,6 +97,11 @@ (cond ((= value 1) 1) (else 0))) +;; type byte +(define (field-decoder-byte value) + (cond ((= value #xff) (ersatzwert)) + (else value))) + ;; type data1b (define (field-decoder-data1b value) (if (= value #x80) @@ -171,10 +176,9 @@ ;; type bcd (define (field-decoder-bcd value) - (if (= value #xff) - (ersatzwert) - (+ (bitwise-and value #x0f) - (arithmetic-shift value -4)))) + (cond ((= value #xff) (ersatzwert)) + (else (+ (bitwise-and value #x0f) + (* (arithmetic-shift value -4) 10))))) ;; read one ebus-paket or eof from input-port ;; or return #<eof> |