Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Переделаны функции для включения, выключения и контроля состояния питания #7

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Переделаны функции для включения, выключения и контроля состояния питания #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
da392da
Merge remote-tracking branch 'amperka/master'
DocenkoG Aug 20, 2016
947d605
Переделаны функции включения и выключения питания
DocenkoG Aug 20, 2016
d4853d4
Добавлена getImei, доработаны init и getDateTime
DocenkoG Aug 21, 2016
694ed28
добавляю синхронизацию времени по NTP серверу
DocenkoG Aug 23, 2016
6f37ae0
Добавлена функция readBalance
DocenkoG Aug 24, 2016
fbdf57d
Неудачная доработка Gprs соединения
DocenkoG Aug 27, 2016
9e92133
Исправлены ошибки, добавлены функции до httpGet
DocenkoG Sep 3, 2016
5cecb3d
Стабильная версия
DocenkoG Sep 6, 2016
9793b2b
Отладил функции, добавил примеров.
DocenkoG Sep 15, 2016
4d1a9c8
http GET
DocenkoG Sep 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
868 changes: 576 additions & 292 deletions GPRS_Shield_Arduino.cpp
View file
Open in desktop

Large diffs are not rendered by default.

266 changes: 123 additions & 143 deletions GPRS_Shield_Arduino.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@

#include "sim900.h"

/** GPRS class.
* used to realize GPRS communication
*/
const char OK[] = "OK\r\n";

enum Protocol {
CLOSED = 0,
Expand All @@ -47,59 +45,81 @@ enum Protocol {
class GPRS
{
public:
/** Create GPRS instance
* @param number default phone number during mobile communication
*/
/** Create GPRS instance
* @param number default phone number during mobile communication
*/
GPRS(uint8_t pkPin=2, uint8_t stPin = 3, uint32_t baudRate = 9600);
GPRS(uint8_t pkPin, uint8_t stPin, uint8_t rx, uint8_t tx, uint32_t baudRate = 9600 );

/** get instance of GPRS class
*/
static GPRS* getInstance() {
return inst;
};

GPRS(uint8_t pkPin=2, uint8_t stPin = 3, uint32_t baudRate = 9600);

GPRS(uint8_t pkPin, uint8_t stPin, uint8_t rx, uint8_t tx, uint32_t baudRate = 9600 );

/** get instance of GPRS class
*/
static GPRS* getInstance() {
return inst;
};
///////////////////////////////////////////////////////////////////////////////
/// ///
/// POWER ///
/// ///
///////////////////////////////////////////////////////////////////////////////

/** initialize GPRS module including SIM card check & signal strength
* @return true if connected, false otherwise
*/
void powerOn(void);
void powerOff(void);
void powerUpDown(void);
bool isPowerOn(void);

bool init(void);
///////////////////////////////////////////////////////////////////////////////
/// ///
/// INITIALIZATION ///
/// ///
///////////////////////////////////////////////////////////////////////////////

/** check if GPRS module is powered on or not
* @returns
* true on success
* false on error
*/
bool checkPowerUp(void);
unsigned char init(void);
unsigned char init(char* ipv4Buf);
unsigned char init(char* ipv4Buf,
const char* apn,
const char* lgn,
const char* pwd);
unsigned char initialSetting(void);


/** power Up GPRS module (JP has to be soldered)
* @param pin pin 9 connected to JP jumper so we can power up and down through software
* @returns
*
*/
void powerUpDown();
void powerOff();

/** send text SMS
* @param *number phone number which SMS will be send to
* @param *data message that will be send to
* @returns
* false on success
* true on error
*/
bool sendSMS(char* number, char* data);
///////////////////////////////////////////////////////////////////////////////
/// ///
/// TOOLS ///
/// ///
///////////////////////////////////////////////////////////////////////////////

char* getImei(char* imei);
char* getDateTime(char* buffer); // Получить время с часов модуля
unsigned char syncNtp (const char* ntpServer); // Синхронизация времени модуля с NTP сервером
unsigned char readBalance(const char* moneyRequestBuf,
char* moneyBalanceBuf,
int buflen,
int &moneyBalanceInt);
unsigned char getSignalStrength();
/** getSignalStrength from SIM900 (see AT command: AT+CSQ)
* @returns
0 — 113 dBm or less
1 — 111 dBm
2...30 — 109... 53 dBm
31 — 51 dBm or greater
99 — not known or not detectable
*/
bool checkSIMStatus(void);

///////////////////////////////////////////////////////////////////////////////
/// ///
/// SMS ///
/// ///
///////////////////////////////////////////////////////////////////////////////

bool sendSMS(char* number, char* data);

/** Check if there is any UNREAD SMS: this function DOESN'T change the UNREAD status of the SMS
* @returns
* 1..20 on success, position/index where SMS is stored, suitable for the function ReadSMS
* -1 on error
* 0 - there is no SMS with specified status (UNREAD)
*/

char isSMSunread();

/** read SMS, phone and date if getting a SMS message. It changes SMS status to READ
Expand Down Expand Up @@ -131,86 +151,69 @@ class GPRS
* false on error
*/
void readSMS();

bool deleteSMS(int index);

/** call someone
* @param number the phone number which you want to call
* @returns
* true on success
* false on error
*/
bool callUp(char* number);

/** auto answer if coming a call
* @returns
*/
void answer(void);

/** hang up if coming a call
* @returns
* true on success
* false on error
*/
bool hangup(void);

/** Disable +CLIP notification when an incoming call is active, RING text is always shown. See isCallActive function
* This is done in order no to overload serial outputCheck if there is a call active and get the phone number in that case
* @returns
* true on success
* false on error
*/
bool ifcallNow(void);

bool deleteSMS(int index); // Удалить SMS по индексу
bool deleteSMS(void); // Удалить все, кроме непрочитанных
bool ifSMSNow(void);

bool ifcallEnd(void);

void callEnd(void);

bool disableCLIPring(void);

/** Check if there is a call active and get the phone number in that case
* @returns
* true on success
* false on error
*/
bool isCallActive(char *number);
///////////////////////////////////////////////////////////////////////////////
/// ///
/// RINGS ///
/// ///
///////////////////////////////////////////////////////////////////////////////

/** get DateTime from SIM900 (see AT command: AT+CLTS=1) as string
* @param
* @returns
* true on success
* false on error
*/
bool getDateTime(char *buffer);
/** call someone
* @param number the phone number which you want to call
* @returns
* true on success
* false on error
*/
bool callUp(char* number);
/** auto answer if coming a call
* @returns
*/
void answer(void);

/** hang up if coming a call
* @returns
* true on success
* false on error
*/
bool hangup(void);
/** Disable +CLIP notification when an incoming call is active, RING text is always shown. See isCallActive function
* This is done in order no to overload serial outputCheck if there is a call active and get the phone number in that case
* @returns
* true on success
* false on error
*/
bool ifcallNow(void);
bool ifcallEnd(void);
void callEnd(void);
bool disableCLIPring(void);
bool isCallActive(char *number); // Check if call active and get the phone number in that case



/** getSignalStrength from SIM900 (see AT command: AT+CSQ)
* @returns
0 — 113 dBm or less
1 — 111 dBm
2...30 — 109... 53 dBm
31 — 51 dBm or greater
99 — not known or not detectable
*/
byte getSignalStrength();

///////////////////////////////////////////////////////////////////////////////
/// ///
/// GPRS ///
/// ///
///////////////////////////////////////////////////////////////////////////////
// Connect the GPRS module to the network.
unsigned char joinGprs(char* ipv4Buf, const char* apn, const char* lgn, const char* pwd);
unsigned char joinGprs(char* ipv4Buf);
unsigned char getGprsStatus(char* ipv4Buf); // Возвращает статус GPRS соединения:
// 0 - соединение устанавливается
// 1 - соединение установлено
// 2 - соединение закрывается
// 3 - нет соединения
// 10 - состояние не распознано
// ipv4Buf возвращает в формате xxx.xxx.xxx.xxx

//////////////////////////////////////////////////////
/// GPRS
//////////////////////////////////////////////////////
/** Connect the GPRS module to the network.
* @return true if connected, false otherwise
*/

// bool join(const __FlashStringHelper *apn = 0, const __FlashStringHelper *userName = 0, const __FlashStringHelper *passWord = 0);
bool join(char* apn = 0, char* = 0, char* = 0, int timeout = 2 * DEFAULT_TIMEOUT);
void disconnectGprs(void); // Disconnect the GPRS module from the network
int httpGet(char* url, int& dataLen);

/** Disconnect the GPRS module from the network
* @returns
*/
void disconnect(void);

/** Open a tcp/udp connection with the specified host on the specified port
* @param socket an endpoint of an inter-process communication flow of GPRS module,for SIM900 module, it is in [0,6]
* @param ptl protocol for socket, TCP/UDP can be choosen
Expand All @@ -219,24 +222,13 @@ class GPRS
* @param timeout wait seconds till connected
* @returns true if successful
*/
bool connect(Protocol ptl, const char * host, int port, int timeout = 2 * DEFAULT_TIMEOUT);
bool connect(Protocol ptl, const char * host, int port, int timeout = 2 * DEFAULT_TIMEOUT);
bool connect(Protocol ptl, const __FlashStringHelper *host, const __FlashStringHelper *port, int timeout = 2 * DEFAULT_TIMEOUT);

/** Check if a tcp link is active
* @returns true if successful
*/
bool is_connected(void);

/** Close a tcp connection
* @returns true if successful
*/
bool close(void);

/** check if GPRS module is readable or not
* @returns true if readable
*/
int readable(void);
bool close(void); // Close a tcp connection * @returns true if successful
int readable(void); // check if GPRS module is readable. @returns true if readable


/** wait a few time to check if GPRS module is readable or not
* @param socket socket
* @param wait_time time of waiting
Expand All @@ -258,14 +250,6 @@ class GPRS
*/
int send(const char * str, int len);

/** read data from socket
* @param socket socket
* @param buf buffer that will store the data read from socket
* @param len string length need to read from socket
* @returns bytes that actually read
*/
int recv(char* buf, int len);

/** convert the host to ip
* @param host host ip string, ex. 10.11.12.13
* @param ip long int ip address, ex. 0x11223344
Expand All @@ -277,15 +261,11 @@ class GPRS
unsigned long getIPnumber();

private:
bool checkSIMStatus(void);
uint8_t _stPin = 3;
uint8_t _pkPin = 2;

uint32_t str_to_ip(const char* str);
// SoftwareSerial gprsSerial;
Stream* stream;
static GPRS* inst;
uint32_t _ip;
char ip_string[16]; //XXX.YYY.ZZZ.WWW + \0
};
#endif
Loading