diff clojure/com/aurellem/run/adv_choreo.clj @ 559:91e99cc36bda

problem was improper value for starting position in memory for glyph-display-program.
author Robert McIntyre <rlm@mit.edu>
date Fri, 31 Aug 2012 04:58:15 -0500
parents 6f8b15c2fb48
children 3194a4f438ca
line wrap: on
line diff
     1.1 --- a/clojure/com/aurellem/run/adv_choreo.clj	Fri Aug 31 04:22:08 2012 -0500
     1.2 +++ b/clojure/com/aurellem/run/adv_choreo.clj	Fri Aug 31 04:58:15 2012 -0500
     1.3 @@ -169,14 +169,6 @@
     1.4     delay-count
     1.5     total-glyph-count]
     1.6    (let [data-start (+ 2 start-address)
     1.7 -        monitor-address-high (+ 0 data-start)
     1.8 -        monitor-address-low  (+ 1 data-start)
     1.9 -
    1.10 -        glyph-count-high     (+ 2 data-start)
    1.11 -        glyph-count-low      (+ 3 data-start)
    1.12 -
    1.13 -        delay-address        (+ 4 data-start)
    1.14 -        
    1.15          load-data
    1.16          (flatten
    1.17           [;; data region
    1.18 @@ -208,12 +200,9 @@
    1.19          ;; restore all registers
    1.20  
    1.21          (flatten
    1.22 -         [;; HL points to delay currently,
    1.23 -          ;; decrement HL and then restore everything
    1.24 -          
    1.25 -          0x03 ;; (inc monitor-address) -> monitor-address
    1.26 +         [0x03 ;; (inc monitor-address) -> monitor-address
    1.27            0x1B ;; (dec glyph-count) -> glyph-count
    1.28 -          
    1.29 +                    
    1.30            ;; Reset HL to initial value
    1.31            0x21
    1.32            (reverse (disect-bytes-2 data-start))
    1.33 @@ -221,8 +210,8 @@
    1.34            0x78 0x22 ;; B -> monitor-address-high
    1.35            0x79 0x22 ;; C -> monitor-address-low
    1.36  
    1.37 -          ;;0x7A 0x22 ;; D -> glyph-count-high
    1.38 -          ;;0x7B 0x22 ;; E -> glyph-count-low
    1.39 +          0x7A 0x22 ;; D -> glyph-count-high
    1.40 +          0x7B 0x22 ;; E -> glyph-count-low
    1.41            ])
    1.42           
    1.43          stack-cleanup
    1.44 @@ -244,7 +233,8 @@
    1.45          header (concat  (frame-metronome) (read-user-input))
    1.46  
    1.47          glyph-display (glyph-display-program
    1.48 -                       (+ (count init) (count header)
    1.49 +                       (+ (count init)
    1.50 +                          ;;(count header)
    1.51                            start-address)
    1.52                         main-program-base-address 100
    1.53                         200)