 boolean Modem_isCommandMode = true;
 boolean Modem_isConnected = false;
 boolean Modem_isRinging = false;
-//boolean Modem_EchoOn = EEPROM.read(ADDR_MODEM_ECHO);
-boolean Modem_EchoOn = true;
+boolean Modem_EchoOn = EEPROM.read(ADDR_MODEM_ECHO);
+//boolean Modem_EchoOn = true;
 boolean Modem_VerboseResponses = true;
 boolean Modem_QuietMode = false;
 boolean Modem_isDcdInverted = false;

        Modem_Dialout(strstr(Modem_CommandBuffer, "ATDT") + 4);
        Modem_ResetCommandBuffer();  // This avoids port# string fragments on subsequent calls
    }
    else if ((strcmp(Modem_CommandBuffer, ("ATH0")) == 0 || strcmp(Modem_CommandBuffer, ("ATH")) == 0))
    {
        Modem_Disconnect();
    }
    else if (strcmp(Modem_CommandBuffer, ("AT&RAW")) == 0)
    {
        RawTerminalMode();
    }   
    else if (strncmp(Modem_CommandBuffer, ("AT&SSID="), 8) == 0)
    {
        if (petscii_mode)

#define ADDR_AUTOSTART     1
#define ADDR_BAUD_LO       2
#define ADDR_BAUD_HI       3
#define ADDR_MODEM_ECHO         10
#define ADDR_MODEM_FLOW         11
//#define ADDR_MODEM_VERBOSE      12
//#define ADDR_MODEM_QUIET        13
//#define ADDR_MODEM_S0_AUTOANS   14
//#define ADDR_MODEM_S2_ESCAPE    15
//#define ADDR_MODEM_DCD_INVERTED 16

#define ADDR_HOST_AUTO    99     // Autostart host number
#define ADDR_HOSTS         100    // to 299 with ADDR_HOST_SIZE = 40 and ADDR_HOST_ENTRIES = 5
//#define ADDR_xxxxx         300

// Misc Values
#define TIMEDOUT  -1
boolean baudMismatch = (BAUD_RATE != WiFly_BAUD_RATE ? 1 : 0);
//boolean Modem_flowControl = false;   // for &K setting.  Not currently stored in EEPROM
boolean Modem_flowControl = EEPROM.read(ADDR_MODEM_FLOW);

// PETSCII state
boolean petscii_mode = EEPROM.read(ADDR_PETSCII);
