More test content: .hex file with pages of 0xFF's, eeprom data, eeprom test sketch, and improved reset test sketch

optiboot/examples/eeprom_data.c

@@ -0,0 +1,26 @@
+/*
+ * This short C progam creates a .elf file with EEPROM contents that
+ * can be extracted to form a .hex file for testing EEPROM upload/downloads
+ * via the bootloader.
+ *
+ * Compile with:
+ *  avr-gcc -mmcu=atmega328p eeprom_data.c -o eeprom_data.elf
+ *  avr-objcopy -j .eeprom --change-section-lma .eeprom=0 -O ihex eeprom_data.elf eeprom_data.hex
+ * Upload with:
+ *  avrdude ... -U eeprom:w:eeprom_data.hex
+ */
+#include <avr/io.h>
+#include <avr/eeprom.h>
+
+#define zero16 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0
+#define zero32 zero16, zero16
+
+const EEMEM unsigned long longs[32] = {0x12345678, 0x9abcdef0, 0x11223344, 0, 0xdeadbeef, zero16, 0xdecade, 0x78563412};
+const EEMEM unsigned int integers[64] = {0x1234, 0x5678, 0x9ABC, 0, 0, 0, 1, 2 , zero32, 0xAB90, 0x3412};
+const EEMEM char characters[128] = "test 1 2 3 4 5 6 7 8 9 0" "                                    "
+    "more testing abcdefghijklmnop";
+
+
+int main() {}
+
+    

optiboot/examples/test_eeprom/test_eeprom.ino

@@ -0,0 +1,107 @@
+/*
+   EEPROM test program with more features.
+*/
+
+#include <EEPROM.h>
+
+void setup() {
+  // initialize the LED pin as an output.
+  pinMode(13, OUTPUT);
+  Serial.begin(115200);
+  Serial.println("EEPROM test program.\n"
+                 "Enter one of (C)lear, (E)rase, (I)incrementing, (U)p&Down, (0)check,\n"
+                 "(D)ump, (F)check, (T)inccheck");
+
+}
+
+void hex2(uint8_t n) {
+  if (n <= 15)
+    Serial.write('0');
+  Serial.print(n, HEX);
+  Serial.write(' ');
+}
+
+void print16(uint8_t *buf) {
+  for (int i = 0; i < 16; i++) {
+    hex2(buf[i]);
+  }
+  Serial.print("    ");
+  for (int i = 0; i < 16; i++) {
+    uint8_t c = buf[i];
+    if (c < 32 || c > 126)
+      Serial.write('.');
+    else
+      Serial.write(c);
+  }
+  Serial.println();
+}
+
+void dump16(uint16_t addr) {
+  struct {
+    uint8_t buf[16];
+  } s;
+
+  EEPROM.get(addr, s);
+  print16(s.buf);
+}
+
+
+int cmd = -1;
+void loop() {
+  uint16_t i;
+  do {
+    cmd = Serial.read();
+  } while (cmd < 0);
+
+  switch (cmd & ~('a' - 'A')) {
+    case 'C':
+      for (i = 0 ; i < EEPROM.length() ; i++) {
+        EEPROM.write(i, 0);
+      }
+      break;
+    case 'D':
+      Serial.println("EEPROM Dump\n");
+      for (i = 0; i < EEPROM.length(); i += 16) {
+        Serial.print(i, HEX);
+        Serial.print(": ");
+        dump16(i);
+      }
+      Serial.println();
+      break;
+    case 'E':
+      for (i = 0 ; i < EEPROM.length() ; i++) {
+        EEPROM.write(i, 0xFF);
+      }
+      break;
+    case 'I':
+      for (i = 0 ; i < EEPROM.length() ; i++) {
+        EEPROM.write(i, i & 0xFF);
+      }
+      break;
+    case 'U':
+      for (i = 0 ; i < EEPROM.length() ; i++) {
+        if ((i & 0x100) == 0) {
+        EEPROM.write(i, i & 0xFF);
+        } else {
+          EEPROM.write(i, 255 - (i & 0xFF));
+        }
+      }
+      break;
+    case '?':
+      Serial.println("EEPROM test program.\n"
+                     "Enter one of (C)lear, (E)rase, (I)incrementing, (0)check,\n"
+                     "(D)ump, (F)check, (T)inccheck");
+    // Fall through
+    case '\n':
+    case '\r':
+      break;
+    default:
+      Serial.print("unrecognized command ");
+      Serial.println(cmd);
+      break;
+      // turn the LED on when we're done
+      digitalWrite(13, HIGH);
+  }
+}
+
+

optiboot/examples/test_reset/test_reset.ino

@@ -16,7 +16,7 @@
  * various initialization code.
  * avr-gcc provides for this via the ".noinit" section.
  */
-uint8_t resetFlags __attribute__ ((section(".noinit")));
+uint8_t resetFlag __attribute__ ((section(".noinit")));
 
 /*
  * Next, we need to put some code to save reset cause from the bootload (in r2)
@@ -35,15 +35,13 @@ void resetFlagsInit(void)
    * This is a "simple" matter of storing (STS) r2 in the special variable
    * that we have created.  We use assembler to access the right variable.
    */
-  __asm__ __volatile__ ("sts %0, r2\n" : "=m" (resetFlags) :);
+  __asm__ __volatile__ ("sts %0, r2\n" : "=m" (resetFlag) :);
 }
 
-void setup() {
-  Serial.begin(9600);  // Initialize serial port
-  
-  Serial.println("Reset flag test");
+void printReset(const char *label, uint8_t resetFlags)
+{
   
-  Serial.print("Have reset flag value 0x");
+  Serial.print(label);
   Serial.print(resetFlags, HEX);
   
   /*
@@ -78,6 +76,16 @@ void setup() {
   Serial.println("");
 }
 
+
+void setup() {
+  Serial.begin(9600);  // Initialize serial port
+  
+  Serial.println("Reset flag test");
+  printReset("Actual MCUSR content: 0x", MCUSR);
+  printReset("Passed in GPIOR0: 0x", GPIOR0);
+  printReset("Passed in R2: 0x", resetFlag);
+}
+  
 void loop() {
   Serial.println("Send something to reset through watchdog peripheral");
   while (Serial.read() < 0) ;