Make all AT command public, and save some memory

Author: frdteknikelektro

.gitignore

@@ -28,3 +28,4 @@
 *.app
 
 .gcc-flags.json
+.vscode

DTE.cpp

@@ -14,6 +14,37 @@ void DTE::debugPrint(const __FlashStringHelper *message, bool returnChar) {
   debugPrint(buffer, returnChar);
 }
 
+/* DTE Class */
+DTE::DTE(HardwareSerial &hardwareSerial, int powerPin, bool debug) {
+  this->hardwareSerial = &hardwareSerial;
+  this->softwareSerial = NULL;
+  this->powerPin = powerPin;
+  this->debug = debug;
+  this->response[0] = '\0';
+  this->echo = true;
+  this->flowControl = (struct FlowControl){0, true, 0, true};
+  this->baudrate = -1;
+  this->powerDown = true;
+
+  pinMode(this->powerPin, OUTPUT);
+  digitalWrite(this->powerPin, LOW);
+}
+
+DTE::DTE(SoftwareSerial &softwareSerial, int powerPin, bool debug) {
+  this->hardwareSerial = NULL;
+  this->softwareSerial = &softwareSerial;
+  this->powerPin = powerPin;
+  this->debug = debug;
+  this->response[0] = '\0';
+  this->echo = true;
+  this->flowControl = (struct FlowControl){0, true, 0, true};
+  this->baudrate = -1;
+  this->powerDown = true;
+
+  pinMode(this->powerPin, OUTPUT);
+  digitalWrite(this->powerPin, LOW);
+}
+
 bool DTE::atReIssueLastCommand(void) {
   const __FlashStringHelper *command = F("A/\r");
 
@@ -119,37 +150,6 @@ bool DTE::atSetFixedLocalRate(long baudrate) {
   return true;
 }
 
-/* DTE Class */
-DTE::DTE(HardwareSerial &hardwareSerial, int powerPin, bool debug) {
-  this->hardwareSerial = &hardwareSerial;
-  this->softwareSerial = NULL;
-  this->powerPin = powerPin;
-  this->debug = debug;
-  this->response[0] = '\0';
-  this->echo = true;
-  this->flowControl = (struct FlowControl){0, true, 0, true};
-  this->baudrate = -1;
-  this->powerDown = true;
-
-  pinMode(this->powerPin, OUTPUT);
-  digitalWrite(this->powerPin, LOW);
-}
-
-DTE::DTE(SoftwareSerial &softwareSerial, int powerPin, bool debug) {
-  this->hardwareSerial = NULL;
-  this->softwareSerial = &softwareSerial;
-  this->powerPin = powerPin;
-  this->debug = debug;
-  this->response[0] = '\0';
-  this->echo = true;
-  this->flowControl = (struct FlowControl){0, true, 0, true};
-  this->baudrate = -1;
-  this->powerDown = true;
-
-  pinMode(this->powerPin, OUTPUT);
-  digitalWrite(this->powerPin, LOW);
-}
-
 int DTE::available(void) {
   if (hardwareSerial) return hardwareSerial->available();
   if (softwareSerial) return softwareSerial->available();

DTE.h

@@ -25,6 +25,19 @@ class DTE {
   long baudrate;
   bool powerDown;
 
+ protected:
+  /**
+   * Sent debugging message via Serial.
+   * @param message    Debug message
+   * @param returnChar true: add new line, false: no new line (default)
+   */
+  void debugPrint(const char message[], bool returnChar = false);
+  void debugPrint(const __FlashStringHelper *message, bool returnChar = false);
+
+ public:
+  DTE(HardwareSerial &hardwareSerial, int pinPower, bool debug = false);
+  DTE(SoftwareSerial &softwareSerial, int pinPower, bool debug = false);
+
   /**
    * Command A/
    * @return  true: If command successful, false: Otherwise
@@ -75,25 +88,6 @@ class DTE {
    */
   bool atSetFixedLocalRate(long baudrate);
 
- protected:
-  /**
-   * Sent debugging message via Serial.
-   * @param message    Debug message
-   * @param returnChar true: add new line, false: no new line (default)
-   */
-  void debugPrint(const char message[], bool returnChar = false);
-
-  /**
-   * Sent debugging message via Serial.
-   * @param message    Debug message
-   * @param returnChar true: add new line, false: no new line (default)
-   */
-  void debugPrint(const __FlashStringHelper *message, bool returnChar = false);
-
- public:
-  DTE(HardwareSerial &hardwareSerial, int pinPower, bool debug = false);
-  DTE(SoftwareSerial &softwareSerial, int pinPower, bool debug = false);
-
   /**
    * Check received buffer
    * @return  Total received char available
@@ -131,12 +125,6 @@ class DTE {
    * @return     Total successfully sent char
    */
   size_t write(const char str[]);
-
-  /**
-   * Send string char array
-   * @param  str String to be sent
-   * @return     Total successfully sent char
-   */
   size_t write(const __FlashStringHelper *str);
 
   /**
@@ -166,12 +154,6 @@ class DTE {
    * @return    true: if nothing is wrong, false: otherwise
    */
   bool ATCommand(const char at[]);
-
-  /**
-   * Send AT Command
-   * @param  at Command (Flash Memory)
-   * @return    true: if nothing is wrong, false: otherwise
-   */
   bool ATCommand(const __FlashStringHelper *at);
 
   /**
@@ -200,14 +182,6 @@ class DTE {
    * @see   ATResponse()
    */
   bool ATResponseEqual(const char expected[], unsigned long timeout = 500);
-
-  /**
-   * Get AT Response, and check if response is equal with expected
-   * @param  expected     Expected response (Flash Memory)
-   * @param  timeout      Timeout in millis, dafault: 500
-   * @return              true: If response as expected, false: Otherwise or timeout
-   * @see   ATResponse()
-   */
   bool ATResponseEqual(const __FlashStringHelper *expected, unsigned long timeout = 500);
 
   /**
@@ -218,14 +192,6 @@ class DTE {
    * @see   ATResponse()
    */
   bool ATResponseContain(const char expected[], unsigned long timeout = 500);
-
-  /**
-   * Get AT Response, and check if response is contain with expected
-   * @param  expected     Expected response (Flash Memory)
-   * @param  timeout      Timeout in millis, default: 500
-   * @return              true: If response contain expected, false: Otherwise or timeout
-   * @see   ATResponse()
-   */
   bool ATResponseContain(const __FlashStringHelper *expected, unsigned long timeout = 500);
 
   /**
@@ -243,12 +209,6 @@ class DTE {
    * @return          true: If last response as expected, false: Otherwise or timeout
    */
   bool isResponseEqual(const char expected[]);
-
-  /**
-   * Check that last response is equal as expected
-   * @param  expected Expected response (Flash Memory)
-   * @return          true: If last response as expected, false: Otherwise or timeout
-   */
   bool isResponseEqual(const __FlashStringHelper *expected);
 
   /**
@@ -257,12 +217,6 @@ class DTE {
    * @return          true: If last response contain expected, false: Otherwise or timeout
    */
   bool isResponseContain(const char expected[]);
-
-  /**
-   * Check that last response is contain expected
-   * @param  expected Expected response (Flash Memory)
-   * @return          true: If last response contain expected, false: Otherwise or timeout
-   */
   bool isResponseContain(const __FlashStringHelper *expected);
 
   /**

GPRS.cpp

@@ -1,6 +1,11 @@
 #include "GPRS.h"
 #include "URC.h"
 
+/* GPRS Class */
+GPRS::GPRS(DTE &dte) {
+  this->dte = &dte;
+}
+
 bool GPRS::atAttachGPRSService(void) {
   const __FlashStringHelper *command = F("AT+CGATT?\r");
   const __FlashStringHelper *response = F("+CGATT: ");
@@ -28,11 +33,6 @@ bool GPRS::atAttachGPRSService(bool attach) {
   return true;
 }
 
-/* GPRS Class */
-GPRS::GPRS(DTE &dte) {
-  this->dte = &dte;
-}
-
 bool GPRS::isAttached(void) {
   if (!atAttachGPRSService()) attached = false;
   return attached;

GPRS.h

@@ -9,6 +9,9 @@ class GPRS {
   DTE *dte;
   bool attached = false;
 
+ public:
+  GPRS(DTE &dte);
+
   /**
    * Command AT+CGATT?
    * @return  true: If command success, false: Otherwise or timeout
@@ -22,9 +25,6 @@ class GPRS {
    */
   bool atAttachGPRSService(bool attach);
 
- public:
-  GPRS(DTE &dte);
-
   /**
    * Is GPRS Service attached/available
    * @return  true: If attached/available, false: Otherwise

GSM.cpp

@@ -1,6 +1,18 @@
 #include "GSM.h"
 #include "URC.h"
 
+/* GSM Class */
+GSM::GSM(DTE &dte) {
+  this->dte = &dte;
+  selectedOperator = (struct Operator){0, 0, "", ""};
+  phonebookMemoryStorage = (struct PhonebookMemoryStorage){"", 0, 0};
+  networkRegistration = (struct NetworkRegistration){0, 4, "", ""};
+  signalQuality = (struct SignalQuality){0, 0};
+  clock = (struct Clock){"", 0, 0, 0, 0, 0, 0, 0};
+  subscriberNumber = (struct SubscriberNumber){"", "", 0, 0, 0};
+  batteryStatus = (struct BatteryStatus){false, 0, 0.0f};
+}
+
 bool GSM::atOperatorSelection(void) {
   const __FlashStringHelper *command = F("AT+COPS?\r");
   const __FlashStringHelper *response = F("+COPS: ");
@@ -329,18 +341,6 @@ bool GSM::atUnstructuredSupplementaryServiceData(unsigned char n, const __FlashS
   return atUnstructuredSupplementaryServiceData(n, buffer, dcs);
 }
 
-/* GSM Class */
-GSM::GSM(DTE &dte) {
-  this->dte = &dte;
-  selectedOperator = (struct Operator){0, 0, "", ""};
-  phonebookMemoryStorage = (struct PhonebookMemoryStorage){"", 0, 0};
-  networkRegistration = (struct NetworkRegistration){0, 4, "", ""};
-  signalQuality = (struct SignalQuality){0, 0};
-  clock = (struct Clock){"", 0, 0, 0, 0, 0, 0, 0};
-  subscriberNumber = (struct SubscriberNumber){"", "", 0, 0, 0};
-  batteryStatus = (struct BatteryStatus){false, 0, 0.0f};
-}
-
 struct Operator GSM::getOperator(unsigned char format) {
   if (strlen(selectedOperator.operNumeric) == 0) {
     if (getNetworkRegistration().status == 1 || getNetworkRegistration().status == 5) {