added a separate 140 column due to the different size/weight

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5900 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 60 insertions, 30 deletions

diff --git a/www/docs/devicechart.t b/www/docs/devicechart.t
index 8b9c1f5e7d..74aded9f34 100644
--- a/www/docs/devicechart.t
+++ b/www/docs/devicechart.t
@@ -30,7 +30,11 @@
      <a href=ondiosp.jpg><img src=ondiosp_t.jpg></a><br>Ondio SP
     </th>
     <th valign=top>
-     <img src="h100_t.jpg"><br>iRiver H1x0
+     <img src="h100_t.jpg"><br>iRiver H120
+    </th>
+    <th valign=top>
+     <img src="h100_t.jpg"><br>iRiver H140<br>
+     <a href=#footnote5>(5)</a>
     </th>
 </tr>
 <tr><th><b>USB</b></th>
@@ -43,6 +47,7 @@
     <td>1.1</td>
     <td>1.1</td>
     <td>2.0</td>
+    <td>2.0</td>
 </tr>
 <tr><th><b>Bumper Colors</b></th>
     <td>Blue</td>
@@ -54,6 +59,7 @@
     <td>Blue-violet</td>
     <td>Blue-violet</td>
     <td>none</td>
+    <td>none</td>
 </tr>
 <tr><th><b>S/PDIF</b></th>
     <td>No</td>
@@ -65,6 +71,7 @@
     <td>No</td>
     <td>No</td>
     <td>?</td>
+    <td>?</td>
 </tr>
 <tr><th><b>Separate Line Out</b></th>
     <td>Yes</td>
@@ -76,6 +83,7 @@
     <td>No</td>
     <td>No</td>
     <td>Yes</td>
+    <td>Yes</td>
 </tr>
 <tr><th><b>Remote control</b></th>
     <td>Yes</td>
@@ -87,6 +95,7 @@
     <td>No</td>
     <td>No</td>
     <td>Yes with LCD</td>
+    <td>Yes with LCD</td>
 </tr>
 <tr><th><b>Recording</b></th>
     <td>No</td>
@@ -102,13 +111,14 @@
 <tr><th><b>LCD Type</b></th>
     <td>Character 11x2 <a href=#footnote2>(2)</a></td>
     <td>Character 11x2</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 112x64</td>
-    <td>Bitmap 160x128, 39mmx31mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 112x64 30mmx24mm</td>
+    <td>Bitmap 160x128 39mmx31mm</td>
+    <td>Bitmap 160x128 39mmx31mm</td>
 </tr>
 <tr><th><b>Real Time Clock</b></th>
     <td>No</td>
@@ -120,6 +130,7 @@
     <td>No</td>
     <td>No</td>
     <td>No</td>
+    <td>No</td>
 </tr>
 <tr><th><b>Buttons</b></th>
     <td>6</td>
@@ -131,6 +142,7 @@
     <td>6</td>
     <td>6</td>
     <td>4 + "joystick"</td>
+    <td>4 + "joystick"</td>
 </tr>
 <tr><th><b>Alarm wake-up</b></th>
     <td>No</td>
@@ -141,7 +153,8 @@
     <td>Yes</td>
     <td>No</td>
     <td>No</td>
-    <td>?</td>
+    <td>No</td>
+    <td>No</td>
 </tr>
 <tr><th><b>FM Radio</b></th>
     <td>No</td>
@@ -152,7 +165,8 @@
     <td>No <a href=#footnote3>(3)</a></td>
     <td>Yes</td>
     <td>No</td>
-    <td>Yes</td>
+    <td>87.5 - 108 MHz</td>
+    <td>87.5 - 108 MHz</td>
 </tr>
 <tr><th><b>RAM (MB)</b></th>
     <td>2</td>
@@ -164,6 +178,7 @@
     <td>2</td>
     <td>2</td>
     <td>32</td>
+    <td>32</td>
 </tr>
 <tr><th><b>MP3 decoder</b></th>
     <td>MAS3507D / DAC3550A</td>
@@ -175,6 +190,7 @@
     <td>MAS3587F</td>
     <td>MAS3539F</td>
     <td>software</td>
+    <td>software</td>
 </tr>
 <tr><th><b>Charging ctrl</b></th>
     <td>Hardware</td>
@@ -186,6 +202,7 @@
     <td>no</td>
     <td>no</td>
     <td>Hardware</td>
+    <td>Hardware</td>
 </tr>
 <tr><th><b>Charge via USB</b></th>
     <td>No</td>
@@ -196,7 +213,8 @@
     <td>Yes</td>
     <td>Power</td>
     <td>Power</td>
-    <td>No</td>
+    <td>No <a href="#footnote6">(6)</a></td>
+    <td>No <a href="#footnote6">(6)</a></td>
 </tr>
 <tr><th><b>Hard drive poweroff</b></th>
     <td>No</td>
@@ -208,6 +226,7 @@
     <td>n.a.</td>
     <td>n.a.</td>
     <td>?</td>
+    <td>?</td>
 </tr>
 <tr><th><b>CPU</b></th>
     <td>SH7034 12 MHz</td>
@@ -219,6 +238,7 @@
     <td>SH7034 12 MHz</td>
     <td>SH7034 12 MHz</td>
     <td>Coldfire 5249 11 - 140 MHz</td>
+    <td>Coldfire 5249 11 - 140 MHz</td>
 </tr>
 <tr><th><b>Battery type</b></th>
     <td>NiMH (Type AA)</td>
@@ -230,6 +250,7 @@
     <td>3*AAA</td>
     <td>3*AAA</td>
     <td>LiIon Polymer</td>
+    <td>LiIon Polymer</td>
 </tr>
 <tr><th><b>Charger spec</b></th>
     <td>9-12V 600mA center&nbsp;+</td>
@@ -241,6 +262,7 @@
     <td>no charger</td>
     <td>no charger</td>
     <td>350mA 5 volt 2 A</td>
+    <td>350mA 5 volt 2 A</td>
 </tr>
 <tr><th><b>Dimensions</b></th>
     <td>115x83x34 mm (4.5"x3.2"x1.3")</td>
@@ -251,8 +273,8 @@
     <td>113x79x30 mm (4.45"x3.11"x1.18")</td>
     <td>81x47x25 mm (3.1"x1.8"x0.9")</td>
     <td>81x47x25 mm (3.1"x1.8"x0.9")</td>
-    <td>104x61x18 mm (4.1"x2.4"x0.7")
-     <a href=#footnote5>(5)</a>
+    <td>105x60x18 mm (4.1"x2.4"x0.7")</td>
+    <td>105x60x22 mm (4.1"x2.4"x0.9")</td>
     </td>
 </tr>
 <tr><th><b>Weight</b></th>
@@ -264,8 +286,8 @@
     <td>290 g (10.23 oz)</td>
     <td>60 g (2.1 oz)</td>
     <td>60 g (2.1 oz)</td>
-    <td>160g (5.6 oz)
-     <a href=#footnote5>(5)</a>
+    <td>160g (5.6 oz)</td>
+    <td>172g (6.0 oz)</td>
     </td>
 </tr>
 <tr><th><b>USB Connector</b></th>
@@ -278,6 +300,7 @@
     <td>mini B female</td>
     <td>mini B female</td>
     <td>mini B female</td>
+    <td>mini B female</td>
 </tr>
 <tr><th><b>"Ear" Position</b></th>
     <td>top</td>
@@ -289,6 +312,7 @@
     <td>top left</td>
     <td>top left</td>
     <td>top left</td>
+    <td>top left</td>
 </tr>
 <tr><th><b>Storage</b></th>
     <td>6 GB 2.5"</td>
@@ -299,27 +323,33 @@
     <td>20 GB 2.5"</td>
     <td>128 MB + MMC</td>
     <td>128 MB + MMC</td>
-    <td>20-40 GB 1.8"</td>
+    <td>20 GB 1.8"</td>
+    <td>40 GB 1.8"</td>
 </tr>
 </table>
 <p>
 
- <a name=footnote1></a><i>(1) It is hard to tell if the recorder is old, but
+ <a name="footnote1"></a><i>(1) It is hard to tell if the recorder is old, but
  the Rec6 and Rec10 are old. The Rec15 seems to be available in both new and
  old versions.</i>
 
- <br>
- <a name=footnote2></a><i>(2) The old player has a limited LCD with no
-   support for double line height and only four user definable characters
-   instead of eight.</i>
- <br>
- <a name=footnote3></a><i>(3) The early V2 models were in fact FM
-   Recorders in disguise, so they had the FM radio still mounted.</i>
- <br>
- <a name=footnote4></a><i>(4) The picture shows an FM Recorder, but
-   they look exactly the same, apart from the printed text.</i>
- <br>
- <a name=footnote5></a><i>(5) The H120 and H140 players differ in thickness
- and weight due to the physically bigger disk in the H140 model.
+ <br> <a name="footnote2"></a><i>(2) The old player has a limited LCD with no
+ support for double line height and only four user definable characters
+ instead of eight.</i>
+
+ <br> <a name="footnote3"></a><i>(3) The early V2 models were in fact FM
+ Recorders in disguise, so they had the FM radio still mounted.</i>
+
+ <br> <a name="footnote4"></a><i>(4) The picture shows an FM Recorder, but
+ they look exactly the same, apart from the printed text.</i>
+
+ <br> <a name="footnote5"></a><i>(5) The picture shows an iRiver H120, but
+ they look exactly the same, apart from the printed text.
+
+ <br> <a name="footnote6"></a><i>(6) There is an adapter available for
+ charging from your host's USB cable, but that is a cable that splits the USB
+ and power and uses the iRiver's standard charging plug. It is not charging
+ via the music player's USB.
+
 
 #include "foot.t"