diff options
-rw-r--r-- | www/Makefile | 7 | ||||
-rw-r--r-- | www/cvs.t | 11 | ||||
-rw-r--r-- | www/daily.t | 1 | ||||
-rwxr-xr-x | www/dailymod.pl | 2 | ||||
-rw-r--r-- | www/download/index.t | 66 | ||||
-rw-r--r-- | www/head.t | 2 | ||||
-rw-r--r-- | www/history.t | 6 | ||||
-rw-r--r-- | www/main.t | 50 | ||||
-rw-r--r-- | www/style.css | 19 |
9 files changed, 107 insertions, 57 deletions
diff --git a/www/Makefile b/www/Makefile index 250c848584..059f3f2c94 100644 --- a/www/Makefile +++ b/www/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -LL >$@ | 1 | ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -LL >$@ |
2 | 2 | ||
3 | SRC := $(wildcard *.t) | 3 | SRC := $(wildcard *.t) |
4 | OBJS := $(SRC:%.t=%.html) daily.shtml | 4 | OBJS := $(SRC:%.t=%.html) daily.shtml main.shtml index.shtml |
5 | 5 | ||
6 | .SUFFIXES: .t .html | 6 | .SUFFIXES: .t .html |
7 | 7 | ||
@@ -23,5 +23,10 @@ all: $(OBJS) | |||
23 | 23 | ||
24 | main.html: main.t activity.html | 24 | main.html: main.t activity.html |
25 | 25 | ||
26 | main.shtml: main.t activity.html | ||
27 | |||
28 | index.shtml: main.shtml | ||
29 | ln -s main.shtml index.shtml | ||
30 | |||
26 | daily.shtml: daily.t | 31 | daily.shtml: daily.t |
27 | 32 | ||
@@ -66,6 +66,7 @@ of the Rockbox project | |||
66 | 66 | ||
67 | <p><tt>cvs commit -m "This is my change comment" <b>filename</b></tt> | 67 | <p><tt>cvs commit -m "This is my change comment" <b>filename</b></tt> |
68 | 68 | ||
69 | <p><strong>Note:</strong> Before checking in modifications, test-build all targets (player, player-old, recorder, player-sim, recorder-sim) to make sure your changes don't break anything. | ||
69 | 70 | ||
70 | <h2>Updating your repository</h2> | 71 | <h2>Updating your repository</h2> |
71 | 72 | ||
@@ -105,6 +106,16 @@ those on the remote repository. This is called "status": | |||
105 | 106 | ||
106 | <p><tt>cvs status | grep Status | grep -v Up-to-date</tt> | 107 | <p><tt>cvs status | grep Status | grep -v Up-to-date</tt> |
107 | 108 | ||
109 | <h2>Producing a diff of your changes</h2> | ||
110 | |||
111 | <p>If you want to see how your local files differ from the CVS repository, | ||
112 | you can ask CVS to show you: | ||
113 | |||
114 | <p><tt>cvs diff -u [files(s)]</tt> | ||
115 | |||
116 | <p>The <tt>-u</tt> selects the "unified" diff format, which is preferrable | ||
117 | when working with source code. | ||
118 | |||
108 | <h2>What Happens in the Repository?</h2> | 119 | <h2>What Happens in the Repository?</h2> |
109 | <p> | 120 | <p> |
110 | Subscribe to the rockbox-cvs list to get mails sent to you for every commit | 121 | Subscribe to the rockbox-cvs list to get mails sent to you for every commit |
diff --git a/www/daily.t b/www/daily.t index be4ccb6e22..c8c7e992e5 100644 --- a/www/daily.t +++ b/www/daily.t | |||
@@ -24,7 +24,6 @@ They are <i>not</i> official releases, they are in fact almost guaranteed to not | |||
24 | 24 | ||
25 | <p><b>Note 1:</b> You must rename the file to "archos.mod" ("ajbrec.ajz" for the recorder) before copying it to the root of your archos. | 25 | <p><b>Note 1:</b> You must rename the file to "archos.mod" ("ajbrec.ajz" for the recorder) before copying it to the root of your archos. |
26 | 26 | ||
27 | <p><b>Note 2:</b> The Recorder version does not fully work yet, due to unfinished drivers. It runs, but cannot play music. | ||
28 | 27 | ||
29 | <h2>CVS compile status</h2> | 28 | <h2>CVS compile status</h2> |
30 | 29 | ||
diff --git a/www/dailymod.pl b/www/dailymod.pl index 5648cdbd11..0af1d48c79 100755 --- a/www/dailymod.pl +++ b/www/dailymod.pl | |||
@@ -17,7 +17,7 @@ sub list { | |||
17 | print "</ul>\n"; | 17 | print "</ul>\n"; |
18 | } | 18 | } |
19 | 19 | ||
20 | print "<table border=1><tr valign=\"top\"><td>\n"; | 20 | print "<table class=dailymod><tr><td>\n"; |
21 | print "<h3>player-old</h3>\n"; | 21 | print "<h3>player-old</h3>\n"; |
22 | print "<p>This version is for old Archos Jukebox 5000, 6000 models with ROM firmware older than 4.50:\n"; | 22 | print "<p>This version is for old Archos Jukebox 5000, 6000 models with ROM firmware older than 4.50:\n"; |
23 | &list("playerold"); | 23 | &list("playerold"); |
diff --git a/www/download/index.t b/www/download/index.t index 8a74aa41a5..777e5aa9c7 100644 --- a/www/download/index.t +++ b/www/download/index.t | |||
@@ -2,42 +2,78 @@ | |||
2 | #define DOWNLOAD_PAGE | 2 | #define DOWNLOAD_PAGE |
3 | #include "head.t" | 3 | #include "head.t" |
4 | 4 | ||
5 | <h2>Version 1.0</h2> | 5 | <h2>Version 1.1</h2> |
6 | 6 | ||
7 | <p>This first version is more a proof-of-concept than a serious replacement for the stock firmware. | 7 | <p>Recorder support, playlists and scrolling are the main new features of this version. Read the <a href="rockbox-1.1-notes.txt">release notes</a>. |
8 | Read the <a href="rockbox-1.0-notes.txt">release notes</a>. | ||
9 | 8 | ||
9 | <p> | ||
10 | <table><tr valign="top"><td> | ||
10 | <h3>player-old</h3> | 11 | <h3>player-old</h3> |
11 | <p>This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50. | 12 | <p>This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50. |
12 | 13 | ||
13 | <ul> | 14 | <ul> |
14 | <li><a href="rockbox-1.0-player-old.zip">rockbox-1.0-player-old.zip</a> | 15 | <li><a href="rockbox-1.1-player-old.mod">rockbox-1.1-player-old.mod</a> |
15 | </ul> | 16 | </ul> |
16 | 17 | ||
18 | </td><td> | ||
19 | |||
17 | <h3>player</h3> | 20 | <h3>player</h3> |
18 | <p>This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models. | 21 | <p>This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models. |
19 | 22 | ||
20 | <ul> | 23 | <ul> |
21 | <li><a href="rockbox-1.0-player.zip">rockbox-1.0-player.zip</a> | 24 | <li><a href="rockbox-1.1-player.mod">rockbox-1.1-player.mod</a> |
22 | </ul> | 25 | </ul> |
23 | 26 | ||
27 | <p><b>Bug</b>: Bass and treble adjustment does not work. | ||
28 | |||
29 | </td><td> | ||
30 | |||
24 | <h3>recorder</h3> | 31 | <h3>recorder</h3> |
25 | <p>Version 1.0 does not support the Recorder. Future versions will. | 32 | <p>This version is for all Archos Jukebox Recorder models. |
33 | |||
34 | <ul> | ||
35 | <li><a href="rockbox-1.1-recorder.ajz">rockbox-1.1-recorder.ajz</a> | ||
36 | </ul> | ||
37 | |||
38 | <p><b>Bug</b>: MP3 playback only works on Recorder 20, not 6 or 10. PLAY key is not detected, use RIGHT. | ||
39 | |||
40 | </td></tr></table> | ||
41 | |||
26 | 42 | ||
27 | <h3>Source code</h3> | 43 | <h3>Source code</h3> |
28 | <ul> | 44 | <ul> |
29 | <li><a href="rockbox-1.0.tar.gz">rockbox-1.0.tar.gz</a> | 45 | <li><a href="rockbox-1.1.tar.gz">rockbox-1.1.tar.gz</a> |
30 | </ul> | 46 | </ul> |
31 | 47 | ||
48 | <h3>Screen shots (from simulator)</h3> | ||
49 | |||
50 | <p> | ||
51 | <table><tr> | ||
52 | <td><img src="player-sim.png" alt="Player simulator"> | ||
53 | <br>Player boot screen</td> | ||
54 | |||
55 | <td><img src="recorder-sim.png" alt="Recorder simulator"> | ||
56 | <br>Recorder boot screen</td> | ||
57 | |||
58 | <td><img src="browser.png" alt="File browser"><br>Recorder file browser</td> | ||
59 | |||
60 | <td><img src="id3.png" alt="ID3 display"><br>Recorder ID3 display</td> | ||
61 | </tr><tr> | ||
62 | <td><img src="tetris.png" alt="Tetris"><br>Tetris (recorder only)</td> | ||
63 | <td><img src="sokoban.png" alt="Sokoban"><br>Sokoban (recorder only)</td> | ||
64 | <td><img src="bounce.png" alt="Bounce"><br>Bouncing text (recorder only)</td> | ||
65 | </tr></table> | ||
66 | |||
67 | |||
32 | <h3>User interface simulators</h3> | 68 | <h3>User interface simulators</h3> |
33 | <p><img src="player-sim.png" alt="Player simulator"> | ||
34 | <img src="recorder-sim.png" alt="Recorder simulator"> | ||
35 | 69 | ||
70 | <p> | ||
36 | <ul> | 71 | <ul> |
37 | <li><a href="player-sim-1.0">player simulator 1.0 for linux</a> (42880 bytes) | 72 | <li><a href="player-sim-1.1">player simulator 1.1 for linux-x86</a> (48300 bytes) |
38 | (if you don't have libgcc_s.so.1, get it <a href="libgcc_s.so.1">here</a>) | 73 | (if you don't have libgcc_s.so.1, get it <a href="libgcc_s.so.1">here</a>) |
39 | <li><a href="recorder-sim-1.0">recorder simulator 1.0 for linux</a> (51976 bytes) | 74 | <li><a href="recorder-sim-1.1">recorder simulator 1.1 for linux-x86</a> (98184 bytes) |
40 | <li><a href="recorder-sim-1.0.exe">recorder simulator 1.0 for win32</a> (167936 bytes) | 75 | <li><a href="player-sim-1.1.exe">player simulator 1.1 for win32</a> (126976 bytes) |
76 | <li><a href="recorder-sim-1.1.exe">recorder simulator 1.1 for win32</a> (172032 bytes) | ||
41 | </ul> | 77 | </ul> |
42 | 78 | ||
43 | <p>The simulators browse a directory called 'archos' in the directory they are started from. Create it and copy some mp3 files there. The buttons are simulated on the numeric keypad: | 79 | <p>The simulators browse a directory called 'archos' in the directory they are started from. Create it and copy some mp3 files there. The buttons are simulated on the numeric keypad: |
@@ -46,11 +82,11 @@ Read the <a href="rockbox-1.0-notes.txt">release notes</a>. | |||
46 | <dd>4/6 = prev/next, 8 = play, 2 = stop, enter = menu, + = on | 82 | <dd>4/6 = prev/next, 8 = play, 2 = stop, enter = menu, + = on |
47 | 83 | ||
48 | <dt><b>Recorder</b> | 84 | <dt><b>Recorder</b> |
49 | <dd>4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys | 85 | <dd>4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys, +/enter = on/off |
50 | </dl> | 86 | </dl> |
51 | 87 | ||
52 | <h2>Installation</h2> | 88 | <h2>Installation</h2> |
53 | <p>Unzip the archive. Rename your current archos.mod (if any) in the root of your archos, then copy the rockbox archos.mod there. | 89 | <p>Rename your current archos.mod (if any) in the root of your archos, then copy the rockbox archos.mod there. Make sure it's called "archos.mod" (5000,6000,Studio) or "ajbrec.ajz" (Recorder). |
54 | 90 | ||
55 | <p>To remove the Rockbox firmware, just reverse the process: Rename the rockbox archos.mod file and replace it with your original firmware file. If you had no firmware file, just renaming or removing the rockbox file is sufficient. | 91 | <p>To remove the Rockbox firmware, just reverse the process: Rename the rockbox archos.mod file and replace it with your original firmware file. If you had no firmware file, just renaming or removing the rockbox file is sufficient. |
56 | 92 | ||
@@ -59,7 +95,7 @@ Read the <a href="rockbox-1.0-notes.txt">release notes</a>. | |||
59 | <h2>Bug reports</h2> | 95 | <h2>Bug reports</h2> |
60 | 96 | ||
61 | <p>Please use our | 97 | <p>Please use our |
62 | <a href="http://sourceforge.net/projects/rockbox/">Sourceforge page</a> | 98 | <a href="http://sourceforge.net/tracker/?group_id=44306&atid=439118">Sourceforge page</a> |
63 | for all bug reports and feature requests. If you have a sourceforge account, | 99 | for all bug reports and feature requests. If you have a sourceforge account, |
64 | please log in first so we have a name to connect to the report. | 100 | please log in first so we have a name to connect to the report. |
65 | 101 | ||
diff --git a/www/head.t b/www/head.t index c573491e2f..748c051caa 100644 --- a/www/head.t +++ b/www/head.t | |||
@@ -33,7 +33,7 @@ | |||
33 | <a class="menulink" href="/rockbox/docs/">data sheets</a><br> | 33 | <a class="menulink" href="/rockbox/docs/">data sheets</a><br> |
34 | <a class="menulink" href="/rockbox/schematics/">schematics</a><br> | 34 | <a class="menulink" href="/rockbox/schematics/">schematics</a><br> |
35 | <a class="menulink" href="/rockbox/mods/">hardware mods</a><br> | 35 | <a class="menulink" href="/rockbox/mods/">hardware mods</a><br> |
36 | <a class="menulink" href="http://bjorn.haxx.se/rockbox/mail.cgi">mail list archive</a><br> | 36 | <a class="menulink" href="http://bjorn.haxx.se/rockbox/mail/">mailing list</a><br> |
37 | <a class="menulink" href="/rockbox/irc/">IRC</a><br> | 37 | <a class="menulink" href="/rockbox/irc/">IRC</a><br> |
38 | <a class="menulink" href="/rockbox/tools.html">tools</a><br> | 38 | <a class="menulink" href="/rockbox/tools.html">tools</a><br> |
39 | <a class="menulink" href="/rockbox/internals/">photos</a><br> | 39 | <a class="menulink" href="/rockbox/internals/">photos</a><br> |
diff --git a/www/history.t b/www/history.t index d1902c53d8..1f5421100a 100644 --- a/www/history.t +++ b/www/history.t | |||
@@ -2,6 +2,12 @@ | |||
2 | #define HISTORY_PAGE | 2 | #define HISTORY_PAGE |
3 | #include "head.t" | 3 | #include "head.t" |
4 | 4 | ||
5 | <p><i>2002-06-19</i>: Recorder sound support checked into CVS. Good news: No background noise! | ||
6 | |||
7 | <p><i>2002-06-10</i>: Playlist and scroll support added. Testing for release v1.1. | ||
8 | |||
9 | <p><i>2002-06-07</i>: The ATA driver now works for the Recorder models too. | ||
10 | |||
5 | <p><i>2002-06-01</i>: Version 1.0 is released! <a href="download/">Download it here</a>. | 11 | <p><i>2002-06-01</i>: Version 1.0 is released! <a href="download/">Download it here</a>. |
6 | 12 | ||
7 | <p><i>2002-06-01</i>: Web site has been down three days due to a major power loss. | 13 | <p><i>2002-06-01</i>: Web site has been down three days due to a major power loss. |
diff --git a/www/main.t b/www/main.t index 4e3ad64d50..057cceab7b 100644 --- a/www/main.t +++ b/www/main.t | |||
@@ -16,17 +16,24 @@ firmware for the Archos Jukebox <i>5000</i>, <i>6000</i>, <i>Studio</i> and <i>R | |||
16 | 16 | ||
17 | <p><i>2002-06-19</i>: Version 1.1 is released. <a href="download/">Download it here</a>. | 17 | <p><i>2002-06-19</i>: Version 1.1 is released. <a href="download/">Download it here</a>. |
18 | 18 | ||
19 | <p><i>2002-06-19</i>: Recorder sound support checked into CVS. Good news: No background noise! | ||
20 | |||
21 | <p><i>2002-06-10</i>: Playlist and scroll support added. Testing for release v1.1. | ||
22 | |||
23 | <p><i>2002-06-07</i>: The ATA driver now works for the Recorder models too. | ||
24 | |||
25 | <p><i><small>(Old news items have moved to a | 19 | <p><i><small>(Old news items have moved to a |
26 | <a href="history.html">separate page</a>.)</small></i> | 20 | <a href="history.html">separate page</a>.)</small></i> |
27 | 21 | ||
28 | <p>We have a mailing list: rockbox@cool.haxx.se. | 22 | <h2>Recent CVS activity</h2> |
29 | To subscribe, send a message to <a href="mailto:majordomo@cool.haxx.se">majordomo@cool.haxx.se</a> with the words "subscribe rockbox" in the body. | 23 | <p> |
24 | <!--#include file="last5.html" --> | ||
25 | |||
26 | <h2>Open bug reports</h2> | ||
27 | <p> | ||
28 | <!--#include file="bugs.html" --> | ||
29 | <small><b>Note:</b> Don't file bug reports on daily builds. They are work in progress.</small> | ||
30 | |||
31 | <h2>Vacations</h2> | ||
32 | <p>Parts of the core team is currently away on vacation: | ||
33 | <ul> | ||
34 | <li>Björn Stenberg (Zagor): Back friday july 5, reads mail | ||
35 | <li>Daniel Stenberg (Bagder): Back thursday july 25, does not read mail | ||
36 | </ul> | ||
30 | 37 | ||
31 | <h2>Roadmap</h2> | 38 | <h2>Roadmap</h2> |
32 | <p>This is a rough indication of which features we plan/expect/hope to be | 39 | <p>This is a rough indication of which features we plan/expect/hope to be |
@@ -60,31 +67,4 @@ The first thing this version does after boot is to look for a file called | |||
60 | If it exists, it is loaded into RAM and started. | 67 | If it exists, it is loaded into RAM and started. |
61 | This is how firmware upgrades are loaded. | 68 | This is how firmware upgrades are loaded. |
62 | 69 | ||
63 | <h2>Dreams</h2> | ||
64 | <p>Ok, forget about reality, what could we do with this? | ||
65 | |||
66 | <ul> | ||
67 | <li>All those simple mp3-play features we sometimes miss: | ||
68 | <ul> | ||
69 | <li>No pause between songs | ||
70 | <li>Mid-song resume | ||
71 | <li>Mid-playlist resume | ||
72 | <li>No-scan playlists | ||
73 | <li>Unlimited playlist size | ||
74 | <li>Autobuild playlists (such as "all songs in this directory tree") | ||
75 | <li>Auto-continue play in the next directory | ||
76 | <li>Current folder and all sub-folder random play | ||
77 | <li>Full disk random play | ||
78 | <li>REAL random (if press back it goes to the previous song that was played) | ||
79 | <li>Multi song queue (folder queue) | ||
80 | </ul> | ||
81 | <li>Faster scroll speed | ||
82 | <li>Archos Recorder support. Most of the hardware is the same, but the display and some other things differ. | ||
83 | <li>All kinds of cool features done from the wire remote control, including controlling your Archos from your car radio (req hw mod) | ||
84 | <li>Ogg Vorbis support [unverified: the MAS is somewhat programmable, but enough?] | ||
85 | <li>Support for megabass switch (req hw mod) [unverified: I just saw the DAC docs shows how to do it switchable. we need a free port pin to be able to switch] | ||
86 | <li>Player control via USB [unverified] | ||
87 | <li>Memory expansion? [doubtful: the current DRAM chip only has 10 address lines. we'd have to pull off one heck of a hw mod to expand that] | ||
88 | </ul> | ||
89 | |||
90 | #include "foot.t" | 70 | #include "foot.t" |
diff --git a/www/style.css b/www/style.css index eaad1e3833..8bc9965091 100644 --- a/www/style.css +++ b/www/style.css | |||
@@ -42,7 +42,7 @@ A { | |||
42 | 42 | ||
43 | .bgbox { | 43 | .bgbox { |
44 | left-border-width: 1px; | 44 | left-border-width: 1px; |
45 | border-color: black; | 45 | border-color: #000000; |
46 | } | 46 | } |
47 | 47 | ||
48 | .menulink { | 48 | .menulink { |
@@ -56,7 +56,7 @@ A { | |||
56 | } | 56 | } |
57 | 57 | ||
58 | .buildwarn { | 58 | .buildwarn { |
59 | background-color: yellow; | 59 | background-color: #ffff00; |
60 | width: 3em; | 60 | width: 3em; |
61 | } | 61 | } |
62 | 62 | ||
@@ -66,5 +66,18 @@ A { | |||
66 | } | 66 | } |
67 | 67 | ||
68 | .gccwarn { | 68 | .gccwarn { |
69 | color: #ff4040; | ||
70 | } | ||
71 | |||
72 | .gccerror { | ||
69 | color: #ff0000; | 73 | color: #ff0000; |
70 | } \ No newline at end of file | 74 | } |
75 | |||
76 | .changetable, .bugs, .dailymod { | ||
77 | border: outset 2px #ffffff; | ||
78 | } | ||
79 | |||
80 | .changetable td, .bugs td { | ||
81 | background-color: #c6d6f5; | ||
82 | padding: 4px; | ||
83 | } | ||