   {  
     hardware_watchdog_timestamp = millis(); 
   }
-  else if(gprs_or_wifi_watchdog_counter < 10)
+  else if(gprs_or_wifi_watchdog_counter < WATCHDOG_COUNTER_MAX)
   {
     hardware_watchdog_timestamp = millis();   
   }

{
  latest_message_to_send = "";
  if(detailed_state_count < 1)
  {
    return;
  }
  
  int which_location = DETAILED_STATE_START_LOCATION + (DETAILED_STATE_DATA_WIDTH * (detailed_state_count - 1));

*/
  
bool currently_active = true;


/*
  Watchdog variables
*/
  
long gprs_or_wifi_watchdog_timestamp = 0;
int  gprs_or_wifi_watchdog_counter = 0;
#define WATCHDOG_COUNTER_MAX	12

/*
  GPRS flags that describe current state of communication
*/
  
#define	MAX_GPRS_READ_BUFFER	64

#ifdef WIFI_NOT_CELL
