Update (and fix) the chaucer* sketches (for testing big uploads.)

update progmem usage (const char instead of prog_char) use pgm_read_byte_far() where needed. reset counter i in between segments when printing.
Optiboot · Jul 26, 2018 · a2e1f3b · a2e1f3b
1 parent 5803649
commit a2e1f3b
Show file tree

Hide file tree

Showing 7 changed files with 3,709 additions and 3,692 deletions.
diff --git a/optiboot/examples/chaucer112k/chaucer112k.ino b/optiboot/examples/chaucer112k/chaucer112k.ino
diff --git a/optiboot/examples/chaucer112k/chaucer112k.pde b/optiboot/examples/chaucer112k/chaucer112k.pde
diff --git a/optiboot/examples/chaucer16k/chaucer16k.pde → optiboot/examples/chaucer16k/chaucer16k.ino b/optiboot/examples/chaucer16k/chaucer16k.pde → optiboot/examples/chaucer16k/chaucer16k.ino
@@ -2,7 +2,7 @@
 // Full text at http://www.gutenberg.org/dirs/etext00/cbtls12.txt
 #include <avr/pgmspace.h>
 
-prog_char knightsTale[] PROGMEM= {
+const char knightsTale[] PROGMEM= {
 "                     THE KNIGHT'S TALE <1>\n"
 "\n"
 "\n"
@@ -295,10 +295,10 @@ prog_char knightsTale[] PROGMEM= {
 void setup() {
   int i=0;
   uint8_t c;
-  Serial.begin(9600);
+  Serial.begin(115200);
   do {
     c = pgm_read_byte(knightsTale+i);
-    if (c) Serial.print(c,BYTE);
+    if (c) Serial.write(c);
     i++;
   } while (c);
 }

diff --git a/optiboot/examples/chaucer256k/chaucer256k.ino b/optiboot/examples/chaucer256k/chaucer256k.ino
@@ -3736,37 +3736,43 @@ const char knightsTale6[] PROGMEM= {
 void setup() {
   int i=0;
   uint8_t c;
-  Serial.begin(9600);
+  Serial.begin(115200);
   do {
-    c = pgm_read_byte(knightsTale+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
+  i = 0;
   do {
-    c = pgm_read_byte(knightsTale2+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale2)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
+  i = 0;
   do {
-    c = pgm_read_byte(knightsTale3+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale3)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
+  i = 0;
   do {
-    c = pgm_read_byte(knightsTale4+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale4)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
+  i = 0;
   do {
-    c = pgm_read_byte(knightsTale5+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale5)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
+  i = 0;
   do {
-    c = pgm_read_byte(knightsTale6+i);
+    c = pgm_read_byte_far(pgm_get_far_address(knightsTale6)+i);
     if (c) Serial.write(c);
     i++;
   } while (c);
 }
+
 void loop() {
 }
diff --git a/optiboot/examples/chaucer32k/chaucer32k.pde → optiboot/examples/chaucer32k/chaucer32k.ino b/optiboot/examples/chaucer32k/chaucer32k.pde → optiboot/examples/chaucer32k/chaucer32k.ino
@@ -2,7 +2,7 @@
 // Full text at http://www.gutenberg.org/dirs/etext00/cbtls12.txt
 #include <avr/pgmspace.h>
 
-prog_char knightsTale[] PROGMEM= {
+const char knightsTale[] PROGMEM= {
 "                     THE KNIGHT'S TALE <1>\n"
 "\n"
 "\n"
@@ -668,10 +668,10 @@ prog_char knightsTale[] PROGMEM= {
 void setup() {
   int i=0;
   uint8_t c;
-  Serial.begin(9600);
+  Serial.begin(115200);
   do {
     c = pgm_read_byte(knightsTale+i);
-    if (c) Serial.print(c,BYTE);
+    if (c) Serial.write(c);
     i++;
   } while (c);
 }