From e7bc9f20a21886ea1b12f32fdc6aa91455ff7d53 Mon Sep 17 00:00:00 2001 From: dak664 Date: Fri, 19 Jun 2009 17:12:35 +0000 Subject: [PATCH] Put strings in PROGMEM, strip CRLF in text files only --- tools/avr-makefsdata | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/avr-makefsdata b/tools/avr-makefsdata index f54e39774..2aaca1878 100644 --- a/tools/avr-makefsdata +++ b/tools/avr-makefsdata @@ -27,7 +27,10 @@ foreach $file (@files) { print "Adding file $file\n"; open(FILE, $file) || die "Could not open file $file\n"; - binmode FILE; + if (grep /.png/,$file) {binmode FILE;} + if (grep /.jpg/,$file) {binmode FILE;} + if (grep /.gif/,$file) {binmode FILE;} + $file =~ s-^-/-; $fvar = $file; $fvar =~ s-/-_-g; @@ -69,7 +72,8 @@ for($i = 0; $i < @fvars; $i++) { } else { $prevfile = "file" . $fvars[$i - 1]; } - print(OUTPUT "const struct httpd_fsdata_file file".$fvar."[] = {{$prevfile, data$fvar, "); +# for AVR, add PROGMEM here + print(OUTPUT "const struct httpd_fsdata_file file".$fvar."[] PROGMEM = {{$prevfile, data$fvar, "); print(OUTPUT "data$fvar + ". (length($file) + 1) .", "); print(OUTPUT "sizeof(data$fvar) - ". (length($file) + 1) ."}};\n\n"); }