Rebooting and flashing a node now works!

avr/flash.asm

@@ -183,7 +183,7 @@ wait:                ; wait for possibly previous SPM to complete
 ; OUT:
 ; - R16: byte read
 ; - X: EEPROM Address incremented
-; MODIFIED REGISTERS: R16
+; REGS: R16
 
 flashReadEepromIncr:
   sbic EECR, EEPE          ; wait for previous write to complete (if any)
@@ -208,8 +208,8 @@ flashReadEepromIncr:
 ; REGS: R16, X
 
 flashReadUid:
-  in r15, SREG
   push r15
+    in r15, SREG
     cli
     ldi xl, LOW(EEPROM_OFFS_UUID)
     ldi xh, HIGH(EEPROM_OFFS_UUID)
@@ -221,8 +221,8 @@ flashReadUid:
     mov r20, r16
     rcall flashReadEepromIncr ; (R16)
     mov r21, r16
+    out SREG, r15
   pop r15
-  out SREG, r15
   ret