Changeset 3437

Timestamp:

Nov 16, 2012 2:17:56 AM (6 months ago)

Author:

quozl

Message:

OLPC XO-4 - new touchscreen firmware 0.0.0.8 with four finger support, slight compensating changes to timing of deactivate, avoid expecting boot complete message unless a reset is done.

Location:

cpu/arm/olpc

Files:

• 4.0/nn-version.fth (modified) (1 diff)
• nn-touchscreen.fth (modified) (3 diffs)
• nnflash.fth (modified) (1 diff)

cpu/arm/olpc/4.0/nn-version.fth

@@ -1 +1 @@
 \ The Neonode touchscreen firmware
-macro: NN_VERSION 0_0_0_7
+macro: NN_VERSION 0_0_0_8

cpu/arm/olpc/nn-touchscreen.fth

@@ -109 +109 @@
 ;
 
+: flush-input  ( -- )
+   0 0 anticipate
+;
 
 
@@ -136 +139 @@
 
 : deactivate  ( -- )
-   h# 00 h# 01 h# ee  3 bytes-out  h# 00 d# 20 anticipate
+   h# 00 h# 01 h# ee  3 bytes-out  h# 00 d# 60 anticipate
 ;
 
@@ -165 +168 @@
          pbuf-free  false  exit
       then
-   then
-   ['] read-boot-complete  catch  ?dup  if
-      .error
-      ." failed to boot" cr
-      pbuf-free  false  exit
+      ['] read-boot-complete  catch  ?dup  if
+         .error
+         ." failed to boot" cr
+         pbuf-free  false  exit
+      then
+   else
+      flush-input
    then
    ['] configure  catch  ?dup  if

cpu/arm/olpc/nnflash.fth

@@ -55 +55 @@
    \ XO-4 B1 have clear lightguides incompatible with later versions
    \ of touchscreen firmware.
-   \ (disabled temporarily so that automatic update can be tested)
+   \ (disabled temporarily so that automatic update can be tested) 
    \ board-revision h# 4b20  <  if  false exit  then
    nn-image$  nn-up-to-date?  0=