 #include <avr/pgmspace.h>
 #include <util/parity.h>
 
-#define debug
+#define DEBUG 1
+
 // ATtiny's only support outbound serial @ 38400 baud, and no DataFlash logging
 
 #if defined(__AVR_ATtiny84__) || defined(__AVR_ATtiny44__)
 #define SERIAL_BAUD 38400
-#define JNMicro
 #else
 #define SERIAL_BAUD 57600
 
-#define DATAFLASH 0          // Enabling flash for none flash equipped nodes causes odd problems - particularly non-Jee kit
+// Enabling dataflash code may cause problems with non-JeeLink configurations
+#define DATAFLASH 0
 // check for presence of DataFlash memory on JeeLink
 #define FLASH_MBIT  16  // support for various dataflash sizes: 4/8/16 Mbit
 

static RF12Config config;
char revP = 94; // Symbol ^ to indicate direction of frequency offset
static char cmd;
static byte value, stack[RF12_MAXDATA+4], top, sendLen, dest, sticky, revF = 0, low = 0xFF, high = 0;
static byte testbuf[RF12_MAXDATA], testCounter, useHex;

byte band;

static void showNibble (byte nibble) {
  char c = '0' + (nibble & 0x0F);

  Serial.begin(SERIAL_BAUD);
  displayVersion(0);
  activityLed(0);

  if (rf12_config())
    initialize();
  else {
    config.nodeId = 0x41; // 433 MHz, node 1
    config.group = 0xD4;  // default group 212
    frequency = 1600;
    config.flags = 0xC;   // Default flags, quiet off and non V10
//  saveConfig();         // Don't save to eeprom until we have changes.
  }

#if DATAFLASH
