 #define LB_ADVERT "rfduino"     // dont change "rfduino"
                                 // length of device name and advertisement <=15!!!
 #define LB_VERSION "V0.9"       // program version
-<<<<<<< HEAD
 #define LB_MINOR_VERSION ".08"  // indicates minor version
 #define LB_DATETIME "180219_2147" // date_time
-=======
-#define LB_MINOR_VERSION ".07"  // indicates minor version
-#define LB_DATETIME "180216_1051" // date_time
->>>>>>> 889c98de6bfe5483b6c10b253498555ce3125e25
 #define SPIKE_HEIGHT 40         // minimum delta to be a spike
 
 #ifdef RFD

    delay(100);
  } while ( !Serial && ((mymillis()-ct) < 5000) );
//  print_statef("serial interface ready after %d ms", mymillis()-ct);
=======
//  delay(2000); 
  // time to settle, method in troduced by @bertrooode
  // wait for serial interface up and running or if 5 secs are elapsed
  unsigned long ct = mymillis();
  while ( !Serial && ((mymillis()-ct) < 5000) ) {
    delay(100);
  }
  print_statef("serial interface ready after %d ms", ct-mymillis());
>>>>>>> 889c98de6bfe5483b6c10b253498555ce3125e25

  myprintf("\r\n=== starting =====================================================================================================");


 *  - additional reset of CR95HF after ULP wakeup and Serial.start (@bertrooode)
 *  - own printf() code to avoid fragmented Serial.print() calls / reduce system load? to be verified
 *  - set different minimum voltage level for Simblee (@FPV-UAV)
 */

/* ********************* program configuration options **********************/
