  timestamp[11]='/';
  timestamp[14]='/'; 
 }
-/*
+
 // Do not alter this function, it is used by the system
 int getTimeAndDate() {
    int flag=0;

  archiveRRD2.resetFile();
  //digitalWrite(4,HIGH);
  //digitalWrite(10,LOW);
  /*
 // Ethernet shield and NTP setup
 int i = 0;
 int DHCP = 0;
 DHCP = Ethernet.begin(mac);
 //Try to get dhcp settings 30 times before giving up
 
 while( DHCP == 0 && i < 30){
   delay(1000);
   DHCP = Ethernet.begin(mac);
   i++;
 }
 
 
 if(!DHCP){
  Serial.println("DHCP FAILED");
   //for(;;); //Infinite loop because DHCP Failed
 }
 Serial.println("DHCP Success");
 */
 //Try to get the date and time
/*
 int i=0;
 while(!getTimeAndDate() && i<1) {
   i++;
 }
*/
}

void loop()
{
  //digitalWrite(10,LOW);
    // Update the time via NTP server as often as the time you set at the top
    /*
  if(now()-ntpLastUpdate > ntpSyncTime) {
    int trys=0;
    while(!getTimeAndDate() && trys<1){
      trys++;
    }
    if(trys<1){
      Serial.println("ntp server update success");
    }
    else{
      Serial.println("ntp server update failed");
    }
  }
 
  // Display the time if it has changed by more than a second.
  if( now() != prevDisplay){
    prevDisplay = now();

  Udp.write(packetBuffer,NTP_PACKET_SIZE);
  Udp.endPacket();
}

int dstOffset (unsigned long unixTime)
{
  //Receives unix epoch time and returns seconds of offset for local DST
  //Valid thru 2099 for US only, Calculations from "http://www.webexhibits.org/daylightsaving/i.html"
  //Code idea from jm_wsb @ "http://forum.arduino.cc/index.php/topic,40286.0.html"
  //Get epoch times @ "http://www.epochconverter.com/" for testing
  //DST update wont be reflected until the next time sync
  time_t t = unixTime;
  int beginDSTDay = (14 - (1 + year(t) * 5 / 4) % 7);  
  int beginDSTMonth=3;
  int endDSTDay = (7 - (1 + year(t) * 5 / 4) % 7);
  int endDSTMonth=11;
  if (((month(t) > beginDSTMonth) && (month(t) < endDSTMonth))
    || ((month(t) == beginDSTMonth) && (day(t) > beginDSTDay))
    || ((month(t) == beginDSTMonth) && (day(t) == beginDSTDay) && (hour(t) >= 2))
    || ((month(t) == endDSTMonth) && (day(t) < endDSTDay))
    || ((month(t) == endDSTMonth) && (day(t) == endDSTDay) && (hour(t) < 1)))
    return (3600);  //Add back in one hours worth of seconds - DST in effect
  else
    return (0);  //NonDST
}
 
// Clock display of the time and date (Basic)
/*
void clockDisplay(){
  Serial.print(hour());
  printDigits(minute());
