Improve gentimes.pl script, now also generates .h file

diff --git a/progenv/gentimes.h b/progenv/gentimes.h
deleted file mode 100644 (file)
index 4d68e2a..0000000
--- a/progenv/gentimes.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _GENTIMES_H_
-#define _GENTIMES_H_
-
-extern const s8 sinetable[];
-extern const u16 freqtable[];
-
-extern const int T0DIV;
-extern const int T0MAX;
-
-#endif

diff --git a/progenv/gentimes.pl b/progenv/gentimes.pl
index 679f9152590ee0e8ebfe0be0a6cb5825a030d4a0..9281446d5db38973f20394629d051a9280d8267f 100644 (file)
--- a/progenv/gentimes.pl
+++ b/progenv/gentimes.pl
@@ -27,25 +27,56 @@ sub gensinetab ($$) {
 my $FCPU = 20000000;
 my $SAMPLERATE = 16000;
 my $SINEWSIZE = 64;
+my $mode = "C";
 
-print "#include \"progenv/gentimes.h\"\n";
-
-print "const s8 sinetable[] = {\n";
-print join ", ", map { int } @{gensinetab($SINEWSIZE,127)} ;
-print "};\n\n";
-
-# The frequency table ranges from C1 (note 4) to B7 (note 87)
-# 
-print "const u16 freqtable[] = {\n";
-foreach (@{genfreqtab($SAMPLERATE,4,87)}) { printf "%4x, ", int($_); }
-print "};\n\n";
-
-# Generate timer0 prescaler and limit for the mode we use.
-# t0denoms are from AVR spec.
-my @t0denoms = ( undef, 1, 8, 64, 256, 1024, undef, undef );
-my $ix = 1;
-while ($ix < 5 and $FCPU/$SAMPLERATE/$t0denoms[$ix] > 255) { $ix++; }
-die if $ix == 5;
-print "const int T0DIV = ", $ix, ";\n";
-print "const int T0MAX = ",
+my %OPTS = (
+       'fcpu=i' => \$FCPU,
+       'samprate=i' => \$SAMPLERATE,
+       'sinewsize=i' => \$SINEWSIZE,
+       'mode=s' => \$mode,
+);
+
+GetOptions(%OPTS) or die;
+
+
+if ($mode eq "C") {
+       print "#include \"progenv/gentimes.h\"\n";
+
+       print "const uint8_t sinetable[] = {\n";
+       print join ", ", map { int } @{gensinetab($SINEWSIZE,127)} ;
+       print "};\n\n";
+
+       # The frequency table ranges from C1 (note 4) to B7 (note 87)
+       # 
+       print "const uint16_t freqtable[] = {\n";
+       foreach (@{genfreqtab($SAMPLERATE,4,87)}) { printf "0x%04x, ", int($_); }
+       print "};\n\n";
+} elsif ($mode eq "H") {
+       print "#ifndef __PROGENV_GENTIMES_H__\n";
+       print "#define __PROGENV_GENTIMES_H__\n\n";
+
+       print "#ifdef ASSEMBLER\n";
+       print "\t.global sinetable;\n";
+       print "\t.global freqtable;\n";
+       print "#else\n";
+       print "#include <progenv/types.h>\n\n";
+       print "extern const uint8_t sinetable[];\n";
+       print "extern const uint16_t freqtable[];\n";
+       print "#endif /* ASSEMBLER */\n\n";
+
+       # Generate timer0 prescaler and limit for the mode we use.
+       # t0denoms are from AVR spec.
+       my @t0denoms = ( undef, 1, 8, 64, 256, 1024, undef, undef );
+       my $ix = 1;
+       while ($ix < 5 and $FCPU/$SAMPLERATE/$t0denoms[$ix] > 255) { $ix++; }
+       die if not defined $t0denoms[$ix];
+       print "#define T0DIV = ", $ix, ";\n";
+       print "#define T0MAX = ",
                int($FCPU/$SAMPLERATE/$t0denoms[$ix]), ";\n\n";
+
+       print "#define PLAY_WAIT ", $SAMPLERATE/100, ";\n\n";
+
+       print "#endif /* __PROGENV_GENTIMES_H__ */\n";
+} else {
+       die "Invalid mode requested\n";
+}