diff --git a/www/Makefile b/www/Makefile index 250c848584..059f3f2c94 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,7 +1,7 @@ ACTION=@echo preprocessing $@; rm -f $@; $(HOME)/bin/fcpp -WWW -Uunix -H -C -V -LL >$@ SRC := $(wildcard *.t) -OBJS := $(SRC:%.t=%.html) daily.shtml +OBJS := $(SRC:%.t=%.html) daily.shtml main.shtml index.shtml .SUFFIXES: .t .html @@ -23,5 +23,10 @@ all: $(OBJS) main.html: main.t activity.html +main.shtml: main.t activity.html + +index.shtml: main.shtml + ln -s main.shtml index.shtml + daily.shtml: daily.t diff --git a/www/cvs.t b/www/cvs.t index ac7e5dea62..b743573a44 100644 --- a/www/cvs.t +++ b/www/cvs.t @@ -66,6 +66,7 @@ of the Rockbox project

cvs commit -m "This is my change comment" filename +

Note: 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.

Updating your repository

@@ -105,6 +106,16 @@ those on the remote repository. This is called "status":

cvs status | grep Status | grep -v Up-to-date +

Producing a diff of your changes

+ +

If you want to see how your local files differ from the CVS repository, +you can ask CVS to show you: + +

cvs diff -u [files(s)] + +

The -u selects the "unified" diff format, which is preferrable +when working with source code. +

What Happens in the Repository?

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 not official releases, they are in fact almost guaranteed to not

Note 1: You must rename the file to "archos.mod" ("ajbrec.ajz" for the recorder) before copying it to the root of your archos. -

Note 2: The Recorder version does not fully work yet, due to unfinished drivers. It runs, but cannot play music.

CVS compile status

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 { print "\n"; } -print "
\n"; +print "
\n"; print "

player-old

\n"; print "

This version is for old Archos Jukebox 5000, 6000 models with ROM firmware older than 4.50:\n"; &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 @@ #define DOWNLOAD_PAGE #include "head.t" -

Version 1.0

+

Version 1.1

-

This first version is more a proof-of-concept than a serious replacement for the stock firmware. -Read the release notes. +

Recorder support, playlists and scrolling are the main new features of this version. Read the release notes. +

+

player-old

This version is for old Archos Jukebox 6000 models with ROM firmware older than 4.50.

+		 +

player

This version is for Archos Jukebox 5000, 6000 with ROM firmware 4.50 or later, and all Studio models.

+

Bug: Bass and treble adjustment does not work. + +

 +

recorder

-

Version 1.0 does not support the Recorder. Future versions will. +

This version is for all Archos Jukebox Recorder models. + +

+ +

Bug: MP3 playback only works on Recorder 20, not 6 or 10. PLAY key is not detected, use RIGHT. + +

+

Source code

-

User interface simulators

-

Player simulator -Recorder simulator +

Screen shots (from simulator)

+

+ + + + + + + + + + + + +
Player simulator +
Player boot screen		Recorder simulator +
Recorder boot screen		File browser
Recorder file browser		ID3 display
Recorder ID3 display
Tetris
Tetris (recorder only)		Sokoban
Sokoban (recorder only)		Bounce
Bouncing text (recorder only)
+ + +

User interface simulators

+ +

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 release notes.

4/6 = prev/next, 8 = play, 2 = stop, enter = menu, + = on
Recorder -
4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys +
4/6 = left/right, 8/2 = up/down, 5 = play/pause, / * - = menu keys, +/enter = on/off

Installation

-

Unzip the archive. Rename your current archos.mod (if any) in the root of your archos, then copy the rockbox archos.mod there. +

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).

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. @@ -59,7 +95,7 @@ Read the release notes.

Bug reports

Please use our -Sourceforge page +Sourceforge page for all bug reports and feature requests. If you have a sourceforge account, please log in first so we have a name to connect to the report. 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 @@ data sheets
schematics
hardware mods
-mail list archive
+mailing list
IRC
tools
photos
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 @@ #define HISTORY_PAGE #include "head.t" +

2002-06-19: Recorder sound support checked into CVS. Good news: No background noise! + +

2002-06-10: Playlist and scroll support added. Testing for release v1.1. + +

2002-06-07: The ATA driver now works for the Recorder models too. +

2002-06-01: Version 1.0 is released! Download it here.

2002-06-01: 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 5000, 6000, Studio and R

2002-06-19: Version 1.1 is released. Download it here. -

2002-06-19: Recorder sound support checked into CVS. Good news: No background noise! - -

2002-06-10: Playlist and scroll support added. Testing for release v1.1. - -

2002-06-07: The ATA driver now works for the Recorder models too. -

(Old news items have moved to a separate page.) -

We have a mailing list: rockbox@cool.haxx.se. -To subscribe, send a message to majordomo@cool.haxx.se with the words "subscribe rockbox" in the body. +

Recent CVS activity

+

+ + +

Open bug reports

+

+ +Note: Don't file bug reports on daily builds. They are work in progress. + +

Vacations

+

Parts of the core team is currently away on vacation: +

    +
  • Björn Stenberg (Zagor): Back friday july 5, reads mail +
  • Daniel Stenberg (Bagder): Back thursday july 25, does not read mail +

Roadmap

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 If it exists, it is loaded into RAM and started. This is how firmware upgrades are loaded. -

Dreams

-

Ok, forget about reality, what could we do with this? - -

    -
  • All those simple mp3-play features we sometimes miss: -
      -
    • No pause between songs -
    • Mid-song resume -
    • Mid-playlist resume -
    • No-scan playlists -
    • Unlimited playlist size -
    • Autobuild playlists (such as "all songs in this directory tree") -
    • Auto-continue play in the next directory -
    • Current folder and all sub-folder random play -
    • Full disk random play -
    • REAL random (if press back it goes to the previous song that was played) -
    • Multi song queue (folder queue) -
    -
  • Faster scroll speed -
  • Archos Recorder support. Most of the hardware is the same, but the display and some other things differ. -
  • All kinds of cool features done from the wire remote control, including controlling your Archos from your car radio (req hw mod) -
  • Ogg Vorbis support [unverified: the MAS is somewhat programmable, but enough?] -
  • 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] -
  • Player control via USB [unverified] -
  • 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] -
- #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 { .bgbox { left-border-width: 1px; - border-color: black; + border-color: #000000; } .menulink { @@ -56,7 +56,7 @@ A { } .buildwarn { - background-color: yellow; + background-color: #ffff00; width: 3em; } @@ -66,5 +66,18 @@ A { } .gccwarn { + color: #ff4040; +} + +.gccerror { color: #ff0000; -} \ No newline at end of file +} + +.changetable, .bugs, .dailymod { + border: outset 2px #ffffff; +} + +.changetable td, .bugs td { + background-color: #c6d6f5; + padding: 4px; +}