March 2009 - openfirmware - mail.coreboot.org

r1128 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 30, 2009

March 30, 2009

Author: wmb Date: 2009-03-31 02:58:15 +0200 (Tue, 31 Mar 2009) New Revision: 1128 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E37 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-31 00:44:18 UTC (rev 1127) +++ cpu/x86/pc/olpc/versions.fth 2009-03-31 00:58:15 UTC (rev 1128) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 36 +macro: FW_MINOR 37 \ The EC microcode macro: EC_VERSION e34

1 0

r1127 - in cpu/x86/pc: . olpc
by svn＠openfirmware.info March 30, 2009

March 30, 2009

Author: wmb Date: 2009-03-31 02:44:18 +0200 (Tue, 31 Mar 2009) New Revision: 1127 Modified: cpu/x86/pc/biosints.fth cpu/x86/pc/olpc/fw.bth cpu/x86/pc/olpc/gamekeys.fth Log: OLPC - In manufacturing, change the boot order so that SD is after NAND. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/biosints.fth 2009-03-31 00:44:18 UTC (rev 1127) @@ -1165,6 +1165,7 @@ 0 0 " " " /" begin-package " xp" device-name : open + bypass-bios-boot? if false exit then " sd:1" ntfs? if " sd:0" set-hd-boot true exit Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/olpc/fw.bth 2009-03-31 00:44:18 UTC (rev 1127) @@ -515,6 +515,18 @@ \ .built cr ; +: ?factory-boot-sequence ( -- flag ) + \ TS is the "test station" tag. Its value is set to "DL" at the + \ end of manufacturing test. + " TS" find-tag if ( adr len ) + ?-null " DL" $= 0= if + " disk:\boot\olpc.fth nand:\boot\olpc.fth /xp sd:\boot\olpc.fth /prober /usb/wlan" + to boot-device + then + then +; + + : console-start ( -- ) [ifdef] rom-loaded video-map cr @@ -589,6 +601,7 @@ no-page ?factory-mode + ?factory-boot-sequence console-start Modified: cpu/x86/pc/olpc/gamekeys.fth =================================================================== --- cpu/x86/pc/olpc/gamekeys.fth 2009-03-24 17:54:51 UTC (rev 1126) +++ cpu/x86/pc/olpc/gamekeys.fth 2009-03-31 00:44:18 UTC (rev 1127) @@ -60,3 +60,5 @@ drop (cr kill-line ; ' (hold-message) to hold-message + +: bypass-bios-boot? ( -- flag ) button-square game-key? ;

1 0

r1126 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 24, 2009

March 24, 2009

Author: wmb Date: 2009-03-24 18:54:51 +0100 (Tue, 24 Mar 2009) New Revision: 1126 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E36 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-24 03:54:11 UTC (rev 1125) +++ cpu/x86/pc/olpc/versions.fth 2009-03-24 17:54:51 UTC (rev 1126) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 35 +macro: FW_MINOR 36 \ The EC microcode macro: EC_VERSION e34

1 0

r1125 - cpu/x86/pc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-24 04:54:11 +0100 (Tue, 24 Mar 2009) New Revision: 1125 Modified: cpu/x86/pc/biosints.fth Log: OLPC - fixed problem with Windows full-screen text mode. Modified: cpu/x86/pc/biosints.fth =================================================================== --- cpu/x86/pc/biosints.fth 2009-03-23 23:11:56 UTC (rev 1124) +++ cpu/x86/pc/biosints.fth 2009-03-24 03:54:11 UTC (rev 1125) @@ -126,10 +126,8 @@ ; : set-mode3 ( -- ) - stdout @ if - " text-mode3" stdout @ $call-method - stdout off - then + stdout off \ Stop using OFW driver + " text-mode3" screen-ih $call-method ; \ VBE status: AL = 4f -> function supported else not supported \ AH = 0: success 1: fail 2: not supported in this config 3: invalid in this mode

1 0

r1124 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-24 00:11:56 +0100 (Tue, 24 Mar 2009) New Revision: 1124 Modified: cpu/x86/pc/olpc/versions.fth Log: Q2E35 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-23 22:55:21 UTC (rev 1123) +++ cpu/x86/pc/olpc/versions.fth 2009-03-23 23:11:56 UTC (rev 1124) @@ -2,7 +2,7 @@ \ The overall firmware revision macro: FW_MAJOR E -macro: FW_MINOR 34 +macro: FW_MINOR 35 \ The EC microcode macro: EC_VERSION e34

1 0

r1123 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-23 23:55:21 +0100 (Mon, 23 Mar 2009) New Revision: 1123 Added: cpu/x86/pc/olpc/HOWTO-keyjector Log: Added HOWTO-keyjector instructions. Added: cpu/x86/pc/olpc/HOWTO-keyjector =================================================================== --- cpu/x86/pc/olpc/HOWTO-keyjector (rev 0) +++ cpu/x86/pc/olpc/HOWTO-keyjector 2009-03-23 22:55:21 UTC (rev 1123) @@ -0,0 +1,52 @@ +A keyjector is an intermediate firmware release that installs +additional customer-specific security keys in manufacturing data. +OLPC signs is so it can be auto-reflashed. When it starts, it inserts +the new keys, then replaces itself with a higher-rev firmware version +so it doesn't run again. + +The version number for the keyjector is between two "real" releases. +It has to be higher than any version number that might already exist +on the customer's target machines. For example, if the customer has +only q2e34 and earlier, the keyjector version might be q2e34x, and the +successor firmware might be q2e35. In the worst case, this means that +you would have to make a new real firmware release so there is a +successor (q2e35 in this example). + +The keyjector itself is built with an abbreviated release procedure, +within the existing build tree for the release right before the +successor. In the example, the keyjector would be build in the +existing tree for q2e34. + +The steps are: + +* Unpack the tar file containing the new keys into, for example, /home/wmb/Uruguay + +* Note the list of key names, e.g. d0 a1 o1 s1 t1 w1 + +$ cd /home/firmware/q2e34/openfirmware/cpu/x86/pc/olpc/build + +* Edit ../keyjector.bth : + +** Change the "macro: FW_MINOR " line to the keyjector's intermediate version number, e.g. 34x +** Changing lines like below to the right file and key names. + " /space/bios-crypto/build/k2.public" " s1" $add-dropin + +* Edit ../keyjector.fth : + +** In wrong-sku?, set the list of SKUs. This guards against "hijacking" of other country's laptops. +** In keyject-expired?, set an appropriate expiration date for the keyjector. +** In new-key-list$, set the key list. + +$ ./build keyject + +It should build really quickly, because it is using nearly all the same modules as the base build. + +* Verify the version number in the new file: + +** $ xxd q2e34x.rom | tail -4 + +* If you have to make a new "real" release so the keyjector has a successor, do so now. + +* Sign the keyjector, naming the .zip file "bootfw.zip". + +* Sign the successor firmware, name the .zip file "bootfw2.zip"

1 0

r1122 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 23, 2009

March 23, 2009

Author: wmb Date: 2009-03-23 23:44:45 +0100 (Mon, 23 Mar 2009) New Revision: 1122 Modified: cpu/x86/pc/olpc/keyject.bth Log: Minor streamlining of keyjector build script. Modified: cpu/x86/pc/olpc/keyject.bth =================================================================== --- cpu/x86/pc/olpc/keyject.bth 2009-03-10 09:11:37 UTC (rev 1121) +++ cpu/x86/pc/olpc/keyject.bth 2009-03-23 22:44:45 UTC (rev 1122) @@ -31,7 +31,8 @@ build-now -fload ${BP}/cpu/x86/pc/olpc/kjversions.fth +fload ${BP}/cpu/x86/pc/olpc/versions.fth +macro: FW_MINOR 34x " macro: FW_VERSION Q2${FW_MAJOR}${FW_MINOR}" expand$ eval

1 0

r1121 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: rsmith Date: 2009-03-10 10:11:37 +0100 (Tue, 10 Mar 2009) New Revision: 1121 Modified: cpu/x86/pc/olpc/mcastnand.bth Log: OLPC: Fix build system to work with the new cgit web interface Modified: cpu/x86/pc/olpc/mcastnand.bth =================================================================== --- cpu/x86/pc/olpc/mcastnand.bth 2009-03-10 08:45:08 UTC (rev 1120) +++ cpu/x86/pc/olpc/mcastnand.bth 2009-03-10 09:11:37 UTC (rev 1121) @@ -11,11 +11,9 @@ [then] [else] " rm -rf multicast-nand" $sh - -" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git?p=users/wmb/multicast-nand\;a=snapshot;h=${MCNAND…" expand$ $sh +" wget -q -O multicast-nand.tar.gz http://dev.laptop.org/git/users/wmb/multicast-nand/snapshot/multicast-nand-…" expand$ $sh " tar xfz multicast-nand.tar.gz" $sh -" mv users/wmb/multicast-nand ." $sh -" rm -rf users/wmb" $sh +" mv multicast-nand-${MCNAND_VERSION} multicast-nand" expand$ $sh " rm multicast-nand.tar.gz" $sh [then]

1 0

r1120 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: rsmith Date: 2009-03-10 09:45:08 +0100 (Tue, 10 Mar 2009) New Revision: 1120 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: q2e34 - Change version back to e series and use ec code pq2e34 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-10 08:10:29 UTC (rev 1119) +++ cpu/x86/pc/olpc/versions.fth 2009-03-10 08:45:08 UTC (rev 1120) @@ -1,11 +1,11 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR F -macro: FW_MINOR 02 +macro: FW_MAJOR E +macro: FW_MINOR 34 \ The EC microcode -macro: EC_VERSION 1_1_2 +macro: EC_VERSION e34 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1119 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 10, 2009

March 10, 2009

Author: wmb Date: 2009-03-10 09:10:29 +0100 (Tue, 10 Mar 2009) New Revision: 1119 Modified: cpu/x86/pc/olpc/setwp.fth Log: OLPC - added -null to enable-security to fix confirmation by serial number. Modified: cpu/x86/pc/olpc/setwp.fth =================================================================== --- cpu/x86/pc/olpc/setwp.fth 2009-03-03 23:55:28 UTC (rev 1118) +++ cpu/x86/pc/olpc/setwp.fth 2009-03-10 08:10:29 UTC (rev 1119) @@ -11,6 +11,7 @@ board-revision h# b48 < abort" Only supported on B4 and later" h# fffefffe 2 " wp" $= if ." wp is already set" cr exit then " SN" find-tag 0= abort" No serial number (SN tag); enabling security would brick me." ( sn$ ) + -null ( sn$' ) safe-parse-word ( sn$ confirmation$ ) $= 0= abort" Confirmation code mismatch"

1 0

r1118 - cpu/x86/pc/olpc
by svn＠openfirmware.info March 3, 2009

March 3, 2009

Author: rsmith Date: 2009-03-04 00:55:28 +0100 (Wed, 04 Mar 2009) New Revision: 1118 Modified: cpu/x86/pc/olpc/versions.fth Log: OLPC: Bump firmware to q2f02 and EC 1_1_2 Modified: cpu/x86/pc/olpc/versions.fth =================================================================== --- cpu/x86/pc/olpc/versions.fth 2009-03-03 23:46:19 UTC (rev 1117) +++ cpu/x86/pc/olpc/versions.fth 2009-03-03 23:55:28 UTC (rev 1118) @@ -1,11 +1,11 @@ \ Version numbers of items included in the OLPC firmware image \ The overall firmware revision -macro: FW_MAJOR E -macro: FW_MINOR 33 +macro: FW_MAJOR F +macro: FW_MINOR 02 \ The EC microcode -macro: EC_VERSION e32 +macro: EC_VERSION 1_1_2 \ Alternate command for getting EC microcode, for testing new versions. \ Temporarily uncomment the line and modify the path as necessary

1 0

r1117 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openfirmware.info March 3, 2009

March 3, 2009

Author: rsmith Date: 2009-03-04 00:46:19 +0100 (Wed, 04 Mar 2009) New Revision: 1117 Added: cpu/x86/pc/olpc/charge.fth Modified: cpu/x86/pc/olpc/fw.bth dev/olpc/kb3700/battery.fth Log: OLPC: - Move the bat-charge logger to its own file. charge.fth - Fixup the file output to be comma delimited so its compatible with the olpc-pwr-log processing code - remove uneeded spaces in one of the formatting functions. Added: cpu/x86/pc/olpc/charge.fth =================================================================== --- cpu/x86/pc/olpc/charge.fth (rev 0) +++ cpu/x86/pc/olpc/charge.fth 2009-03-03 23:46:19 UTC (rev 1117) @@ -0,0 +1,89 @@ +purpose: Special low power battery charge monitor +\ See license at end of file + +\ Need the comma to be compatible with olpc-pwr-log stuff + +: >sd, + <# " ," hold$ u#s u#> +; + +: >sd.dd, ( n -- formatted ) + base @ >r decimal + dup abs <# " ," hold$ u# u# [char] . hold u#s rot sign u#> + r> base ! +; + +: bat-log-append ( adr len -- ) + " sd:\charge.log" $append-open \ hardcode the path for now + ftype + fcr + ofd @ fclose +; + + +0 value start-acr +d# 15 value wake-delay + +: bat-charge-dataf@ + base @ >r decimal + 0 logstr c! + time&date >unix-seconds >sd, logstr $cat + soc >sd, logstr $cat + uvolt@ >sd, logstr $cat + cur@ >sd, logstr $cat + bat-temp >sd, logstr $cat + bat-acr@ s16>s32 dup >sd, logstr $cat + start-acr - bg-acr>mAh >sd.dd logstr $cat + r> base ! +; + +: bat-charge-log ( -- ) + " sd:\charge.log" $new-file \ Make sure the file exists and is empty. + ofd @ fclose + + " chg_log Ver: 1.0" bat-log-append + " <StartData>" bat-log-append \ This makes us compatible with the processing scripts for use with olpc-pwr-log + + \ Allow for suspend to be super low power + dcon-power-off + wlan-freeze + + sci-wakeup + bat-acr@ s16>s32 to start-acr + begin + bat-charge-dataf@ + logstr count type cr + logstr count bat-log-append + 0 acpi-l@ h# 400.0000 or 0 acpi-l! \ Enable RTC SCI + ['] noop wake-delay " set-alarm" clock-node @ $call-method + s3 + 0 0 acpi-l! \ Disable RTC SCI + key? + until key drop +; + + +\ LICENSE_BEGIN +\ Copyright (c) 2007 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END + Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-03-03 22:31:34 UTC (rev 1116) +++ cpu/x86/pc/olpc/fw.bth 2009-03-03 23:46:19 UTC (rev 1117) @@ -639,56 +639,9 @@ \ " flash http:\\18.85.46.172\new.rom" eval ; -: bat-log-append ( adr len -- ) - " sd:\charge.log" $append-open \ hardcode the path for now - ftype - fcr - ofd @ fclose -; +\ Fancy battery charge logger. +fload ${BP}/cpu/x86/pc/olpc/charge.fth - -0 value start-acr -d# 15 value wake-delay - -: bat-charge-dataf@ - base @ >r decimal - 0 logstr c! - time&date >unix-seconds >sd logstr $cat - soc >sd logstr $cat - uvolt@ >sd logstr $cat - cur@ >sd logstr $cat - bat-temp >sd logstr $cat - bat-acr@ s16>s32 dup >sd logstr $cat - start-acr - bg-acr>mAh >sd.dd logstr $cat - r> base ! - -\ space cur@ .d space soc .d space bat-temp .d space -\ bat-acr@ s16>s32 dup .d space -\ start-acr - bg-acr>mAh .sd.dd -; - -: bat-charge-log ( -- ) - " sd:\charge.log" $new-file \ Make sure the file exists and is empty. - ofd @ fclose - - \ Allow for suspend to be super low power - dcon-power-off - wlan-freeze - - sci-wakeup - bat-acr@ s16>s32 to start-acr - begin - bat-charge-dataf@ - logstr count type cr - logstr count bat-log-append - 0 acpi-l@ h# 400.0000 or 0 acpi-l! \ Enable RTC SCI - ['] noop wake-delay " set-alarm" clock-node @ $call-method - s3 - 0 0 acpi-l! \ Disable RTC SCI - key? - until key drop -; - \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions warning @ warning off Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-03-03 22:31:34 UTC (rev 1116) +++ dev/olpc/kb3700/battery.fth 2009-03-03 23:46:19 UTC (rev 1117) @@ -471,7 +471,6 @@ : >sd.dd ( n -- formatted ) base @ >r decimal dup abs <# u# u# [char] . hold u#s rot sign u#> - 8 over - 0 max spaces r> base ! ;

1 0

r1116 - cpu/x86/pc/olpc dev/olpc/kb3700
by svn＠openfirmware.info March 3, 2009

March 3, 2009

Author: rsmith Date: 2009-03-03 23:31:34 +0100 (Tue, 03 Mar 2009) New Revision: 1116 Modified: cpu/x86/pc/olpc/fw.bth dev/olpc/kb3700/battery.fth Log: OLPC: - Add new commands - 'bat-debug' and 'bat-debug-log' These commands let you snoop on what the EC is doing when charging the battery. bat-debug-log logs it to a USB disk. - 'bat-charge-log' Low power logger for measuring the battery charge without the CPU up and running constantly. Turns off wireless & DCON, sets the RTC for wake up and puts the system to sleep. Outputs values to both the serial port and to an SD card. (USB does not work across suspend/resume) Data key is: (space delimited) unix-seconds SOC voltage in uV current in uA bat temp ACR net ACR from start in mAh Modified: cpu/x86/pc/olpc/fw.bth =================================================================== --- cpu/x86/pc/olpc/fw.bth 2009-02-20 21:50:02 UTC (rev 1115) +++ cpu/x86/pc/olpc/fw.bth 2009-03-03 22:31:34 UTC (rev 1116) @@ -639,6 +639,56 @@ \ " flash http:\\18.85.46.172\new.rom" eval ; +: bat-log-append ( adr len -- ) + " sd:\charge.log" $append-open \ hardcode the path for now + ftype + fcr + ofd @ fclose +; + + +0 value start-acr +d# 15 value wake-delay + +: bat-charge-dataf@ + base @ >r decimal + 0 logstr c! + time&date >unix-seconds >sd logstr $cat + soc >sd logstr $cat + uvolt@ >sd logstr $cat + cur@ >sd logstr $cat + bat-temp >sd logstr $cat + bat-acr@ s16>s32 dup >sd logstr $cat + start-acr - bg-acr>mAh >sd.dd logstr $cat + r> base ! + +\ space cur@ .d space soc .d space bat-temp .d space +\ bat-acr@ s16>s32 dup .d space +\ start-acr - bg-acr>mAh .sd.dd +; + +: bat-charge-log ( -- ) + " sd:\charge.log" $new-file \ Make sure the file exists and is empty. + ofd @ fclose + + \ Allow for suspend to be super low power + dcon-power-off + wlan-freeze + + sci-wakeup + bat-acr@ s16>s32 to start-acr + begin + bat-charge-dataf@ + logstr count type cr + logstr count bat-log-append + 0 acpi-l@ h# 400.0000 or 0 acpi-l! \ Enable RTC SCI + ['] noop wake-delay " set-alarm" clock-node @ $call-method + s3 + 0 0 acpi-l! \ Disable RTC SCI + key? + until key drop +; + \ This helps with TeraTerm, which sends ESC-O as the arrow key prefix also hidden also keys-forth definitions warning @ warning off Modified: dev/olpc/kb3700/battery.fth =================================================================== --- dev/olpc/kb3700/battery.fth 2009-02-20 21:50:02 UTC (rev 1115) +++ dev/olpc/kb3700/battery.fth 2009-03-03 22:31:34 UTC (rev 1116) @@ -122,6 +122,10 @@ \ Unless you are on a serial console with stdout turned off \ (stdout off) this will miss some state changes. \ + +h# FA00 constant ec-rambase +: ec-ram@ ec-rambase + ec@ ; + : next-bstate begin f780 ec@ tuck <> @@ -348,7 +352,7 @@ : bat-dump-regs ( -- ) batman-init? bat-ds-regs@ bat-dump-bank ; -: w16>d32 ( 16bit -- 32bit_sign-extended ) +: s16>s32 ( signed16bit -- 32bit_sign-extended ) d# 16 << d# 16 >>a ; @@ -372,7 +376,7 @@ batman-init? ds-bank-buf 2 ds-acr 1w-read ( ) ds-bank-buf c@ 8 << ( msb ) - ds-bank-buf 1 + c@ or w16>d32 ( acr ) + ds-bank-buf 1 + c@ or s16>s32 ( acr ) ; : bg-acr! ( acr -- ) @@ -403,7 +407,7 @@ batman-init? ds-bank-buf 2 ds-last-dis-acr-msb 1w-read ( ) ds-bank-buf c@ 8 << ( last-dis-acr-msb ) - ds-bank-buf 1 + c@ or w16>d32 ( last-dis-acr ) + ds-bank-buf 1 + c@ or s16>s32 ( last-dis-acr ) ; : bg-last-dis-acr! ( last-dis-acr --) @@ -458,6 +462,128 @@ r> base ! ; +: >sd.ddd ( n -- formatted ) + base @ >r decimal + dup abs <# u# u# u# [char] . hold u#s rot sign u#> + r> base ! +; + +: >sd.dd ( n -- formatted ) + base @ >r decimal + dup abs <# u# u# [char] . hold u#s rot sign u#> + 8 over - 0 max spaces + r> base ! +; + +: bg-acr>mAh ( raw-value -- acr_in_mAh ) + abs + d# 625 ( mV ) * d# 15 ( mOhm ) / + over 0< if negate then +; + +: bg-V>V ( raw-value - Volts ) + abs + d# 488 ( mV ) * 2* d# 100 / 5 >> + over 0< if negate then +; + +: bg-I>mA ( raw-value -- I_in_mA ) + abs 3 >> + d# 15625 ( nV ) * d# 15 ( mOhm ) / d# 10 / + over 0< if negate then +; + +: bg-temp>degc ( raw-value -- temp_in_degc ) + abs + d# 125 * d# 10 / 5 >> + over 0< if negate then +; + +h# 90 buffer: logstr +: >sd + <# " " hold$ u#s u#> +; + +: >sdx + <# " " hold$ u#s " 0x" hold$ u#> +; + +: bat-lfp-dataf@ + base @ >r + 0 logstr c! + + decimal + now drop <# " :" hold$ u#s u#> logstr $cat <# " " hold$ u#s u#> logstr $cat \ Running time + h# 10 bat-b@ \ SOC + >sd logstr $cat + + hex + h# e0 ec-ram@ \ C state + >sdx logstr $cat + h# e1 ec-ram@ \ w1 state index + >sdx logstr $cat + h# F780 ec@ \ w1 state + >sdx logstr $cat + h# 40 ec-ram@ \ pwr_flag + >sdx logstr $cat + h# a4 ec-ram@ \ bat_status + >sdx logstr $cat + h# a5 ec-ram@ \ chg status + >sdx logstr $cat + h# a6 ec-ram@ \ bat misc + >sdx logstr $cat + h# a7 ec-ram@ \ bat misc2 + >sdx logstr $cat + h# 70 bat-b@ \ AbnormalCauseCode + >sdx logstr $cat + + decimal + h# 54 bat-b@ 8 << h# 55 bat-b@ or s16>s32 \ ACR + bg-acr>mAh >sd.dd logstr $cat " " logstr $cat + h# 00 bat-b@ 8 << h# 01 bat-b@ or s16>s32 \ V + bg-V>V >sd.ddd logstr $cat " " logstr $cat + h# 02 bat-b@ 8 << h# 03 bat-b@ or s16>s32 \ I + bg-I>mA >sd.dd logstr $cat " " logstr $cat + h# 06 bat-b@ 8 << h# 07 bat-b@ or \ Temp + bg-temp>degc >sd.dd logstr $cat " " logstr $cat +\ h# 17 bat-b@ 8 << h# 18 bat-b@ or \ NiMh Chargetime +\ >sd logstr $cat + + \ Chemistry specific stuff below here + h# 11 bat-b@ \ bat_state + >sd logstr $cat + + hex + h# FBD1 ec@ \ ProcessBatteryCharge + >sdx logstr $cat + h# FBD0 ec@ \ ChargeFlowControl + >sdx logstr $cat + + r> base ! +; + +: bat-debug + begin + bat-lfp-dataf@ + logstr count type + cr + 200 ms key? + until key drop +; + +: bat-debug-log + " disk:\batdbug.log" $new-file + begin + bat-lfp-dataf@ + logstr count ftype + logstr count type + fcr + cr + 200 ms key? + until key drop + ofd @ fclose +; + dev / new-device " battery" device-name

1 0