diff --git a/cores/arduino/board.h b/cores/arduino/board.h
index 00e207e62a..c008f24981 100644
--- a/cores/arduino/board.h
+++ b/cores/arduino/board.h
@@ -12,7 +12,6 @@ extern "C"{
#include "clock.h"
#include "core_callback.h"
#include "digital_io.h"
-#include "hal_uart_emul.h"
#include "hw_config.h"
#include "low_power.h"
#include "rtc.h"
@@ -21,7 +20,6 @@ extern "C"{
#include "timer.h"
#include "twi.h"
#include "uart.h"
-#include "uart_emul.h"
#ifdef USBCON
#include "usb_interface.h"
#endif //USBCON
diff --git a/cores/arduino/stm32/clock.c b/cores/arduino/stm32/clock.c
index 0088a61143..ffe0ad79ff 100644
--- a/cores/arduino/stm32/clock.c
+++ b/cores/arduino/stm32/clock.c
@@ -87,40 +87,6 @@ void SysTick_Handler(void)
osSystickHandler();
}
-/**
- * @brief Function provides us delay (required by some arduino libraries).
- * Can be called inside an interrupt.
- * @param None
- * @retval None
- */
-void delayInsideIT(uint32_t delay_us)
-{
- uint32_t nb_loop;
-#if defined (STM32F0xx) || defined (STM32L0xx)
- nb_loop = (((HAL_RCC_GetHCLKFreq() / 1000000)/5)*delay_us)+1; /* uS (divide by 4 because each loop take about 4 cycles including nop +1 is here to avoid delay of 0 */
- __asm__ volatile(
- "1: " "\n\t"
- " nop " "\n\t"
- " sub %0, %0, #1 " "\n\t"
- " bne 1b " "\n\t"
- : "=r" (nb_loop)
- : "0"(nb_loop)
- : "r3"
- );
-#else
- nb_loop = (((HAL_RCC_GetHCLKFreq() / 1000000)/4)*delay_us)+1; /* uS (divide by 4 because each loop take about 4 cycles including nop +1 is here to avoid delay of 0 */
- __asm__ volatile(
- "1: " "\n\t"
- " nop " "\n\t"
- " subs.w %0, %0, #1 " "\n\t"
- " bne 1b " "\n\t"
- : "=r" (nb_loop)
- : "0"(nb_loop)
- : "r3"
- );
-#endif
-}
-
/**
* @brief Enable the specified clock if not already set
* @param source: clock source: LSE_CLOCK, LSI_CLOCK, HSI_CLOCK or HSE_CLOCK
diff --git a/cores/arduino/stm32/clock.h b/cores/arduino/stm32/clock.h
index 635f7abc25..57a327eb14 100644
--- a/cores/arduino/stm32/clock.h
+++ b/cores/arduino/stm32/clock.h
@@ -60,7 +60,6 @@ typedef enum {
/* Exported functions ------------------------------------------------------- */
uint32_t GetCurrentMilli(void);
uint32_t GetCurrentMicro(void);
-void delayInsideIT(uint32_t delay_us);
void enableClock(sourceClock_t source);
#ifdef __cplusplus
diff --git a/cores/arduino/stm32/hal_uart_emul.c b/cores/arduino/stm32/hal_uart_emul.c
deleted file mode 100644
index 0da6b2cc11..0000000000
--- a/cores/arduino/stm32/hal_uart_emul.c
+++ /dev/null
@@ -1,1237 +0,0 @@
-/**
- ******************************************************************************
- * @file hal_uart_emul.c
- * @author WI6LABS
- * @version V1.0.0
- * @date 01-August-2016
- * @brief Adaptation from stm32f4xx_hal_uart_emul.c
- * UART Emulation HAL module driver.
- * This file provides firmware functions to manage the following
- * functionalities of the Universal Asynchronous Receiver Transmitter (UART Emulation):
- * + Initialization and de-initialization functions
- * + IO operation functions
- * + Peripheral State and Errors functions
- *
- @verbatim
- ==============================================================================
- ##### How to use this driver #####
- ==============================================================================
- [..]
- The UART Emulation HAL driver can be used as follows:
-
- (#) Declare a UART_Emul_HandleTypeDef handle structure.
-
- (#) Initialize the UART Emulation low level resources by implementing the HAL_UART_Emul_MspInit() API:
- (##) Enable the UART_EMUL clock
- (##) UART Emulation port declaration
- (+++) UART pins configuration: TxPinNumber and RxPinNumber
- (+++) Enable the clock for the GPIOs
-
- (#) Program the Baud Rate, Word Length, Stop Bit, Parity,
- and Mode(Receiver/Transmitter) in the huart Emul Init structure.
-
- (#) Initialize the UART Emulation registers software by calling the HAL_UART_Emul_Init() API.
-
- -@- The specific UART Emulaion Handle (Transmission complete, Reception complete
- and Transfer Error) will be managed using the macros HAL_UART_Emul_TxCpltCallback(),
- HAL_UART_Emul_RxCpltCallback() and __HAL_UART_Emul_TranferError() inside the transmit
- and receive process.
-
- -@- These API's(HAL_UART_Emul_Init() configures also the low level Hardware GPIO, CLOCK, CORTEX...etc)
- by calling the customed HAL_UART_Emul_MspInit() API.
-
- (#) Three modes of operations are available within this driver:
-
- *** UART Emulation mode IO operation ***
- ===================================
- [..]
- (+) Send an amount of data in non blocking mode (IT) using HAL_UART_Emul_Transmit()
- (+) At transmission end of transfer HAL_UART_Emul_TxCpltCallback is executed and user can
- add his own code by customization of function pointer HAL_UART_Emul_TxCpltCallback
- (+) Receive an amount of data in non blocking mode (IT) using HAL_UART_Emul_Receive()
-
- (+) At reception end of transfer HAL_UART_Emul_RxCpltCallback is executed and user can
- add his own code by customization of function pointer HAL_UART_Emul_RxCpltCallback
- (+) In case of transfer Error, HAL_UART_ErrorCallback() function is executed and user can
- add his own code by customization of function pointer HAL_UART_Emul_ErrorCallback
-
- *** UART Emulation HAL driver macros list ***
- =============================================
- [..]
- Below the list of most used macros in UART Emulation HAL driver.
-
- (+) __HAL_UART_EMUL_GET_FLAG : Checks whether the specified UART Emulation flag is set or not
- (+) __HAL_UART_EMUL_CLEAR_FLAG : Clears the specified UART Emulation pending flag
- (+) __HAL_UART_EMUL_SET_FLAG : Set the specified UART Emulation flag
-
- [..]
- (@) You can refer to the UART Emulation HAL driver header file for more useful macros
-
- @endverbatim
- ******************************************************************************
- * @attention
- *
- * © COPYRIGHT(c) 2015 STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
- */
-#if defined(TIM1_BASE) && defined(UART_EMUL_RX) && defined(UART_EMUL_TX)
-/* Includes ------------------------------------------------------------------*/
-#include "hal_uart_emul.h"
-
-/** @addtogroup STM32F4xx_HAL_Driver
- * @{
- */
-
-/** @defgroup UART_EMUL_HAL_Driver
- * @brief HAL UART Emulation module driver
- * @{
- */
-//#ifdef HAL_UART_EMUL_MODULE_ENABLED
-
-/* Private typedef -----------------------------------------------------------*/
-/* Private define ------------------------------------------------------------*/
-/* Private macro -------------------------------------------------------------*/
-/* Private variables ---------------------------------------------------------*/
-/* DMA Handle declaration */
-static DMA_HandleTypeDef hdma_tx;
-static DMA_HandleTypeDef hdma_rx;
-/* Timer handler declaration */
-static TIM_HandleTypeDef TimHandle;
-
-/* UART Emulation Handle */
-static UART_Emul_HandleTypeDef *huart_emul;
-
-/* First Buffer for format data in reception mode */
-static uint32_t *pFirstBuffer_Rx[RX_BUFFER_SIZE];
-
-/* Second Buffer for format data in reception mode */
-static uint32_t *pSecondBuffer_Rx[RX_BUFFER_SIZE];
-
-/* First Buffer for format data in transmission mode */
-static uint32_t *pFirstBuffer_Tx[TX_BUFFER_SIZE];
-
-/* Second Buffer for format data in transmission mode */
-static uint32_t *pSecondBuffer_Tx[TX_BUFFER_SIZE];
-
-/* Private function prototypes -----------------------------------------------*/
-static void UART_Emul_SetConfig (UART_Emul_HandleTypeDef *huart);
-static void UART_Emul_SetConfig_DMATx(void);
-static void UART_Emul_SetConfig_DMARx(void);
-static void UART_Emul_DMATransmitCplt(DMA_HandleTypeDef *hdma);
-static void UART_Emul_DMAReceiveCplt(DMA_HandleTypeDef *hdma);
-static void UART_Emul_DMAError(DMA_HandleTypeDef *hdma);
-static void UART_Emul_TransmitFrame(UART_Emul_HandleTypeDef *huart);
-static void UART_Emul_ReceiveFrame(UART_Emul_HandleTypeDef *huart, uint32_t *pData);
-static void UART_Emul_TransmitFormatFrame(UART_Emul_HandleTypeDef *huart , uint8_t pData, uint32_t *pBuffer_Tx);
-static uint8_t UART_Emul_ReceiveFormatFrame(UART_Emul_HandleTypeDef *huart, uint32_t *pBuffer, uint8_t pFrame);
-
-
-/* Private functions ---------------------------------------------------------*/
-
-/** @defgroup UART_Private_Functions
- * @{
- */
-
-/** @defgroup UART_Emulation_Group1 Initialization and de-initialization functions
- * @brief Initialization and Configuration functions
- *
-@verbatim
- ===============================================================================
- ##### Initialization and Configuration functions #####
- ===============================================================================
- This subsection provides a set of functions allowing to initialize the UART Emulation
- in asynchronous mode.
- (+) For the asynchronous mode only these parameters can be configured:
- (++) Baud Rate (4800 up 115200)
- (++) Word Length (5 bit up 9 bit)
- (++) Stop Bit (1 or 2 stop bit)
- (++) Parity: If the parity is enabled, then the MSB bit of the data to be transmitted
- is changed by the parity bit.
-
-@endverbatim
- * @{
- */
-
-/**
- * @brief Initializes the UART Emulation mode according to the specified parameters in
- * the UART_Emul_InitTypeDef and create the associated handle.
- * @param huart: UART Emulation handle
- * @retval HAL status
- */
-HAL_StatusTypeDef HAL_UART_Emul_Init(UART_Emul_HandleTypeDef *huart)
-{
- /* Check the UART handle allocation */
- if (huart == NULL)
- {
- return HAL_ERROR;
- }
-
- if (huart->State == HAL_UART_EMUL_STATE_RESET)
- {
- /* Init the low level hardware : GPIO, CLOCK */
- HAL_UART_Emul_MspInit(huart);
- }
-
- /* Get Structure for uart emul Handle */
- huart_emul = huart;
-
- /* Set the TIM state */
- huart->State = HAL_UART_EMUL_STATE_BUSY;
-
- /* Set the UART Emulation Communication parameters */
- UART_Emul_SetConfig(huart);
-
- /* Initialize the UART Emulation state */
- huart->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
- huart->State = HAL_UART_EMUL_STATE_READY;
-
- return HAL_OK;
-}
-
-/**
- * @brief DeInitializes the UART Emulation .
- * @param huart: UART Emulation handle
- * @retval HAL status
- */
-HAL_StatusTypeDef HAL_UART_Emul_DeInit(UART_Emul_HandleTypeDef *huart)
-{
- /* Check the UART Emulation handle allocation */
- if (huart == NULL)
- {
- return HAL_ERROR;
- }
-
- huart->State = HAL_UART_EMUL_STATE_BUSY;
-
- /* DeInit the low level hardware */
- HAL_UART_Emul_MspDeInit(huart);
-
- huart->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
- huart->State = HAL_UART_EMUL_STATE_RESET;
-
- return HAL_OK;
-}
-
-/**
- * @brief Initializes the UART Emulation MSP.
- * @param huart: UART Emulation Handle
- * @retval None
- */
-__weak void HAL_UART_Emul_MspInit(UART_Emul_HandleTypeDef *huart)
-{
- /* NOTE : This function Should not be modified, when the callback is needed,
- the HAL_UART_Emul_MspInit could be implemented in the user file
- */
-}
-
-/**
- * @brief UART Emulation MSP DeInit.
- * @param huart: UART Emulation handle
- * @retval None
- */
-__weak void HAL_UART_Emul_MspDeInit(UART_Emul_HandleTypeDef *huart)
-{
- /* NOTE: This function Should not be modified, when the callback is needed,
- the HAL_UART_Emul_MspDeInit could be implemented in the user file
- */
-}
-
-/**
- * @}
- */
-
-/** @defgroup UART_Emulation_Group2 IO operation functions
- * @brief UART Emulation Transmit and Receive functions
- *
-@verbatim
- ==============================================================================
- ##### IO operation functions #####
- ==============================================================================
- This subsection provides a set of functions allowing to manage the UART asynchronous
- and Half duplex data transfers.
-
- (#) There is one mode of transfer:
- (++) Non-Blocking mode: The communication is performed using DMA,
- this APIs returns the HAL status.
- The end of the data processing will be indicated through the
- DMA IRQ
-
- The HAL_UART_Emul_TxCpltCallback(), HAL_UART_Emul_RxCpltCallback() user callbacks
- will be executed respectivelly at the end of the transmit or receive process.
- The HAL_UART_Emul_ErrorCallback() user callback will be executed when
- a communication error is detected.
-
- (#) Non Blocking mode functions with DMA are:
- (++) HAL_UART_Emul_Transmit_DMA()
- (++) HAL_UART_Emul_Receive_DMA()
-
- (#) A set of Transfer Complete Callbacks are provided in Non Blocking mode:
- (++) HAL_UART_Emul_TxCpltCallback()
- (++) HAL_UART_Emul_RxCpltCallback()
- (++) HAL_UART_Emul_ErrorCallback()
-
- [..]
-
-@endverbatim
- * @{
- */
-/**
- * @brief Sends an amount of data
- * @param huart: UART Emulation handle
- * @param pData: Pointer to data buffer
- * @param Size: Amount of data to be sent
- * @retval HAL status
-*/
-HAL_StatusTypeDef HAL_UART_Emul_Transmit_DMA(UART_Emul_HandleTypeDef *huart, uint8_t *pData, uint16_t Size)
-{
- uint32_t tmp = 0;
-
- tmp = huart->State;
- if ((tmp == HAL_UART_EMUL_STATE_READY) || (tmp == HAL_UART_EMUL_STATE_BUSY_RX))
- {
- if ((pData == NULL ) || (Size == 0))
- {
- return HAL_ERROR;
- }
-
- huart->TxXferSize = Size;
- huart->pTxBuffPtr = pData;
- huart->TxXferCount = 1;
- huart->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
-
- /* Check if a receive process is ongoing or not */
- if (huart->State == HAL_UART_EMUL_STATE_BUSY_RX)
- {
- huart->State = HAL_UART_EMUL_STATE_BUSY_TX_RX;
- }
- else
- {
- huart->State = HAL_UART_EMUL_STATE_BUSY_TX;
- }
-
- /* Set the UART Emulation DMA transfer complete callback */
- TimHandle.hdma[TIM_DMA_Handle_Tx]->XferCpltCallback = UART_Emul_DMATransmitCplt;
-
- /* Set the DMA error callback */
- TimHandle.hdma[TIM_DMA_Handle_Tx]->XferErrorCallback = UART_Emul_DMAError;
-
- /* Format first Frame to be sent */
- if (huart->TxXferCount == FIRST_BYTE)
- {
- /* Format Frame to be sent */
- UART_Emul_TransmitFormatFrame(huart, *(pData), (uint32_t*)pFirstBuffer_Tx);
-
- /* Enable the Capture compare channel */
- TIM_CCxChannelCmd(UART_EMUL_TX_TIMER_INSTANCE, TIM_Channel_Tx, TIM_CCx_ENABLE);
-
- /* Send Frames */
- UART_Emul_TransmitFrame(huart);
- }
-
- if ((huart->TxXferCount == FIRST_BYTE) && (huart->TxXferCount < Size))
- {
- /* Format Second Frame to be sent */
- UART_Emul_TransmitFormatFrame(huart, *(pData + huart->TxXferCount), (uint32_t*)pSecondBuffer_Tx);
- }
-
- return HAL_OK;
- }
- else
- {
- return HAL_BUSY;
- }
-}
-
-/**
- * @brief Receives an amount of data in non blocking mode.
- * @param huart: UART Emulation handle
- * @param pData: Data to be received
- * @param Size: Amount of data to be received
- * @retval HAL status
-*/
-HAL_StatusTypeDef HAL_UART_Emul_Receive_DMA(UART_Emul_HandleTypeDef *huart, uint8_t *pData, uint16_t Size)
-{
- uint32_t tmp = 0;
-
- tmp = huart->State;
- if ((tmp == HAL_UART_EMUL_STATE_READY) || (tmp == HAL_UART_EMUL_STATE_BUSY_TX))
- {
- if ((pData == NULL ) || (Size == 0))
- {
- return HAL_ERROR;
- }
-
- huart->pRxBuffPtr = pData;
- huart->RxXferSize = Size;
- huart->RxXferCount = 1;
-
- huart->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
-
- /* Check if a transmit process is ongoing or not */
- if (huart->State == HAL_UART_EMUL_STATE_BUSY_TX)
- {
- huart->State = HAL_UART_EMUL_STATE_BUSY_TX_RX;
- }
- else
- {
- huart->State = HAL_UART_EMUL_STATE_BUSY_RX;
- }
-
- /* Set the UART Emulation DMA transfer complete callback */
- TimHandle.hdma[TIM_DMA_Handle_Rx]->XferCpltCallback = UART_Emul_DMAReceiveCplt;
-
- /* Set the DMA error callback */
- TimHandle.hdma[TIM_DMA_Handle_Rx]->XferErrorCallback = UART_Emul_DMAError;
-
- /* Enable the Capture compare channel */
- TIM_CCxChannelCmd(UART_EMUL_RX_TIMER_INSTANCE, TIM_Channel_Rx, TIM_CCx_ENABLE);
-
- return HAL_OK;
- }
- else
- {
- return HAL_BUSY;
- }
-}
-
-/**
- * @brief Initializes the UART Emulation Transfer Complete.
- * @param huart: UART Emulation Handle
- * @retval None
- */
-__weak void HAL_UART_Emul_RxCpltCallback(UART_Emul_HandleTypeDef *huart)
-{
- /* NOTE : This function Should not be modified, when the callback is needed,
- the HAL_UART_Emul_TransferComplet could be implemented in the user file
- */
-}
-
-/**
- * @}
- */
-/*===============================================================================
- ##### Interrupt Handlers used in UART Emulation #####
- ===============================================================================
-*/
-
-/**
-* @brief This function handles DMA interrupt request for TC.
-* @param None
-* @retval None
-*/
-void UART_EMUL_RX_DMA_IRQHandler(void)
-{
- /* Increment Counter of Frame */
- huart_emul->RxXferCount ++;
-
- /* Enable External interrupt for next Frame */
- EXTI->IMR |= huart_emul->Init.RxPinNumber;
-
- if (__HAL_DMA_GET_FLAG(TimHandle.hdma[TIM_DMA_Handle_Rx], __HAL_DMA_GET_TE_FLAG_INDEX(TimHandle.hdma[TIM_DMA_Handle_Rx])) != RESET)
- {
- UART_Emul_DMAError(&hdma_rx);
- }
-
- /* Clear the transfer complete flag */
- __HAL_DMA_CLEAR_FLAG(TimHandle.hdma[TIM_DMA_Handle_Rx], __HAL_DMA_GET_TC_FLAG_INDEX(TimHandle.hdma[TIM_DMA_Handle_Rx]));
-
- /* Transfer complete callback */
- TimHandle.hdma[TIM_DMA_Handle_Rx]->XferCpltCallback(TimHandle.hdma[TIM_DMA_Handle_Rx]);
-}
-
-/**
- * @brief EXTI line detection callbacks
- * @param GPIO_Pin: Specifies the pins connected EXTI line
- * @retval None
- */
-void UART_EMUL_EXTI_RX(void/*uint16_t GPIO_Pin*/)
-{
- uint32_t tmpreceive = 0;
- uint32_t tmpformat = 0;
- uint32_t tmpdata = 0;
-
- /* Disable EXTI line Rx */
- EXTI->IMR &= ~huart_emul->Init.RxPinNumber;
-
- if ((huart_emul->RxXferCount % 2) != 0)
- {
- tmpreceive = (uint32_t)pFirstBuffer_Rx;
- tmpformat = (uint32_t)pSecondBuffer_Rx;
- }
- else
- {
- tmpreceive = (uint32_t)pSecondBuffer_Rx;
- tmpformat = (uint32_t)pFirstBuffer_Rx;
- }
-
- /* Start receiver mode in the reference point*/
- UART_Emul_ReceiveFrame(huart_emul, (uint32_t*)tmpreceive);
-
- if (huart_emul->RxXferCount > 1)
-{
- /* Format frame */
- *(uint8_t*)((huart_emul->pRxBuffPtr) + (huart_emul->RxXferCount - 2)) = UART_Emul_ReceiveFormatFrame(huart_emul, (uint32_t*)tmpformat, (uint8_t)tmpdata);
- }
-}
-
-/**
-* @brief This function handles DMA interrupt request for TC.
-* @param None
-* @retval None
-*/
-void UART_EMUL_TX_DMA_IRQHandler(void)
-{
- if (__HAL_DMA_GET_FLAG(TimHandle.hdma[TIM_DMA_Handle_Tx], __HAL_DMA_GET_TE_FLAG_INDEX(TimHandle.hdma[TIM_DMA_Handle_Tx])) != RESET)
- {
- UART_Emul_DMAError(&hdma_tx);
- }
-
- /* Clear the transfer complete flag */
- __HAL_DMA_CLEAR_FLAG(TimHandle.hdma[TIM_DMA_Handle_Tx], __HAL_DMA_GET_TC_FLAG_INDEX(TimHandle.hdma[TIM_DMA_Handle_Tx]));
-
- /* Transfer complete callback */
- TimHandle.hdma[TIM_DMA_Handle_Tx]->XferCpltCallback(TimHandle.hdma[TIM_DMA_Handle_Tx]);
-}
-
-/**
- * @brief This function handles UART Emulation request.
- * @param huart: UART Emulation handle
- * @retval None
- */
-void HAL_UART_Emul_IRQHandler(UART_Emul_HandleTypeDef *huart)
-{
- uint32_t tmp = 0;
-
- tmp = __HAL_UART_EMUL_GET_FLAG(huart, UART_EMUL_FLAG_PE);
- /* UART Emulation parity error occurred */
- if (tmp != RESET)
- {
- __HAL_UART_EMUL_CLEAR_FLAG(huart, UART_EMUL_FLAG_PE);
-
- huart->ErrorCode |= HAL_UART_EMUL_ERROR_PE;
- }
-
- tmp = __HAL_UART_EMUL_GET_FLAG(huart, UART_EMUL_FLAG_FE);
- /* UART Emulation frame error occurred */
- if (tmp != RESET)
- {
- __HAL_UART_EMUL_CLEAR_FLAG(huart, UART_EMUL_FLAG_FE);
-
- huart->ErrorCode |= HAL_UART_EMUL_ERROR_FE;
- }
-
- tmp = __HAL_UART_EMUL_GET_FLAG(huart, UART_EMUL_FLAG_TC);
- /* UART Emulation in mode Transmitter */
- if ((tmp != RESET))
- {
- __HAL_UART_EMUL_CLEAR_FLAG(huart, UART_EMUL_FLAG_TC);
- }
-
- tmp = __HAL_UART_EMUL_GET_FLAG(huart, UART_EMUL_FLAG_RC);
- /* UART Emulation in mode Receiver */
- if ((tmp != RESET))
- {
- __HAL_UART_EMUL_CLEAR_FLAG(huart, UART_EMUL_FLAG_RC);
- }
-
- if (huart->ErrorCode != HAL_UART_EMUL_ERROR_NONE)
- {
- /* Set the UART Emulation state ready to be able to start again the process */
- huart->State = HAL_UART_EMUL_STATE_READY;
-
- HAL_UART_Emul_ErrorCallback(huart);
- }
-}
-
-/**
- * @}
- */
-
-/** @defgroup UART_Emulation_Group3 Peripheral State and Errors functions
- * @brief UART Emulation State and Errors functions
- *
-@verbatim
- ==============================================================================
- ##### Peripheral State and Errors functions #####
- ==============================================================================
- [..]
- This subsection provides a set of functions allowing to return the State of
- UART Emulation communication process, return Peripheral Errors occured during communication
- process
- (+) HAL_UART_Emul_GetState() API can be helpful to check in run-time the state of the UART Emulation.
- (+) HAL_UART_Emul_GetError() check in run-time errors that could be occured durung communication.
-
-@endverbatim
- * @{
- */
-
-/**
- * @brief Returns the UART Emulation state.
- * @param huart: UART Emulation handle
- * @retval HAL state
- */
-HAL_UART_Emul_StateTypeDef HAL_UART_Emul_GetState(UART_Emul_HandleTypeDef *huart)
-{
- return huart->State;
-}
-
-/**
-* @brief Return the UART Emulation error code
-* @param huart : pointer to UART_Emul_HandleTypeDef structure that contains
- * the configuration information for the specified UART Emulation.
-* @retval UART Emulation Error Code
-*/
-uint32_t HAL_UART_Emul_GetError(UART_Emul_HandleTypeDef *huart)
-{
- return huart->ErrorCode;
-}
-
-/**
- * @}
- */
-/*===============================================================================
- ##### Private function for UART Emulation #####
- ===============================================================================
-*/
-
-/**
- * @brief This function is executed in case of Receive Complete for last frame.
- * @param None
- * @retval None
- */
-static void UART_Emul_DMAReceiveCplt(DMA_HandleTypeDef *hdma)
-{
- uint32_t tmpformat = 0;
- uint32_t tmpdata = 0;
- if (huart_emul->RxXferCount > huart_emul->RxXferSize)
- {
- /*Enable EXTI line Rx */
- //EXTI->IMR |= huart_emul->Init.RxPinNumber;
-
- /* Disable the Peripheral */
- __HAL_DMA_DISABLE(&hdma_rx);
-
- /* Disable the TIM Update DMA request */
- __HAL_TIM_DISABLE_DMA(&TimHandle, TIM_DMA_source_Rx);
-
- if ((huart_emul->RxXferCount % 2) == 0)
- {
- tmpformat = (uint32_t)pFirstBuffer_Rx;
- }
-
- else
- {
- tmpformat = (uint32_t)pSecondBuffer_Rx;
- }
-
- /* Formatted Last Frame */
- *(uint8_t*)((huart_emul->pRxBuffPtr) + (huart_emul->RxXferCount - 2)) = UART_Emul_ReceiveFormatFrame(huart_emul, (uint32_t*)tmpformat, (uint8_t)tmpdata);
-
- /* Set RC flag receiver complete */
- __HAL_UART_EMUL_SET_FLAG(huart_emul, UART_EMUL_FLAG_RC);
-
- /* De_Initialize counter frame for Rx */
- huart_emul->RxXferCount = 0;
-
- /* Initialize the UART Emulation state */
- huart_emul->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
-
- /* Check if a transmit process is ongoing or not */
- if (huart_emul->State == HAL_UART_EMUL_STATE_BUSY_TX_RX)
- {
- huart_emul->State = HAL_UART_EMUL_STATE_BUSY_TX;
- }
- else
- {
- huart_emul->State = HAL_UART_EMUL_STATE_READY;
- }
-
- /* Handle for UART Emulation Receive Complete */
- HAL_UART_Emul_RxCpltCallback(huart_emul);
- }
-}
-
-/**
- * @brief Receives an amount of Frames.
- * @param huart: UART Emulation handle
- * @param pData: Frame to be Received
- * @retval None
-*/
-static void UART_Emul_ReceiveFrame(UART_Emul_HandleTypeDef *huart, uint32_t *pData)
-{
- uint32_t tmp_sr =0;
- uint32_t tmp_ds =0;
- uint32_t tmp_size =0;
- uint32_t tmp_arr =0;
-
- tmp_arr = UART_EMUL_RX_TIMER_INSTANCE->ARR;
- tmp_ds = (uint32_t)pData;
- tmp_sr = (uint32_t) & (huart->RxPortName->IDR);
- tmp_size = __HAL_UART_EMUL_FRAME_LENGTH(huart);
-
- /* Enable the transfer complete interrupt */
- __HAL_DMA_ENABLE_IT(&hdma_rx, DMA_IT_TC);
-
- /* Enable the transfer Error interrupt */
- __HAL_DMA_ENABLE_IT(&hdma_rx, DMA_IT_TE);
-
-#if defined (STM32F0xx) || defined (STM32F3xx)
- /* Configure DMA Stream data length */
- hdma_rx.Instance->CNDTR = tmp_size;
-
- /* Configure DMA Stream source address */
- hdma_rx.Instance->CPAR = tmp_sr;
-
- /* Configure DMA Stream destination address */
- hdma_rx.Instance->CMAR = tmp_ds;
-#else
- /* Configure DMA Stream data length */
- hdma_rx.Instance->NDTR = tmp_size;
-
- /* Configure DMA Stream source address */
- hdma_rx.Instance->PAR = tmp_sr;
-
- /* Configure DMA Stream destination address */
- hdma_rx.Instance->M0AR = tmp_ds;
-#endif
- /* Enable the Peripheral */
- __HAL_DMA_ENABLE(&hdma_rx);
-
- if ((huart_emul->RxXferCount == 1)||(huart->State != HAL_UART_EMUL_STATE_BUSY_TX_RX))
- {
- UART_EMUL_RX_TIMER_INSTANCE->CCR2 = ((UART_EMUL_RX_TIMER_INSTANCE->CNT + (tmp_arr / 2)) % tmp_arr);
- }
-
- /* Enable the TIM Update DMA request */
- __HAL_TIM_ENABLE_DMA(&TimHandle, TIM_DMA_source_Rx);
-
- /* Enable Timer */
- __HAL_TIM_ENABLE(&TimHandle);
-}
-
-/**
- * @brief Configures the UART Emulation peripheral
- + Enable clock for all peripherals Timer, GPIO
- + DMA Configuration channel, Stream, Mode,...
- * @param huart: UART Emulation handle
- * @retval None
- */
-static void UART_Emul_SetConfig (UART_Emul_HandleTypeDef *huart)
-{
- uint32_t bit_time = 0;
-
- /* Check the parameters */
- assert_param(IS_UART_EMUL_BAUDRATE(huart->Init.BaudRate));
- assert_param(IS_UART_EMUL_WORD_LENGTH(huart->Init.WordLength));
- assert_param(IS_UART_EMUL_STOPBITS(huart->Init.StopBits));
- assert_param(IS_UART_EMUL_MODE(huart->Init.Mode));
- assert_param(IS_UART_EMUL_MODE(huart->Init.Parity));
-
- /* Init Bit Time */
- if((HAL_RCC_GetSysClockFreq()/HAL_RCC_GetPCLK2Freq()== 1) | (HAL_RCC_GetSysClockFreq()/HAL_RCC_GetPCLK2Freq()== 2))
- {
- bit_time = ((uint32_t) ((HAL_RCC_GetSysClockFreq()/huart->Init.BaudRate) - 1));
- }
- else
- {
- bit_time = ((uint32_t) (((HAL_RCC_GetPCLK2Freq()*2)/huart->Init.BaudRate) - 1));
- }
-
- /*##-1- Configure the Timer peripheral in Bit Delay ##############*/
- /* Initialize TIM peripheral as follow:
- + Period = TimerPeriod
- + Prescaler = 0
- + ClockDivision = 0
- + Counter direction = Up
- */
- TimHandle.Instance = UART_EMUL_TX_TIMER_INSTANCE;
- TimHandle.Init.Period = bit_time;
- TimHandle.Init.Prescaler = 0;
- TimHandle.Init.ClockDivision = 0;
- TimHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
- HAL_TIM_Base_Init(&TimHandle);
-
- if (huart->Init.Mode == UART_EMUL_MODE_TX)
- {
- /* Configure UART Emulation in Transmission mode */
- UART_Emul_SetConfig_DMATx();
- }
- else if (huart->Init.Mode == UART_EMUL_MODE_RX)
- {
- /* Configure UART Emulation in Reception mode */
- UART_Emul_SetConfig_DMARx();
- }
- else
- {
- /* Configure UART Emulation in full-duplex mode */
- UART_Emul_SetConfig_DMATx();
- UART_Emul_SetConfig_DMARx();
- }
-}
-
-/**
- * @brief Configures the DMA for UART Emulation transmission.
- + DMA Configuration channel, Stream, Mode, ...
- * @param None
- * @retval None
- */
-static void UART_Emul_SetConfig_DMATx(void)
-{
- /* Init Idle */
- HAL_GPIO_WritePin((huart_emul->TxPortName), (huart_emul->Init.TxPinNumber), GPIO_PIN_SET);
-
- /*##-1- Configure DMA For UART Emulation TX #############################*/
- /* Set the parameters to be configured */
- hdma_tx.Init.Direction = DMA_MEMORY_TO_PERIPH; /* Transfer mode */
- hdma_tx.Init.PeriphInc = DMA_PINC_DISABLE; /* Peripheral increment mode Disable */
- hdma_tx.Init.MemInc = DMA_MINC_ENABLE; /* Memory increment mode Enable */
- hdma_tx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD ; /* Peripheral data alignment : Word */
- hdma_tx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD ; /* memory data alignment : Word */
- hdma_tx.Init.Mode = DMA_NORMAL; /* Normal DMA mode */
- hdma_tx.Init.Priority = DMA_PRIORITY_HIGH; /* Priority level : High */
-#ifdef STM32F4xx
- hdma_tx.Init.Channel = DMA_Channel_Tx; /* Channel used */
- hdma_tx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; /* FIFO mode disable */
- hdma_tx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL; /* FIFO threshold level */
- hdma_tx.Init.MemBurst = DMA_MBURST_SINGLE; /* Memory Burst transfer */
- hdma_tx.Init.PeriphBurst = DMA_PBURST_SINGLE; /* Periph Burst transfer */
-#endif
-
- /* Set hdma_tim instance */
- hdma_tx.Instance = DMA_Stream_Tx;
- hdma_tx.Parent = TimHandle.hdma[TIM_DMA_Handle_Tx];
- /* Link hdma_tim to hdma[ ] ( channel Tx or Rx) */
- __HAL_LINKDMA(&TimHandle, hdma[TIM_DMA_Handle_Tx] , hdma_tx);
-
- /* Initialize TIMx DMA handle */
- HAL_DMA_Init(TimHandle.hdma[TIM_DMA_Handle_Tx]);
-
- /*##-2- NVIC configuration for DMA transfer complete interrupt ###########*/
- HAL_NVIC_SetPriority(UART_EMUL_TX_DMA_IRQn, 3, 3);
- HAL_NVIC_EnableIRQ(UART_EMUL_TX_DMA_IRQn);
-}
-
-/**
- * @brief Configures the DMA for UART Emulation reception.
- + DMA Configuration channel, Stream, Mode, ...
- * @param None
- * @retval None
- */
-static void UART_Emul_SetConfig_DMARx(void)
-{
- /*##-1- Configure DMA For UART Emulation RX #############################*/
- /* Set the parameters to be configured */
- hdma_rx.Init.Direction = DMA_PERIPH_TO_MEMORY; /* Transfer mode */
- hdma_rx.Init.PeriphInc = DMA_PINC_DISABLE; /* Peripheral increment mode Disable */
- hdma_rx.Init.MemInc = DMA_MINC_ENABLE; /* Memory increment mode Enable */
- hdma_rx.Init.PeriphDataAlignment = DMA_PDATAALIGN_WORD ; /* Peripheral data alignment : Word */
- hdma_rx.Init.MemDataAlignment = DMA_MDATAALIGN_WORD ; /* memory data alignment : Word */
- hdma_rx.Init.Mode = DMA_NORMAL; /* Normal DMA mode */
- hdma_rx.Init.Priority = DMA_PRIORITY_VERY_HIGH; /* Priority level : very High */
-#if defined(STM32F4xx)
- hdma_rx.Init.Channel = DMA_Channel_Rx; /* Channel used */
- hdma_rx.Init.FIFOMode = DMA_FIFOMODE_DISABLE; /* FIFO mode disable */
- hdma_rx.Init.FIFOThreshold = DMA_FIFO_THRESHOLD_FULL; /* FIFO threshold level */
- hdma_rx.Init.MemBurst = DMA_MBURST_SINGLE; /* Memory Burst transfer */
- hdma_rx.Init.PeriphBurst = DMA_PBURST_SINGLE; /* Periph Burst transfer */
-#endif
- /* Set hdma_tim instance */
- hdma_rx.Instance = DMA_Stream_Rx;
-
- /* Link hdma_tim to hdma[ ] ( channel Tx or Rx) */
- __HAL_LINKDMA(&TimHandle, hdma[TIM_DMA_Handle_Rx], hdma_rx);
-
- /* Initialize TIMx DMA handle */
- HAL_DMA_Init(TimHandle.hdma[TIM_DMA_Handle_Rx]);
-
- /*##-2- NVIC configuration for DMA transfer complete interrupt ###########*/
- HAL_NVIC_SetPriority(UART_EMUL_RX_DMA_IRQn, 0, 1);
- HAL_NVIC_EnableIRQ(UART_EMUL_RX_DMA_IRQn);
-}
-
-/**
- * @brief Format Frame in Receiver mode.
- * @param huart: UART Emulation handle
- * @param pBuffer: pointer of receiver Buffer
- * @param pFrame: pointer of Frame
- * @retval None
-*/
-static uint8_t UART_Emul_ReceiveFormatFrame(UART_Emul_HandleTypeDef *huart, uint32_t *pBuf, uint8_t Data)
-{
- uint32_t counter = 0;
- uint32_t length = 0;
- uint32_t tmp = 0;
- uint32_t cntparity = 0;
-
- if (huart->Init.Parity != UART_EMUL_PARITY_NONE)
- {
- /* Get Length of frame */
- length = huart->Init.WordLength -1 ;
- }
- else
- {
- /* Get Length of frame */
- length = huart->Init.WordLength;
- }
-
- if ((pBuf[huart->Init.WordLength+1]&huart->Init.RxPinNumber) != huart->Init.RxPinNumber)
- {
- /* UART Emulation frame error occurred */
- __HAL_UART_EMUL_SET_FLAG(huart_emul, UART_EMUL_FLAG_FE);
-
- huart->ErrorCode |= HAL_UART_EMUL_ERROR_FE;
-
- /* Disable External interrupt for next Frame */
- EXTI->IMR &= ~huart_emul->Init.RxPinNumber;
-
- /* Handle for UART Emulation Error */
- HAL_UART_Emul_ErrorCallback(huart);
-
- tmp = RESET;
- }
- else
- {
- /* format data */
- for (counter = 0; counter < length; counter++)
- {
- if ((pBuf[counter+1]&(huart->Init.RxPinNumber)) == (huart->Init.RxPinNumber))
- {
- Data = (0x01 << counter) | Data;
- cntparity ++;
- }
- }
- /* Parity Bit */
- if (huart->Init.Parity == UART_EMUL_PARITY_ODD)
- {
-
- if (((cntparity % 2) != SET) && ((pBuf[length+1]&huart->Init.RxPinNumber) != huart->Init.RxPinNumber))
- {
- /* Set flag PE */
- __HAL_UART_EMUL_SET_FLAG(huart, UART_EMUL_FLAG_PE);
-
- HAL_UART_Emul_ErrorCallback(huart);
- }
- }
- if (huart->Init.Parity == UART_EMUL_PARITY_EVEN)
- {
-
- if (((cntparity % 2) != RESET) && ((pBuf[length+1]&huart->Init.RxPinNumber) != huart->Init.RxPinNumber))
- {
- /* UART Emulation parity error occurred */
- __HAL_UART_EMUL_SET_FLAG(huart, UART_EMUL_FLAG_PE);
-
- huart->ErrorCode |= HAL_UART_EMUL_ERROR_PE;
-
- HAL_UART_Emul_ErrorCallback(huart);
- }
- }
-
- /* Reset counter parity */
- cntparity = 0;
-
- tmp = Data;
- }
-
- return tmp;
-}
-
-/**
- * @brief This function formats one Frame
- * @param UART Emulation Handle
- * @param pdata pinteur in data
- * @retval None
- */
-static void UART_Emul_TransmitFormatFrame(UART_Emul_HandleTypeDef *huart , uint8_t Data, uint32_t *pBuffer_Tx)
-{
- uint32_t counter = 0;
- uint32_t bitmask = 0;
- uint32_t length = 0;
- uint32_t cntparity = 0;
-
- length = huart->Init.WordLength;
-
- /* Get the Pin Number */
- bitmask = (uint32_t)huart->Init.TxPinNumber;
-
- /* with no parity */
- if(huart->Init.Parity == 0x00)
- {
- for (counter = 0; counter < length; counter++)
- {
- if (((Data >> counter)&BitMask) != 0)
- {
- pBuffer_Tx[counter+1] = bitmask;
- }
- else
- {
- pBuffer_Tx[counter+1] = (bitmask << 16);
- }
- }
- }
- /* with parity */
- else
- {
- for (counter = 0; counter < length-1; counter++)
- {
- if (((Data >> counter)&BitMask) != 0)
- {
- pBuffer_Tx[counter+1] = bitmask;
- cntparity ++;
- }
- else
- {
- pBuffer_Tx[counter+1] = (bitmask << 16);
- }
- }
- }
-
- switch (huart->Init.Parity)
- {
- case UART_EMUL_PARITY_ODD:
- {
- /* Initialize Parity Bit */
- if ((cntparity % 2) != SET)
- {
- pBuffer_Tx[length] = bitmask;
- }
- else
- {
- pBuffer_Tx[length] = (bitmask << 16);
- }
-
- }
- break;
- case UART_EMUL_PARITY_EVEN:
- {
- /* Initialize Parity Bit */
- if ((cntparity % 2) != SET)
- {
- pBuffer_Tx[length] = (bitmask << 16);
- }
- else
- {
- pBuffer_Tx[length] = bitmask;
- }
- }
- break;
- default:
- break;
- }
- /* Initialize Bit Start */
- pBuffer_Tx[0] = (bitmask << 16);
-
- if (huart->Init.StopBits == UART_EMUL_STOPBITS_1)
- {
- /* Initialize Bit Stop */
- pBuffer_Tx[length+1] = bitmask;
- }
- else
- {
- /* Initialize Bit Stop */
- pBuffer_Tx[length+1] = bitmask;
- pBuffer_Tx[length+2] = bitmask;
- }
- /* Reset counter parity */
- cntparity = 0;
-}
-
-/**
- * @brief Sends an amount of Frames
- * @param huart: UART Emulation handle
- * @param pData: Frame to be sent
- * @retval None
- */
-static void UART_Emul_TransmitFrame(UART_Emul_HandleTypeDef *huart)
-{
- uint32_t tmp_sr = 0;
- uint32_t tmp_ds = 0;
- uint32_t tmp_size = 0;
-
-
- if ((huart_emul->TxXferCount % 2 ) != 0)
- {
- tmp_sr = (uint32_t)pFirstBuffer_Tx;
- }
- else
- {
- tmp_sr = (uint32_t)pSecondBuffer_Tx;
- }
-
- tmp_ds = (uint32_t) & ((huart->TxPortName)->BSRR);
-
- tmp_size = __HAL_UART_EMUL_FRAME_LENGTH(huart);
-
-#if defined (STM32F0xx) || defined (STM32F3xx)
- /* Configure DMA Stream data length */
- hdma_rx.Instance->CNDTR = tmp_size;
-
- /* Configure DMA Stream source address */
- hdma_rx.Instance->CPAR = tmp_sr;
-
- /* Configure DMA Stream destination address */
- hdma_rx.Instance->CMAR = tmp_ds;
-#else
- /* Configure DMA Stream data length */
- hdma_tx.Instance->NDTR = tmp_size;
-
- /* Configure DMA Stream destination address */
- hdma_tx.Instance->PAR = tmp_ds;
-
- /* Configure DMA Stream source address */
- hdma_tx.Instance->M0AR = tmp_sr;
-#endif
-
- /* Enable the transfer complete interrupt */
- __HAL_DMA_ENABLE_IT(&hdma_tx, DMA_IT_TC);
-
- /* Enable the transfer Error interrupt */
- __HAL_DMA_ENABLE_IT(&hdma_tx, DMA_IT_TE);
-
- /* Enable the Peripheral */
- __HAL_DMA_ENABLE(&hdma_tx);
-
- /* Enable the TIM Update DMA request */
- __HAL_TIM_ENABLE_DMA(&TimHandle, TIM_DMA_source_Tx);
-
- /* Enable the Peripheral */
- __HAL_TIM_ENABLE(&TimHandle);
-}
-
-/**
- * @brief This function is executed in case of Transfer Complete of a Frame.
- * @param None
- * @retval None
- */
-static void UART_Emul_DMATransmitCplt(DMA_HandleTypeDef *hdma)
-{
- uint32_t tmpbuffer = 0;
-
- /* Incremente Counter of frame */
- huart_emul->TxXferCount++;
-
- if (huart_emul->TxXferCount <= huart_emul->TxXferSize)
- {
- /* Call UART Emulation Transmit frame for next Frame */
- UART_Emul_TransmitFrame(huart_emul);
-
- if ((huart_emul->TxXferCount % 2 ) != 0)
- {
- tmpbuffer = (uint32_t)pSecondBuffer_Tx;
- }
- else
- {
- tmpbuffer = (uint32_t)pFirstBuffer_Tx;
- }
- /* Format second Data to be sent */
- UART_Emul_TransmitFormatFrame(huart_emul, *(huart_emul->pTxBuffPtr + huart_emul->TxXferCount), (uint32_t*)tmpbuffer);
- }
- else
- {
- /* Disable the transfer complete interrupt */
- __HAL_DMA_DISABLE_IT(TimHandle.hdma[TIM_DMA_Handle_Tx], DMA_IT_TC);
-
- /* Set TC flag in the status register software */
- __HAL_UART_EMUL_SET_FLAG(huart_emul, UART_EMUL_FLAG_TC);
-
- /* Disable the Peripheral */
- __HAL_DMA_DISABLE(&hdma_tx);
-
- /* Disable the TIM Update DMA request */
- __HAL_TIM_DISABLE_DMA(&TimHandle, TIM_DMA_source_Tx);
-
- /* De_Initialize counter frame for Tx */
- huart_emul->TxXferCount = 0;
-
- /* Initialize the UART Emulation state */
- huart_emul->ErrorCode = HAL_UART_EMUL_ERROR_NONE;
-
- /* Check if a receive process is ongoing or not */
- if (huart_emul->State == HAL_UART_EMUL_STATE_BUSY_TX_RX)
- {
- huart_emul->State = HAL_UART_EMUL_STATE_BUSY_RX;
- }
- else
- {
- huart_emul->State = HAL_UART_EMUL_STATE_READY;
- }
- /* Handle for UART Emulation Transfer Complete */
- HAL_UART_Emul_TxCpltCallback(huart_emul);
- }
-}
-
-/**
- * @brief This function is executed in case of error of Transfer occurrence.
- * @param hdma : DMA Handle
- * @retval None
- */
-static void UART_Emul_DMAError(DMA_HandleTypeDef *hdma)
-{
- /* UART Emulation frame error occurred */
- __HAL_UART_EMUL_SET_FLAG(huart_emul, UART_EMUL_FLAG_FE);
-
- huart_emul->ErrorCode |= HAL_UART_EMUL_ERROR_FE;
-
- HAL_UART_Emul_ErrorCallback(huart_emul);
-}
-
-/**
- * @brief Initializes the UART Emulation Transfer Complete.
- * @param huart: UART Emulation Handle
- * @retval None
- */
-__weak void HAL_UART_Emul_TxCpltCallback(UART_Emul_HandleTypeDef *huart)
-{
- /* NOTE : This function Should not be modified, when the callback is needed,
- the HAL_UART_Emul_TransferComplete could be implemented in the user file
- */
-}
-
-/**
- * @brief UART Emulation error callbacks.
- * @param huart: UART Emulation handle
- * @retval None
- */
-__weak void HAL_UART_Emul_ErrorCallback(UART_Emul_HandleTypeDef *huart)
-{
- /* NOTE: This function Should not be modified, when the callback is needed,
- the HAL_UART_ErrorCallback could be implemented in the user file
- */
-}
-
-/**
- * @}
- */
-
-//#endif /* HAL_UART_EMUL_MODULE_ENABLED */
-/**
- * @}
- */
-
-/**
- * @}
- */
-#endif //TIM1_BASE && UART_EMUL_RX && UART_EMUL_TX
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/cores/arduino/stm32/hal_uart_emul.h b/cores/arduino/stm32/hal_uart_emul.h
deleted file mode 100644
index 8de76b5b56..0000000000
--- a/cores/arduino/stm32/hal_uart_emul.h
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
- ******************************************************************************
- * @file hal_uart_emul.h
- * @author WI6LABS
- * @version V1.0.0
- * @date 01-August-2016
- * @brief Adaptation from stm32f4xx_hal_uart_emul.h
- * Header file of UART Emulation HAL module.
- ******************************************************************************
- * @attention
- *
- * © COPYRIGHT(c) 2015 STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __HAL_UART_EMUL_H
-#define __HAL_UART_EMUL_H
-
-#if defined(TIM1_BASE) && defined(UART_EMUL_RX) && defined(UART_EMUL_TX)
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_def.h"
-
-/** @addtogroup STM32F4xx_HAL_Driver
- * @{
- */
-
-/** @addtogroup UART_EMUL_HAL_Driver
- * @{
- */
-
-/* Exported types ------------------------------------------------------------*/
-
-/**
- * @brief UART Emulation Init Structure definition
- */
-typedef struct
-{
- uint8_t Mode; /*!< Specifies wether the Receive or Transmit mode is enabled or disabled.
- This parameter can be a value of @ref UART_Emul_Mode */
-
- uint32_t BaudRate; /*!< This member configures the UART communication baud rate.*/
-
-
- uint8_t WordLength; /*!< Specifies the number of data bits transmitted or received in a frame.
- This parameter can be a value of @ref UART_Emul_Word_Length */
-
- uint8_t StopBits; /*!< Specifies the number of stop bits transmitted.
- This parameter can be a value of @ref UART_Emul_Stop_Bits */
-
-
- uint8_t Parity; /*!< Specifies the parity mode.
- This parameter can be a value of @ref UART_Emul_Parity
- @note When parity is enabled, the computed parity is inserted
- at the MSB position of the transmitted data*/
-
- uint16_t RxPinNumber; /*!< Specifies the number of Receiver Pin.
- This parameter can be a value of @ref GPIO_pins_define */
-
- uint16_t TxPinNumber; /*!< Specifies the number of Transmitter Pin.
- his parameter can be a value of @ref GPIO_pins_define */
-}UART_Emul_InitTypeDef;
-
-/**
- * @brief HAL UART Emulation State structures definition
- */
-typedef enum
-{
- HAL_UART_EMUL_STATE_RESET = 0x00, /*!< Peripheral is not yet Initialized */
- HAL_UART_EMUL_STATE_READY = 0x01, /*!< Peripheral Initialized and ready for use */
- HAL_UART_EMUL_STATE_BUSY = 0x02, /*!< An internal process is ongoing */
- HAL_UART_EMUL_STATE_BUSY_TX = 0x04, /*!< Data Transmission process is ongoing */
- HAL_UART_EMUL_STATE_BUSY_RX = 0x08, /*!< Data Reception process is ongoing */
- HAL_UART_EMUL_STATE_BUSY_TX_RX = 0x10, /*!< Data Transmission and Reception process is ongoing */
- HAL_UART_EMUL_STATE_ERROR = 0x20 /*!< Error */
-
-}HAL_UART_Emul_StateTypeDef;
-
-/**
- * @brief HAL UART Emulation Error Code structure definition
- */
-typedef enum
-{
- HAL_UART_EMUL_ERROR_NONE = 0x00, /*!< No error */
- HAL_UART_EMUL_ERROR_FE = 0x01, /*!< frame error */
- HAL_UART_EMUL_ERROR_RE = 0x02, /*!< receiver error */
- HAL_UART_EMUL_ERROR_PE = 0x04 /*!< transfer error */
-}HAL_UART_Emul_ErrorTypeDef;
-
-/**
- * @brief Universal Asynchronous Receiver Transmitter
- */
-
-typedef struct
-{
- __IO uint8_t SR; /*!< UART Emulation Status register software */
-
-} UART_Emul_TypeDef;
-
-/**
- * @brief UART Emulation handle Structure definition
- */
-typedef struct
-{
- UART_Emul_TypeDef Instance; /* Instance for UART Emulation register */
-
- UART_Emul_InitTypeDef Init; /* UART Emulation communication parameters */
-
- uint8_t *pTxBuffPtr; /* Pointer to UART Emulation Tx transfer Buffer */
-
- uint16_t TxXferSize; /* UART Emulation Tx Transfer size */
-
- uint16_t TxXferCount; /* UART Emulation Tx Transfer Counter */
-
- uint8_t *pRxBuffPtr; /* Pointer to UART Emulation Rx transfer Buffer */
-
- uint16_t RxXferSize; /* UART Emulation Rx Transfer size */
-
- uint16_t RxXferCount; /* UART Emulation Rx Transfer Counter */
-
- GPIO_TypeDef *RxPortName; /* UART Emulation Rx port name */
-
- GPIO_TypeDef *TxPortName; /* UART Emulation Tx port name */
-
- __IO HAL_UART_Emul_StateTypeDef State; /* UART Emulation communication state */
-
- __IO HAL_UART_Emul_ErrorTypeDef ErrorCode; /* UART Emulation Error code */
-
-}UART_Emul_HandleTypeDef;
-
-
-
-/* Exported constants --------------------------------------------------------*/
-/** @defgroup UART_Emulation_Exported_Constants
- * @{
- */
-
-/** @defgroup UART_Emul_Word_Length
- * @{
- */
-
-#define UART_EMUL_WORDLENGTH_5B ((uint8_t)0x05)
-#define UART_EMUL_WORDLENGTH_6B ((uint8_t)0x06)
-#define UART_EMUL_WORDLENGTH_7B ((uint8_t)0x07)
-#define UART_EMUL_WORDLENGTH_8B ((uint8_t)0x08)
-#define UART_EMUL_WORDLENGTH_9B ((uint8_t)0x09)
-#define IS_UART_EMUL_WORD_LENGTH(LENGTH) (((LENGTH) == UART_EMUL_WORDLENGTH_5B)||\
- ((LENGTH) == UART_EMUL_WORDLENGTH_6B)||\
- ((LENGTH) == UART_EMUL_WORDLENGTH_7B)||\
- ((LENGTH) == UART_EMUL_WORDLENGTH_8B)||\
- ((LENGTH) == UART_EMUL_WORDLENGTH_9B))
-/**
- * @}
- */
-
-/** @defgroup UART_Emul_Stop_Bits
- * @{
- */
-#define UART_EMUL_STOPBITS_1 ((uint8_t)0x01)
-#define UART_EMUL_STOPBITS_2 ((uint8_t)0x02)
-#define IS_UART_EMUL_STOPBITS(STOPBITS) (((STOPBITS) == UART_EMUL_STOPBITS_1)||\
- ((STOPBITS) == UART_EMUL_STOPBITS_2))
-
-/**
- * @}
- */
-
-/** @defgroup UART_Emul_Parity
- * @{
- */
-#define UART_EMUL_PARITY_NONE ((uint8_t)0x00)
-#define UART_EMUL_PARITY_EVEN ((uint8_t)0x01)
-#define UART_EMUL_PARITY_ODD ((uint8_t)0x02)
-#define IS_UART_EMUL_PARITY(PARITY) (((PARITY) == UART_EMUL_PARITY_NONE) || \
- ((PARITY) == UART_EMUL_PARITY_EVEN) || \
- ((PARITY) == UART_EMUL_PARITY_ODD))
-/**
- * @}
- */
-
-/** @defgroup UART_Emul_Mode
- * @{
- */
-#define UART_EMUL_MODE_RX ((uint8_t)0x01)
-#define UART_EMUL_MODE_TX ((uint8_t)0x02)
-#define UART_EMUL_MODE_TX_RX ((uint8_t)0x03)
-#define IS_UART_EMUL_MODE(MODE) (((MODE) == UART_EMUL_MODE_RX) || \
- ((MODE) == UART_EMUL_MODE_TX ) || \
- ((MODE) == UART_EMUL_MODE_TX_RX ))
-/**
- * @}
- */
-
-/** @defgroup UART_Emul_Flags
- * Elements values convention: 0xXX
- * - 0xXX : Flag mask in the SR register software
- * @{
- */
-#define UART_EMUL_FLAG_RC ((uint8_t)0x01)
-#define UART_EMUL_FLAG_TC ((uint8_t)0x02)
-#define UART_EMUL_FLAG_FE ((uint8_t)0x04)
-#define UART_EMUL_FLAG_PE ((uint8_t)0x08)
-
-/**
- * @}
- */
-
-/* Exported constants --------------------------------------------------------*/
-
-/** @defgroup Baudrate_Constants
- * @{
- */
-
-/**
- *
- */
-#define BAUDRATE_4800 ((uint32_t)0x12C0) /* Baudrate Selection 4800 */
-#define BAUDRATE_9600 ((uint32_t)0x2580) /* Baudrate Selection 9600 */
-#define BAUDRATE_14400 ((uint32_t)0x3840) /* Baudrate Selection 14400 */
-#define BAUDRATE_19200 ((uint32_t)0x4b00) /* Baudrate Selection 19200 */
-#define BAUDRATE_38400 ((uint32_t)0x9600) /* Baudrate Selection 38400 */
-#define BAUDRATE_57600 ((uint32_t)0xE100) /* Baudrate Selection 57600 */
-#define BAUDRATE_115200 ((uint32_t)0x1C200) /* Baudrate Selection 115200 */
-#define IS_UART_EMUL_BAUDRATE(BaudRate) (((BaudRate) == BAUDRATE_4800 ) || \
- ((BaudRate) == BAUDRATE_9600 ) || \
- ((BaudRate) == BAUDRATE_14400 ) || \
- ((BaudRate) == BAUDRATE_19200 ) || \
- ((BaudRate) == BAUDRATE_38400 ) || \
- ((BaudRate) == BAUDRATE_57600 ) || \
- ((BaudRate) == BAUDRATE_115200))
-/**
- * @}
- */
-
- /** @defgroup UART Emulation constant
- * @{
- */
-
-#define FIRST_BYTE ((uint8_t)0x01)
-#define BitMask ((uint8_t)0x01)
-#define RX_BUFFER_SIZE ((uint8_t)0x0C)
-#define TX_BUFFER_SIZE ((uint8_t)0x0C)
-
-/* Definition Handler for UART Emulation receive mode */
-
-#ifdef STM32F0xx
-#define UART_EMUL_TX_DMA_IRQHandler DMA1_Ch2_3_DMA2_Ch1_2_IRQHandler
-#define UART_EMUL_RX_DMA_IRQHandler DMA1_Ch4_7_DMA2_Ch3_5_IRQHandler
-
-#define UART_EMUL_TX_DMA_IRQn DMA1_Ch2_3_DMA2_Ch1_2_IRQn
-#define UART_EMUL_RX_DMA_IRQn DMA1_Ch4_7_DMA2_Ch3_5_IRQn
-#elif defined(STM32F3xx)
-#define UART_EMUL_TX_DMA_IRQHandler DMA2_Channel1_IRQHandler
-#define UART_EMUL_RX_DMA_IRQHandler DMA2_Channel3_IRQHandler
-
-#define UART_EMUL_TX_DMA_IRQn DMA2_Channel1_IRQn
-#define UART_EMUL_RX_DMA_IRQn DMA2_Channel3_IRQn
-#elif defined(STM32F4xx)
-#define UART_EMUL_TX_DMA_IRQHandler DMA2_Stream1_IRQHandler
-#define UART_EMUL_RX_DMA_IRQHandler DMA2_Stream2_IRQHandler
-
-#define UART_EMUL_TX_DMA_IRQn DMA2_Stream1_IRQn
-#define UART_EMUL_RX_DMA_IRQn DMA2_Stream2_IRQn
-#endif
-
-/* Defenition of UART Emulation timer */
-#define UART_EMUL_TX_TIMER_INSTANCE TIM1
-#define UART_EMUL_RX_TIMER_INSTANCE TIM1
-
-#define TIM_DMA_Handle_Tx TIM_DMA_ID_CC1
-#define TIM_DMA_Handle_Rx TIM_DMA_ID_CC2
-
-#define TIM_Channel_Tx TIM_CHANNEL_1
-#define TIM_Channel_Rx TIM_CHANNEL_2
-
-#define TIM_DMA_source_Tx TIM_DMA_CC1
-#define TIM_DMA_source_Rx TIM_DMA_CC2
-
-#ifdef STM32F4xx
-#define DMA_Channel_Tx DMA_CHANNEL_6
-#define DMA_Channel_Rx DMA_CHANNEL_6
-#endif
-
-#ifdef DMA2_Stream1
-#define DMA_Stream_Tx DMA2_Stream1
-#define DMA_Stream_Rx DMA2_Stream2
-#else
-#define DMA_Stream_Tx DMA2_Channel1
-#define DMA_Stream_Rx DMA2_Channel3
-#endif
-/* Exported macro ------------------------------------------------------------*/
-
-/** @brief Checks whether the specified UART Emulation flag is set or not.
- * @param __HANDLE__: specifies the UART Emulation Handle.
- * @param __FLAG__: specifies the flag to check.
- * This parameter can be one of the following values:
- * @arg UART_EMUL_FLAG_RC: Receiver Complete flag
- * @arg UART_EMUL_FLAG_TC: Transmission Complete flag
- * @arg UART_EMUL_FLAG_FE: Framing Error flag
- * @arg UART_EMUL_FLAG_PE: Parity Error flag
- * @retval The new state of __FLAG__ (TRUE or FALSE).
- */
-#define __HAL_UART_EMUL_GET_FLAG(__HANDLE__, __FLAG__) (((__HANDLE__)->Instance.SR & (__FLAG__)) == (__FLAG__))
-
-/** @brief Clears the specified UART Emulation flag.
- * @param __HANDLE__: specifies the UART Emulation Handle.
- *
- * @param __FLAG__: specifies the flag to check.
- * This parameter can be any combination of the following values:
- * @arg UART_EMUL_FLAG_RC : Receiver Complet.
- * @arg UART_EMUL_FLAG_TC : Transmitter Complet.
- * @arg UART_EMUL_FLAG_FE : Frame Error.
- * @arg UART_EMUL_FLAG_PE : Parity Error.
- *
- * @retval None
- */
-#define __HAL_UART_EMUL_CLEAR_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance.SR &= ~(__FLAG__))
-
-/** @brief Set the specified UART Emulation flag.
- * @param __HANDLE__: specifies the UART Emulation Handle.
- *
- * @param __FLAG__: specifies the flag to check.
- * This parameter can be any combination of the following values:
- * @arg UART_EMUL_FLAG_RC : Receiver Complete.
- * @arg UART_EMUL_FLAG_TC : Transmitter Complete.
- * @arg UART_EMUL_FLAG_FE : Frame Error.
- * @arg UART_EMUL_FLAG_PE : Parity Error.
- *
- * @retval None
- */
-#define __HAL_UART_EMUL_SET_FLAG(__HANDLE__, __FLAG__) ((__HANDLE__)->Instance.SR |= (__FLAG__))
-
-/** @brief Determinate the length for the frame .
- * @param __HANDLE__: specifies the UART Emulation Handle.
- * @param None
- * @retval None
- */
-#define __HAL_UART_EMUL_FRAME_LENGTH(__HANDLE__) (uint16_t)((__HANDLE__)->Init.WordLength + (__HANDLE__)->Init.StopBits + 1)
-
-/** @brief Enable the clock for UART Emulation.
- * clock in the peripherique used in this driver Timer and DMA
- * @param None
- * @retval None
- */
-#define __UART_EMUL_CLK_ENABLE() __HAL_RCC_TIM1_CLK_ENABLE();\
- __HAL_RCC_DMA2_CLK_ENABLE();
-
-/** @brief Disable the clock for UART Emulation.
- * clock in the peripherique used in this emulation Timer and DMA
- * @param None
- * @retval None
- */
-#define __UART_EMUL_CLK_DISABLE() __HAL_RCC_TIM1_CLK_DISABLE();\
- __HAL_RCC_DMA2_CLK_DISABLE();
-
-
-/* Exported functions --------------------------------------------------------*/
-/* Initialization/de-initialization functions **********************************/
-HAL_StatusTypeDef HAL_UART_Emul_Init(UART_Emul_HandleTypeDef *huart);
-HAL_StatusTypeDef HAL_UART_Emul_DeInit(UART_Emul_HandleTypeDef *huart);
-void HAL_UART_Emul_MspInit(UART_Emul_HandleTypeDef *huart);
-void HAL_UART_Emul_MspDeInit(UART_Emul_HandleTypeDef *huart);
-
-/* IO operation functions *******************************************************/
-HAL_StatusTypeDef HAL_UART_Emul_Transmit_DMA(UART_Emul_HandleTypeDef *huart, uint8_t *pData, uint16_t Size);
-HAL_StatusTypeDef HAL_UART_Emul_Receive_DMA(UART_Emul_HandleTypeDef *huart, uint8_t *pData, uint16_t Size);
-void HAL_UART_Emul_IRQHandler(UART_Emul_HandleTypeDef *huart);
-void HAL_UART_Emul_RxCpltCallback(UART_Emul_HandleTypeDef *huart);
-void HAL_UART_Emul_TxCpltCallback(UART_Emul_HandleTypeDef *huart);
-void HAL_UART_Emul_ErrorCallback(UART_Emul_HandleTypeDef *huart);
-void UART_EMUL_EXTI_RX(void);
-
-/* Peripheral State functions **************************************************/
-HAL_UART_Emul_StateTypeDef HAL_UART_Emul_GetState(UART_Emul_HandleTypeDef *huart);
-uint32_t HAL_UART_Emul_GetError(UART_Emul_HandleTypeDef *huart);
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-#endif //TIM1_BASE
-#endif /* __HAL_UART_EMUL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/cores/arduino/stm32/uart_emul.c b/cores/arduino/stm32/uart_emul.c
deleted file mode 100644
index 79b77350a0..0000000000
--- a/cores/arduino/stm32/uart_emul.c
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- ******************************************************************************
- * @file uart_emul.c
- * @author WI6LABS
- * @version V1.0.0
- * @date 25-April-2017
- * @brief provide the UART Emulation interface
- *
- ******************************************************************************
- * @attention
- *
- * © COPYRIGHT(c) 2017 STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
- */
-/** @addtogroup CMSIS
- * @{
- */
-
-/** @addtogroup stm32f4xx_system
- * @{
- */
-
-/** @addtogroup STM32F4xx_System_Private_Includes
- * @{
- */
-#include "debug.h"
-#include "uart_emul.h"
-#include "digital_io.h"
-#include "interrupt.h"
-#include "Arduino.h"
-
-#if defined(TIM1_BASE) && defined(UART_EMUL_RX) && defined(UART_EMUL_TX)
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_Defines
- * @{
- */
-
-/// @brief number of received characters
-#define EMUL_TIMER_PERIOD 100
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_TypesDefinitions
- * @{
- */
-
-/// @brief defines the global attributes of the UART
-typedef struct {
- UART_Emul_TypeDef uartEmul_typedef;
- PinName pin_tx;
- PinName pin_rx;
- void (*uart_rx_irqHandle)(void);
- uint8_t rxpData[UART_RCV_SIZE];
- volatile uint32_t data_available;
- volatile uint8_t begin;
- volatile uint8_t end;
- uart_option_e uart_option;
- stimer_t *_timer;
-}uart_emul_conf_t;
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_Macros
- * @{
- */
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_Variables
- * @{
- */
-/// @brief uart caracteristics
-static UART_Emul_HandleTypeDef g_UartEmulHandle[NB_UART_EMUL_MANAGED];
-
-static uart_emul_conf_t g_uartEmul_config[NB_UART_EMUL_MANAGED] = {
- {
- .uartEmul_typedef = {UART1_EMUL_E},
- .pin_tx = UART_EMUL_TX, .pin_rx = UART_EMUL_RX,
- .uart_rx_irqHandle = NULL,
- .data_available = 0,
- .begin = 0,
- .end = 0,
- .uart_option = EMULATED_UART_E,
- ._timer = NULL
- }
-};
-
-//@brief just a simple buffer for the uart reception
-uint8_t g_rx_data[1];
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_FunctionPrototypes
- * @{
- */
-static void uart_emul_timer_irq(stimer_t *obj) {UNUSED(obj); g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle();}
-
-/**
- * @}
- */
-
-/** @addtogroup STM32F4xx_System_Private_Functions
- * @{
- */
-
-/******************************* EMULATED UART ********************************/
-/**
- * @brief Initializes the UART Emulation MSP.
- * @param huart: UART Emulation Handle
- * @retval None
- */
-void HAL_UART_Emul_MspInit(UART_Emul_HandleTypeDef *huart)
-{
- GPIO_InitTypeDef GPIO_InitStruct;
- GPIO_TypeDef *port_rx;
- GPIO_TypeDef *port_tx;
- UNUSED(huart);
-
- // Enable GPIO clock
- port_rx = set_GPIO_Port_Clock(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_rx));
- port_tx = set_GPIO_Port_Clock(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_tx));
-
- // Enable GPIO TX/RX clock
- __UART_EMUL_CLK_ENABLE();
-
- // Enable GPIO TX/RX clock
- GPIO_InitStruct.Pin = STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_tx);
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
- GPIO_InitStruct.Pull = GPIO_PULLUP;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
-
- // UART TX GPIO pin configuration
- HAL_GPIO_Init(port_tx, &GPIO_InitStruct);
-
- GPIO_InitStruct.Pin = STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_rx);
- GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
-
- // UART RX GPIO pin configuration
- HAL_GPIO_Init(port_rx, &GPIO_InitStruct);
- stm32_interrupt_enable(port_rx, STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_rx),
- UART_EMUL_EXTI_RX, GPIO_MODE_IT_FALLING);
- /*HAL_NVIC_SetPriority(EXTI15_10_IRQn, 0, 0);
- HAL_NVIC_EnableIRQ(EXTI15_10_IRQn);*/
-}
-
-/**
- * @brief UART Emulation MSP DeInit.
- * @param huart: UART Emulation handle
- * @retval None
- */
-void HAL_UART_Emul_MspDeInit(UART_Emul_HandleTypeDef *huart)
-{
- GPIO_TypeDef *port_rx = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_rx));
- GPIO_TypeDef *port_tx = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_tx));
- UNUSED(huart);
-
- __UART_EMUL_CLK_DISABLE();
-
- HAL_GPIO_DeInit(port_tx, STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_tx));
- HAL_GPIO_DeInit(port_rx, STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_rx));
-
- stm32_interrupt_disable(port_rx, STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_rx));
-}
-
-/**
- * @brief Function called to initialize the emulated uart interface
- * @param serial_id : one of the defined serial interface
- * @param baudRate : baudrate to apply to the uart : 4800 or 9600 //TODO bug if baud rate > 9600
- * @retval None
- */
-void uart_emul_init(uart_emul_id_e uart_id, uint32_t baudRate)
-{
- GPIO_TypeDef *port_tx = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_tx));
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return;
- }
-
- g_UartEmulHandle[uart_id].Init.Mode = UART_EMUL_MODE_TX_RX;
- g_UartEmulHandle[uart_id].Init.BaudRate = baudRate;
- g_UartEmulHandle[uart_id].Init.WordLength = UART_EMUL_WORDLENGTH_8B;
- g_UartEmulHandle[uart_id].Init.StopBits = UART_EMUL_STOPBITS_1;
- g_UartEmulHandle[uart_id].Init.Parity = UART_EMUL_PARITY_NONE;
- g_UartEmulHandle[uart_id].Init.RxPinNumber = STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_rx);
- g_UartEmulHandle[uart_id].Init.TxPinNumber = STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_tx);
- g_UartEmulHandle[uart_id].RxPortName = get_GPIO_Port(STM_PORT(g_uartEmul_config[UART1_EMUL_E].pin_rx));
- g_UartEmulHandle[uart_id].TxPortName = port_tx;
-
- if(HAL_UART_Emul_Init(&g_UartEmulHandle[uart_id])!= HAL_OK) {
- return;
- }
-
- if (HAL_UART_Emul_Receive_DMA(&g_UartEmulHandle[uart_id], g_rx_data, 1) != HAL_OK) {
- return;
- }
-
- uart_emul_flush(uart_id);
-
- HAL_GPIO_WritePin(port_tx, STM_GPIO_PIN(g_uartEmul_config[UART1_EMUL_E].pin_tx), GPIO_PIN_SET);
-}
-
-/**
- * @brief Function called to deinitialize the emulated uart interface
- * @param serial_id : one of the defined serial interface
- * @retval None
- */
-void uart_emul_deinit(uart_emul_id_e uart_id)
-{
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return;
- }
-
- HAL_UART_Emul_DeInit(&g_UartEmulHandle[uart_id]);
-}
-
-/**
- * @brief Function returns the amount of data available
- * @param serial_id : one of the defined serial interface
- * @retval The number of serial data available - int
- */
-int uart_emul_available(uart_emul_id_e uart_id)
-{
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return 0;
- }
-
- return g_uartEmul_config[uart_id].data_available;
-}
-
-/**
- * @brief Return the first element of the rx buffer
- * @param serial_id : one of the defined serial interface
- * @retval The first byte of incoming serial data available (or -1 if no data is available) - int
- */
-int8_t uart_emul_read(uart_emul_id_e uart_id)
-{
- int8_t data = -1;
-
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return data;
- }
-
- if(g_uartEmul_config[uart_id].data_available > 0) {
-
- data = g_uartEmul_config[uart_id].rxpData[g_uartEmul_config[uart_id].begin++];
-
- if(g_uartEmul_config[uart_id].begin >= UART_RCV_SIZE) {
- g_uartEmul_config[uart_id].begin = 0;
- }
-
- g_uartEmul_config[uart_id].data_available--;
- }
-
- return data;
-}
-
-/**
- * @brief write the data on the uart
- * @param serial_id : one of the defined serial interface
- * @param data : byte to write
- * @retval The number of bytes written
- */
-size_t uart_emul_write(uart_emul_id_e uart_id, uint8_t data)
-{
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return 0;
- }
-
- while(HAL_UART_Emul_Transmit_DMA(&g_UartEmulHandle[uart_id], &data, 1) != HAL_OK);
- return 1;
-}
-
-/**
- * @brief Return the first element of the rx buffer without removing it from
- * the buffer
- * @param serial_id : one of the defined serial interface
- * @retval The first byte of incoming serial data available (or -1 if no data is available) - int
- */
-int8_t uart_emul_peek(uart_emul_id_e uart_id)
-{
- int8_t data = -1;
-
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return data;
- }
-
- if(g_uartEmul_config[uart_id].data_available > 0) {
- data = g_uartEmul_config[uart_id].rxpData[g_uartEmul_config[uart_id].begin];
- }
-
- return data;
-}
-
-/**
- * @brief Flush the content of the RX buffer
- * @param serial_id : one of the defined serial interface
- * @retval None
- */
-void uart_emul_flush(uart_emul_id_e uart_id)
-{
- if(uart_id>=NB_UART_EMUL_MANAGED) {
- return;
- }
-
- g_uartEmul_config[uart_id].data_available = 0;
- g_uartEmul_config[uart_id].end = 0;
- g_uartEmul_config[uart_id].begin = 0;
-}
-
-/**
- * @brief Read receive byte from uart
- * @param UartHandle : pointer on the uart reference
- * @param byte : byte to read
- * @retval None
- */
-static void uart_emul_getc(uart_emul_id_e uart_id, uint8_t byte)
-{
- if((uart_id >= NB_UART_EMUL_MANAGED) ||
- (g_uartEmul_config[uart_id].data_available >= UART_RCV_SIZE)) {
- return;
- }
-
- g_uartEmul_config[uart_id].rxpData[g_uartEmul_config[uart_id].end++] = byte;
- if(g_uartEmul_config[uart_id].end >= UART_RCV_SIZE) {
- g_uartEmul_config[uart_id].end = 0;
- }
- g_uartEmul_config[uart_id].data_available++;
-}
-
-/**
- * @brief
- * @param irq : pointer to function to call
- * @retval None
- */
-void uart_emul_attached_handler(stimer_t *obj, void (*irqHandle)(void))
-{
- obj->timer = TIMER_UART_EMULATED;
- TimerHandleInit(obj, EMUL_TIMER_PERIOD - 1, (uint16_t)(HAL_RCC_GetHCLKFreq() / 1000) - 1); //50ms
- g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle = irqHandle;
- g_uartEmul_config[UART1_EMUL_E]._timer = obj;
- attachIntHandle(obj, uart_emul_timer_irq);
-}
-
-/**
- * @brief Initializes the UART Emulation Transfer Complete.
- * @param huart: UART Emulation Handle
- * @retval None
- */
-void HAL_UART_Emul_RxCpltCallback(UART_Emul_HandleTypeDef *huart)
-{
- uart_emul_getc(UART1_EMUL_E, *huart->pRxBuffPtr);
- HAL_UART_Emul_Receive_DMA(&g_UartEmulHandle[UART1_EMUL_E], g_rx_data, 1);
-
- if(g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle != NULL) {
- if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE / 2)) {
- setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, 0);
- }
- else if(uart_emul_available(UART1_EMUL_E) < (UART_RCV_SIZE/4*3)) {
- setTimerCounter((stimer_t *)g_uartEmul_config[UART1_EMUL_E]._timer->timer, EMUL_TIMER_PERIOD - 1);
- }
- else {
- g_uartEmul_config[UART1_EMUL_E].uart_rx_irqHandle();
- }
- }
-}
-
-/*void HAL_UART_Emul_ErrorCallback(UART_Emul_HandleTypeDef *huart)
-{
- debug("UART EMUL RX ERROR\n");
-}*/
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-
-/**
- * @}
- */
-#ifdef __cplusplus
-}
-#endif
-#endif //TIM1_BASE && UART_EMUL_RX && UART_EMUL_TX
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/cores/arduino/stm32/uart_emul.h b/cores/arduino/stm32/uart_emul.h
deleted file mode 100644
index 0ea5582d98..0000000000
--- a/cores/arduino/stm32/uart_emul.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- ******************************************************************************
- * @file uart_emul.h
- * @author WI6LABS
- * @version V1.0.0
- * @date 25-April-2017
- * @brief Header for uart emulation module
- ******************************************************************************
- * @attention
- *
- * © COPYRIGHT(c) 2017 STMicroelectronics
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. Neither the name of STMicroelectronics nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************
- */
-
-/* Define to prevent recursive inclusion -------------------------------------*/
-#ifndef __UART_EMUL_H
-#define __UART_EMUL_H
-
-/* Includes ------------------------------------------------------------------*/
-#include "stm32_def.h"
-#include "timer.h"
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/* Exported types ------------------------------------------------------------*/
-typedef enum {
- UART1_EMUL_E = 0,
- NB_UART_EMUL_MANAGED
-} uart_emul_id_e;
-
-typedef enum {
- NATIVE_UART_E = 0,
- EMULATED_UART_E = 1,
- NB_UART_OPTION
-} uart_option_e;
-
-/* Exported constants --------------------------------------------------------*/
-#define UART_RCV_SIZE 128
-
-/* Exported macro ------------------------------------------------------------*/
-/* Exported functions ------------------------------------------------------- */
-void uart_emul_init(uart_emul_id_e uart_id, uint32_t baudRate);
-void uart_emul_deinit(uart_emul_id_e uart_id);
-int uart_emul_available(uart_emul_id_e uart_id);
-int8_t uart_emul_read(uart_emul_id_e uart_id);
-size_t uart_emul_write(uart_emul_id_e uart_id, uint8_t data);
-int8_t uart_emul_peek(uart_emul_id_e uart_id);
-void uart_emul_flush(uart_emul_id_e uart_id);
-void uart_emul_attached_handler(stimer_t *obj, void (*irqHandle)(void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __UART_EMUL_H */
-
-/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
diff --git a/libraries/GSM/README.adoc b/libraries/GSM/README.adoc
deleted file mode 100644
index 876f0dcb79..0000000000
--- a/libraries/GSM/README.adoc
+++ /dev/null
@@ -1,23 +0,0 @@
-= GSM Library for Arduino =
-
-With the Arduino GSM Shield, this library enables an Arduino board to do most of the operations you can do with a GSM phone: place and receive voice calls, send and receive SMS, and connect to the internet over a GPRS network.
-
-For more information about this library please visit us at
-http://www.arduino.cc/en/Reference/GSM
-
-== License ==
-Copyright (c) 2012 Telefónica Digital - PDI - Physical Internet Lab
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
diff --git a/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino b/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
deleted file mode 100644
index 3abc4136ff..0000000000
--- a/libraries/GSM/examples/GsmWebClient/GsmWebClient.ino
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- Web client
-
- This sketch connects to a website through a GSM shield. Specifically,
- this example downloads the URL "http://www.arduino.cc/asciilogo.txt" and
- prints it to the Serial monitor.
-
- Circuit:
- * GSM shield attached to an Arduino
- * SIM card with a data plan
-
- created 8 Mar 2012
- by Tom Igoe
-
- http://www.arduino.cc/en/Tutorial/GSMExamplesWebClient
-
- */
-
-// libraries
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// APN data
-#define GPRS_APN "GPRS_APN" // replace your GPRS APN
-#define GPRS_LOGIN "login" // replace with your GPRS login
-#define GPRS_PASSWORD "password" // replace with your GPRS password
-
-// initialize the library instance
-GSMClient client;
-GPRS gprs;
-GSM gsmAccess;
-
-// URL, path & port (for example: arduino.cc)
-char server[] = "arduino.cc";
-char path[] = "/asciilogo.txt";
-int port = 80; // port 80 is the default for HTTP
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- Serial.println("Starting Arduino web client.");
- // connection state
- boolean notConnected = true;
-
- // After starting the modem with GSM.begin()
- // attach the shield to the GPRS network with the APN, login and password
- while (notConnected) {
- if ((gsmAccess.begin(PINNUMBER) == GSM_READY) &
- (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD) == GPRS_READY)) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("connecting...");
-
- // if you get a connection, report back via serial:
- if (client.connect(server, port)) {
- Serial.println("connected");
- // Make a HTTP request:
- client.print("GET ");
- client.print(path);
- client.println(" HTTP/1.1");
- client.print("Host: ");
- client.println(server);
- client.println("Connection: close");
- client.println();
- } else {
- // if you didn't get a connection to the server:
- Serial.println("connection failed");
- }
-}
-
-void loop() {
- // if there are incoming bytes available
- // from the server, read them and print them:
- if (client.available()) {
- char c = client.read();
- Serial.print(c);
- }
-
- // if the server's disconnected, stop the client:
- if (!client.available() && !client.connected()) {
- Serial.println();
- Serial.println("disconnecting.");
- client.stop();
-
- // do nothing forevermore:
- for (;;)
- ;
- }
-}
diff --git a/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino b/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
deleted file mode 100644
index 74fb572a1d..0000000000
--- a/libraries/GSM/examples/GsmWebServer/GsmWebServer.ino
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- GSM Web Server
-
- A simple web server that shows the value of the analog input pins.
- using a GSM shield.
-
- Circuit:
- * GSM shield attached
- * Analog inputs attached to pins A0 through A5 (optional)
-
- created 8 Mar 2012
- by Tom Igoe
- */
-
-// libraries
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// APN data
-#define GPRS_APN "GPRS_APN" // replace your GPRS APN
-#define GPRS_LOGIN "login" // replace with your GPRS login
-#define GPRS_PASSWORD "password" // replace with your GPRS password
-
-
-// initialize the library instance
-GPRS gprs;
-GSM gsmAccess; // include a 'true' parameter for debug enabled
-GSMServer server(80); // port 80 (http default)
-
-// timeout
-const unsigned long __TIMEOUT__ = 10 * 1000;
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (notConnected) {
- if ((gsmAccess.begin(PINNUMBER) == GSM_READY) &
- (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD) == GPRS_READY)) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("Connected to GPRS network");
-
- // start server
- server.begin();
-
- //Get IP.
- IPAddress LocalIP = gprs.getIPAddress();
- Serial.println("Server IP address=");
- Serial.println(LocalIP);
-}
-
-void loop() {
-
-
- // listen for incoming clients
- GSMClient client = server.available();
-
-
-
- if (client) {
- while (client.connected()) {
- if (client.available()) {
- Serial.println("Receiving request!");
- bool sendResponse = false;
- while (char c = client.read()) {
- if (c == '\n') {
- sendResponse = true;
- }
- }
-
- // if you've gotten to the end of the line (received a newline
- // character)
- if (sendResponse) {
- // send a standard http response header
- client.println("HTTP/1.1 200 OK");
- client.println("Content-Type: text/html");
- client.println();
- client.println("");
- // output the value of each analog input pin
- for (int analogChannel = 0; analogChannel < 6; analogChannel++) {
- client.print("analog input ");
- client.print(analogChannel);
- client.print(" is ");
- client.print(analogRead(analogChannel));
- client.println("
");
- }
- client.println("");
- //necessary delay
- delay(1000);
- client.stop();
- }
- }
- }
- }
-}
-
-
diff --git a/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino b/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
deleted file mode 100644
index 5eaace0a77..0000000000
--- a/libraries/GSM/examples/MakeVoiceCall/MakeVoiceCall.ino
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- Make Voice Call
-
- This sketch, for the Arduino GSM shield, puts a voice call to
- a remote phone number that you enter through the serial monitor.
- To make it work, open the serial monitor, and when you see the
- READY message, type a phone number. Make sure the serial monitor
- is set to send a just newline when you press return.
-
- Circuit:
- * GSM shield
- * Voice circuit.
- With no voice circuit the call will send nor receive any sound
-
-
- created Mar 2012
- by Javier Zorzano
-
- This example is in the public domain.
- */
-
-// libraries
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// initialize the library instance
-GSM gsmAccess; // include a 'true' parameter for debug enabled
-GSMVoiceCall vcs;
-
-String remoteNumber = ""; // the number you will call
-char charbuffer[20];
-
-void setup() {
-
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- Serial.println("Make Voice Call");
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (notConnected) {
- if (gsmAccess.begin(PINNUMBER) == GSM_READY) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("GSM initialized.");
- Serial.println("Enter phone number to call.");
-
-}
-
-void loop() {
-
- // add any incoming characters to the String:
- while (Serial.available() > 0) {
- char inChar = Serial.read();
- // if it's a newline, that means you should make the call:
- if (inChar == '\n') {
- // make sure the phone number is not too long:
- if (remoteNumber.length() < 20) {
- // let the user know you're calling:
- Serial.print("Calling to : ");
- Serial.println(remoteNumber);
- Serial.println();
-
- // Call the remote number
- remoteNumber.toCharArray(charbuffer, 20);
-
-
- // Check if the receiving end has picked up the call
- if (vcs.voiceCall(charbuffer)) {
- Serial.println("Call Established. Enter line to end");
- // Wait for some input from the line
- while (Serial.read() != '\n' && (vcs.getvoiceCallStatus() == TALKING));
- // And hang up
- vcs.hangCall();
- }
- Serial.println("Call Finished");
- remoteNumber = "";
- Serial.println("Enter phone number to call.");
- } else {
- Serial.println("That's too long for a phone number. I'm forgetting it");
- remoteNumber = "";
- }
- } else {
- // add the latest character to the message to send:
- if (inChar != '\r') {
- remoteNumber += inChar;
- }
- }
- }
-}
-
diff --git a/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino b/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino
deleted file mode 100644
index 09546e51e3..0000000000
--- a/libraries/GSM/examples/ReceiveSMS/ReceiveSMS.ino
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- SMS receiver
-
- This sketch, for the Arduino GSM shield, waits for a SMS message
- and displays it through the Serial port.
-
- Circuit:
- * GSM shield attached to and Arduino
- * SIM card that can receive SMS messages
-
- created 25 Feb 2012
- by Javier Zorzano / TD
-
- This example is in the public domain.
-
- http://www.arduino.cc/en/Tutorial/GSMExamplesReceiveSMS
-
-*/
-
-// include the GSM library
-#include
-
-// PIN Number for the SIM
-#define PINNUMBER ""
-
-// initialize the library instances
-GSM gsmAccess;
-GSM_SMS sms;
-
-// Array to hold the number a SMS is retreived from
-char senderNumber[20];
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- Serial.println("SMS Messages Receiver");
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM connection
- while (notConnected) {
- if (gsmAccess.begin(PINNUMBER) == GSM_READY) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("GSM initialized");
- Serial.println("Waiting for messages");
-}
-
-void loop() {
- char c;
-
- // If there are any SMSs available()
- if (sms.available()) {
- Serial.println("Message received from:");
-
- // Get remote number
- sms.remoteNumber(senderNumber, 20);
- Serial.println(senderNumber);
-
- // An example of message disposal
- // Any messages starting with # should be discarded
- if (sms.peek() == '#') {
- Serial.println("Discarded SMS");
- sms.flush();
- }
-
- // Read message bytes and print them
- while (c = sms.read()) {
- Serial.print(c);
- }
-
- Serial.println("\nEND OF MESSAGE");
-
- // Delete message from modem memory
- sms.flush();
- Serial.println("MESSAGE DELETED");
- }
-
- delay(1000);
-
-}
-
-
diff --git a/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino b/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino
deleted file mode 100644
index 6ec09f7572..0000000000
--- a/libraries/GSM/examples/ReceiveVoiceCall/ReceiveVoiceCall.ino
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- Receive Voice Call
-
- This sketch, for the Arduino GSM shield, receives voice calls,
- displays the calling number, waits a few seconds then hangs up.
-
- Circuit:
- * GSM shield
- * Voice circuit. Refer to to the GSM shield getting started guide
- at http://www.arduino.cc/en/Guide/ArduinoGSMShield#toc11
- * SIM card that can accept voice calls
-
- With no voice circuit the call will connect, but will not send or receive sound
-
- created Mar 2012
- by Javier Zorzano
-
- This example is in the public domain.
-
- http://www.arduino.cc/en/Tutorial/GSMExamplesReceiveVoiceCall
-
- */
-
-// Include the GSM library
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// initialize the library instance
-GSM gsmAccess;
-GSMVoiceCall vcs;
-
-// Array to hold the number for the incoming call
-char numtel[20];
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- Serial.println("Receive Voice Call");
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (notConnected) {
- if (gsmAccess.begin(PINNUMBER) == GSM_READY) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- // This makes sure the modem correctly reports incoming events
- vcs.hangCall();
-
- Serial.println("Waiting for a call");
-}
-
-void loop() {
- // Check the status of the voice call
- switch (vcs.getvoiceCallStatus()) {
- case IDLE_CALL: // Nothing is happening
-
- break;
-
- case RECEIVINGCALL: // Yes! Someone is calling us
-
- Serial.println("RECEIVING CALL");
-
- // Retrieve the calling number
- vcs.retrieveCallingNumber(numtel, 20);
-
- // Print the calling number
- Serial.print("Number:");
- Serial.println(numtel);
-
- // Answer the call, establish the call
- vcs.answerCall();
- break;
-
- case TALKING: // In this case the call would be established
-
- Serial.println("TALKING. Press enter to hang up.");
- while (Serial.read() != '\n') {
- delay(100);
- }
- vcs.hangCall();
- Serial.println("Hanging up and waiting for the next call.");
- break;
- }
- delay(1000);
-}
-
-
diff --git a/libraries/GSM/examples/SendSMS/SendSMS.ino b/libraries/GSM/examples/SendSMS/SendSMS.ino
deleted file mode 100644
index e49156ed96..0000000000
--- a/libraries/GSM/examples/SendSMS/SendSMS.ino
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- SMS sender
-
- This sketch, for the Arduino GSM shield,sends an SMS message
- you enter in the serial monitor. Connect your Arduino with the
- GSM shield and SIM card, open the serial monitor, and wait for
- the "READY" message to appear in the monitor. Next, type a
- message to send and press "return". Make sure the serial
- monitor is set to send a newline when you press return.
-
- Circuit:
- * GSM shield
- * SIM card that can send SMS
-
- created 25 Feb 2012
- by Tom Igoe
-
- This example is in the public domain.
-
- http://www.arduino.cc/en/Tutorial/GSMExamplesSendSMS
-
- */
-
-// Include the GSM library
-#include
-
-#define PINNUMBER ""
-
-// initialize the library instance
-GSM gsmAccess;
-GSM_SMS sms;
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for native USB port only
- }
-
- Serial.println("SMS Messages Sender");
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (notConnected) {
- if (gsmAccess.begin(PINNUMBER) == GSM_READY) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("GSM initialized");
-}
-
-void loop() {
-
- Serial.print("Enter a mobile number: ");
- char remoteNum[20]; // telephone number to send sms
- readSerial(remoteNum);
- Serial.println(remoteNum);
-
- // sms text
- Serial.print("Now, enter SMS content: ");
- char txtMsg[200];
- readSerial(txtMsg);
- Serial.println("SENDING");
- Serial.println();
- Serial.println("Message:");
- Serial.println(txtMsg);
-
- // send the message
- sms.beginSMS(remoteNum);
- sms.print(txtMsg);
- sms.endSMS();
- Serial.println("\nCOMPLETE!\n");
-}
-
-/*
- Read input serial
- */
-int readSerial(char result[]) {
- int i = 0;
- while (1) {
- while (Serial.available() > 0) {
- char inChar = Serial.read();
- if (inChar == '\n') {
- result[i] = '\0';
- Serial.flush();
- return 0;
- }
- if (inChar != '\r') {
- result[i] = inChar;
- i++;
- }
- }
- }
-}
diff --git a/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino b/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino
deleted file mode 100644
index 2ef088a7f1..0000000000
--- a/libraries/GSM/examples/Tools/BandManagement/BandManagement.ino
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- Band Management
-
- This sketch, for the Arduino GSM shield, checks the band
- currently configured in the modem and allows you to change
- it.
-
- Please check http://www.worldtimezone.com/gsm.html
- Usual configurations:
- Europe, Africa, Middle East: E-GSM(900)+DCS(1800)
- USA, Canada, South America: GSM(850)+PCS(1900)
- Mexico: PCS(1900)
- Brazil: GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)
-
-
- Circuit:
- * GSM shield
-
- created 12 June 2012
- by Javier Zorzano, Scott Fitzgerald
-
- This example is in the public domain.
- */
-
-// libraries
-#include
-
-// initialize the library instance
-GSMBand band;
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-
- // Beginning the band manager restarts the modem
- Serial.println("Restarting modem...");
- band.begin();
- Serial.println("Modem restarted.");
-
-};
-
-
-void loop() {
- // Get current band
- String bandName = band.getBand(); // Get and print band name
- Serial.print("Current band:");
- Serial.println(bandName);
- Serial.println("Want to change the band you’re on?");
- String newBandName;
- newBandName = askUser();
- // Tell the user what we are about to do…
- Serial.print("\nConfiguring band ");
- Serial.println(newBandName);
- // Change the band
- boolean operationSuccess;
- operationSuccess = band.setBand(newBandName);
- // Tell the user if the operation was OK
- if (operationSuccess) {
- Serial.println("Success");
- } else {
- Serial.println("Error while changing band");
- }
-
- if (operationSuccess) {
- while (true);
- }
-}
-
-// This function offers the user different options
-// through the Serial interface
-// The user selects one
-String askUser() {
- String newBand;
- Serial.println("Select band:");
- // Print the different options
- Serial.println("1 : E-GSM(900)");
- Serial.println("2 : DCS(1800)");
- Serial.println("3 : PCS(1900)");
- Serial.println("4 : E-GSM(900)+DCS(1800) ex: Europe");
- Serial.println("5 : GSM(850)+PCS(1900) Ex: USA, South Am.");
- Serial.println("6 : GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)");
-
- // Empty the incoming buffer
- while (Serial.available()) {
- Serial.read();
- }
-
- // Wait for an answer, just look at the first character
- while (!Serial.available());
- char c = Serial.read();
- if (c == '1') {
- newBand = GSM_MODE_EGSM;
- } else if (c == '2') {
- newBand = GSM_MODE_DCS;
- } else if (c == '3') {
- newBand = GSM_MODE_PCS;
- } else if (c == '4') {
- newBand = GSM_MODE_EGSM_DCS;
- } else if (c == '5') {
- newBand = GSM_MODE_GSM850_PCS;
- } else if (c == '6') {
- newBand = GSM_MODE_GSM850_EGSM_DCS_PCS;
- } else {
- newBand = "GSM_MODE_UNDEFINED";
- }
- return newBand;
-}
-
-
-
-
-
diff --git a/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino b/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino
deleted file mode 100644
index 233d11ae1d..0000000000
--- a/libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-
- GSM Scan Networks
-
- This example prints out the IMEI number of the modem,
- then checks to see if it's connected to a carrier. If so,
- it prints the phone number associated with the card.
- Then it scans for nearby networks and prints out their signal strengths.
-
- Circuit:
- * GSM shield
- * SIM card
-
- Created 8 Mar 2012
- by Tom Igoe, implemented by Javier Carazo
- Modified 4 Feb 2013
- by Scott Fitzgerald
-
- http://www.arduino.cc/en/Tutorial/GSMToolsGsmScanNetworks
-
- This example code is part of the public domain
- */
-
-// libraries
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// initialize the library instance
-GSM gsmAccess; // include a 'true' parameter to enable debugging
-GSMScanner scannerNetworks;
-GSMModem modemTest;
-
-// Save data variables
-String IMEI = "";
-
-// serial monitor result messages
-String errortext = "ERROR";
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-
- Serial.println("GSM networks scanner");
- scannerNetworks.begin();
-
- // connection state
- boolean notConnected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (notConnected) {
- if (gsmAccess.begin(PINNUMBER) == GSM_READY) {
- notConnected = false;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- // get modem parameters
- // IMEI, modem unique identifier
- Serial.print("Modem IMEI: ");
- IMEI = modemTest.getIMEI();
- IMEI.replace("\n", "");
- if (IMEI != NULL) {
- Serial.println(IMEI);
- }
-}
-
-void loop() {
- // scan for existing networks, displays a list of networks
- Serial.println("Scanning available networks. May take some seconds.");
- Serial.println(scannerNetworks.readNetworks());
-
- // currently connected carrier
- Serial.print("Current carrier: ");
- Serial.println(scannerNetworks.getCurrentCarrier());
-
- // returns strength and ber
- // signal strength in 0-31 scale. 31 means power > 51dBm
- // BER is the Bit Error Rate. 0-7 scale. 99=not detectable
- Serial.print("Signal Strength: ");
- Serial.print(scannerNetworks.getSignalStrength());
- Serial.println(" [0-31]");
-
-}
-
diff --git a/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino b/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino
deleted file mode 100644
index 6dc37b33d6..0000000000
--- a/libraries/GSM/examples/Tools/PinManagement/PinManagement.ino
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-
- This example enables you to change or remove the PIN number of
- a SIM card inserted into a GSM shield.
-
- Circuit:
- * GSM shield
- * SIM card
-
- Created 12 Jun 2012
- by David del Peral
-
- This example code is part of the public domain
-
- http://www.arduino.cc/en/Tutorial/GSMToolsPinManagement
-
- */
-
-// libraries
-#include
-
-// pin manager object
-GSMPIN PINManager;
-
-// save input in serial by user
-String user_input = "";
-
-// authenticated with PIN code
-boolean auth = false;
-
-// serial monitor result messages
-String oktext = "OK";
-String errortext = "ERROR";
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-
- Serial.println("Change PIN example\n");
- PINManager.begin();
-
- // check if the SIM have pin lock
- while (!auth) {
- int pin_query = PINManager.isPIN();
- if (pin_query == 1) {
- // if SIM is locked, enter PIN code
- Serial.print("Enter PIN code: ");
- user_input = readSerial();
- // check PIN code
- if (PINManager.checkPIN(user_input) == 0) {
- auth = true;
- PINManager.setPINUsed(true);
- Serial.println(oktext);
- } else {
- // if PIN code was incorrected
- Serial.println("Incorrect PIN. Remember that you have 3 opportunities.");
- }
- } else if (pin_query == -1) {
- // PIN code is locked, user must enter PUK code
- Serial.println("PIN locked. Enter PUK code: ");
- String puk = readSerial();
- Serial.print("Now, enter a new PIN code: ");
- user_input = readSerial();
- // check PUK code
- if (PINManager.checkPUK(puk, user_input) == 0) {
- auth = true;
- PINManager.setPINUsed(true);
- Serial.println(oktext);
- } else {
- // if PUK o the new PIN are incorrect
- Serial.println("Incorrect PUK or invalid new PIN. Try again!.");
- }
- } else if (pin_query == -2) {
- // the worst case, PIN and PUK are locked
- Serial.println("PIN & PUK locked. Use PIN2/PUK2 in a mobile phone.");
- while (true);
- } else {
- // SIM does not requires authetication
- Serial.println("No pin necessary.");
- auth = true;
- }
- }
-
- // start GSM shield
- Serial.print("Checking register in GSM network...");
- if (PINManager.checkReg() == 0) {
- Serial.println(oktext);
- }
- // if you are connect by roaming
- else if (PINManager.checkReg() == 1) {
- Serial.println("ROAMING " + oktext);
- } else {
- // error connection
- Serial.println(errortext);
- while (true);
- }
-}
-
-void loop() {
- // Function loop implements pin management user menu
- // Only if you SIM use pin lock, you can change PIN code
- // user_op variables save user option
-
- Serial.println("Choose an option:\n1 - On/Off PIN.");
- if (PINManager.getPINUsed()) {
- Serial.println("2 - Change PIN.");
- }
- String user_op = readSerial();
- if (user_op == "1") {
- Serial.println("Enter your PIN code:");
- user_input = readSerial();
- // activate/deactivate PIN lock
- PINManager.switchPIN(user_input);
- } else if (user_op == "2" & PINManager.getPINUsed()) {
- Serial.println("Enter your actual PIN code:");
- String oldPIN = readSerial();
- Serial.println("Now, enter your new PIN code:");
- String newPIN = readSerial();
- // change PIN
- PINManager.changePIN(oldPIN, newPIN);
- } else {
- Serial.println("Incorrect option. Try again!.");
- }
- delay(1000);
-}
-
-/*
- Read input serial
- */
-String readSerial() {
- String text = "";
- while (1) {
- while (Serial.available() > 0) {
- char inChar = Serial.read();
- if (inChar == '\n') {
- return text;
- }
- if (inChar != '\r') {
- text += inChar;
- }
- }
- }
-}
diff --git a/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino b/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino
deleted file mode 100644
index 85a8bc8bc8..0000000000
--- a/libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
-
- This sketch test the GSM shield's ability to connect to a
- GPERS network. It asks for APN information through the
- serial monitor and tries to connect to arduino.cc.
-
- Circuit:
- * GSM shield attached
- * SIM card with data plan
-
- Created 18 Jun 2012
- by David del Peral
-
- This example code is part of the public domain
-
- http://www.arduino.cc/en/Tutorial/GSMToolsTestGPRS
-
- */
-
-// libraries
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// initialize the library instance
-GSM gsmAccess; // GSM access: include a 'true' parameter for debug enabled
-GPRS gprsAccess; // GPRS access
-GSMClient client; // Client service for TCP connection
-
-// messages for serial monitor response
-String oktext = "OK";
-String errortext = "ERROR";
-
-// URL and path (for example: arduino.cc)
-char url[] = "arduino.cc";
-char urlproxy[] = "http://www.arduino.cc";
-char path[] = "/";
-
-// variable for save response obtained
-String response = "";
-
-// use a proxy
-boolean use_proxy = false;
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-}
-
-void loop() {
- use_proxy = false;
-
- // start GSM shield
- // if your SIM has PIN, pass it as a parameter of begin() in quotes
- Serial.print("Connecting GSM network...");
- if (gsmAccess.begin(PINNUMBER) != GSM_READY) {
- Serial.println(errortext);
- while (true);
- }
- Serial.println(oktext);
-
- // read APN introduced by user
- char apn[50];
- Serial.print("Enter your APN: ");
- readSerial(apn);
- Serial.println(apn);
-
- // Read APN login introduced by user
- char login[50];
- Serial.print("Now, enter your login: ");
- readSerial(login);
- Serial.println(login);
-
- // read APN password introduced by user
- char password[20];
- Serial.print("Finally, enter your password: ");
- readSerial(password);
-
- // attach GPRS
- Serial.println("Attaching to GPRS with your APN...");
- if (gprsAccess.attachGPRS(apn, login, password) != GPRS_READY) {
- Serial.println(errortext);
- } else {
-
- Serial.println(oktext);
-
- // read proxy introduced by user
- char proxy[100];
- Serial.print("If your carrier uses a proxy, enter it, if not press enter: ");
- readSerial(proxy);
- Serial.println(proxy);
-
- // if user introduced a proxy, asks him for proxy port
- int pport;
- if (proxy[0] != '\0') {
- // read proxy port introduced by user
- char proxyport[10];
- Serial.print("Enter the proxy port: ");
- readSerial(proxyport);
- // cast proxy port introduced to integer
- pport = (int) proxyport;
- use_proxy = true;
- Serial.println(proxyport);
- }
-
- // connection with arduino.cc and realize HTTP request
- Serial.print("Connecting and sending GET request to arduino.cc...");
- int res_connect;
-
- // if use a proxy, connect with it
- if (use_proxy) {
- res_connect = client.connect(proxy, pport);
- } else {
- res_connect = client.connect(url, 80);
- }
-
- if (res_connect) {
- // make a HTTP 1.0 GET request (client sends the request)
- client.print("GET ");
-
- // if use a proxy, the path is arduino.cc URL
- if (use_proxy) {
- client.print(urlproxy);
- } else {
- client.print(path);
- }
-
- client.println(" HTTP/1.0");
- client.println();
- Serial.println(oktext);
- } else {
- // if you didn't get a connection to the server
- Serial.println(errortext);
- }
- Serial.print("Receiving response...");
-
- boolean test = true;
- while (test) {
- // if there are incoming bytes available
- // from the server, read and check them
- if (client.available()) {
- char c = client.read();
- response += c;
-
- // cast response obtained from string to char array
- char responsechar[response.length() + 1];
- response.toCharArray(responsechar, response.length() + 1);
-
- // if response includes a "200 OK" substring
- if (strstr(responsechar, "200 OK") != NULL) {
- Serial.println(oktext);
- Serial.println("TEST COMPLETE!");
- test = false;
- }
- }
-
- // if the server's disconnected, stop the client:
- if (!client.connected()) {
- Serial.println();
- Serial.println("disconnecting.");
- client.stop();
- test = false;
- }
- }
- }
-}
-
-/*
- Read input serial
- */
-int readSerial(char result[]) {
- int i = 0;
- while (1) {
- while (Serial.available() > 0) {
- char inChar = Serial.read();
- if (inChar == '\n') {
- result[i] = '\0';
- return 0;
- }
- if (inChar != '\r') {
- result[i] = inChar;
- i++;
- }
- }
- }
-}
diff --git a/libraries/GSM/examples/Tools/TestModem/TestModem.ino b/libraries/GSM/examples/Tools/TestModem/TestModem.ino
deleted file mode 100644
index 5ee42219bb..0000000000
--- a/libraries/GSM/examples/Tools/TestModem/TestModem.ino
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-
- This example tests to see if the modem of the
- GSM shield is working correctly. You do not need
- a SIM card for this example.
-
- Circuit:
- * GSM shield attached
-
- Created 12 Jun 2012
- by David del Peral
- modified 21 Nov 2012
- by Tom Igoe
-
- http://www.arduino.cc/en/Tutorial/GSMToolsTestModem
-
- This sample code is part of the public domain
-
- */
-
-// libraries
-#include
-
-// modem verification object
-GSMModem modem;
-
-// IMEI variable
-String IMEI = "";
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-
- // start modem test (reset and check response)
- Serial.print("Starting modem test...");
- if (modem.begin()) {
- Serial.println("modem.begin() succeeded");
- } else {
- Serial.println("ERROR, no modem answer.");
- }
-}
-
-void loop() {
- // get modem IMEI
- Serial.print("Checking IMEI...");
- IMEI = modem.getIMEI();
-
- // check IMEI response
- if (IMEI != NULL) {
- // show IMEI in serial monitor
- Serial.println("Modem's IMEI: " + IMEI);
- // reset modem to check booting:
- Serial.print("Resetting modem...");
- modem.begin();
- // get and check IMEI one more time
- if (modem.getIMEI() != NULL) {
- Serial.println("Modem is functoning properly");
- } else {
- Serial.println("Error: getIMEI() failed after modem.begin()");
- }
- } else {
- Serial.println("Error: Could not get IMEI");
- }
- // do nothing:
- while (true);
-}
-
diff --git a/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino b/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
deleted file mode 100644
index d3939e11a0..0000000000
--- a/libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- Basic Web Server
-
- A simple web server that replies with nothing, but prints the client's request
- and the server IP address.
-
- Circuit:
- * GSM shield attached
-
- created
- by David Cuartielles
- modified 21 Nov 2012
- by Tom Igoe
-
- http://www.arduino.cc/en/Tutorial/GSMToolsTestWebServer
-
- This example code is part of the public domain
- */
-#include
-
-// PIN Number
-#define PINNUMBER ""
-
-// APN data
-#define GPRS_APN "GPRS_APN" // replace your GPRS APN
-#define GPRS_LOGIN "login" // replace with your GPRS login
-#define GPRS_PASSWORD "password" // replace with your GPRS password
-
-
-// initialize the library instance
-GPRS gprs;
-GSM gsmAccess; // include a 'true' parameter for debug enabled
-GSMServer server(80); // port 80 (http default)
-
-// timeout
-const unsigned long __TIMEOUT__ = 10 * 1000;
-
-void setup() {
- // initialize serial communications and wait for port to open:
- Serial.begin(9600);
- while (!Serial) {
- ; // wait for serial port to connect. Needed for Leonardo only
- }
-
- Serial.println("starting,..");
- // connection state
- boolean connected = true;
-
- // Start GSM shield
- // If your SIM has PIN, pass it as a parameter of begin() in quotes
- while (!connected) {
- if ((gsmAccess.begin(PINNUMBER) == GSM_READY) &
- (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD) == GPRS_READY)) {
- connected = true;
- } else {
- Serial.println("Not connected");
- delay(1000);
- }
- }
-
- Serial.println("Connected to GPRS network");
-
- // start server
- server.begin();
-
- //Get IP.
- IPAddress LocalIP = gprs.getIPAddress();
- Serial.println("Server IP address=");
- Serial.println(LocalIP);
-}
-
-void loop() {
- GSMClient client = server.available();
-
- if (client) {
- if (client.available()) {
- Serial.write(client.read());
- }
- }
-
-}
-
diff --git a/libraries/GSM/extras/License.txt b/libraries/GSM/extras/License.txt
deleted file mode 100644
index 4114b2b23c..0000000000
--- a/libraries/GSM/extras/License.txt
+++ /dev/null
@@ -1,142 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 2.1, February 1999
-
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
- b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
- c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
- d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
- a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
- b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
- c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
- d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
- e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
- b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-END OF TERMS AND CONDITIONS
diff --git a/libraries/GSM/keywords.txt b/libraries/GSM/keywords.txt
deleted file mode 100644
index 4a44464add..0000000000
--- a/libraries/GSM/keywords.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-#######################################
-# Syntax Coloring Map For GSM
-#######################################
-# Class
-#######################################
-
-GSM KEYWORD1 GSM
-GSMVoiceCall KEYWORD1 GSMVCSConstructor
-GSM_SMS KEYWORD1 GSMSMSConstructor
-GPRS KEYWORD1 GPRSConstructor
-GSMClient KEYWORD1 GSMClientConstructor
-GSMServer KEYWORD1 GSMServerConstructor
-GSMModem KEYWORD1 GSMModemConstructor
-GSMScanner KEYWORD1 GSMScannerConstructor
-GSMPIN KEYWORD1 GSMPINConstructor
-GSMBand KEYWORD1 GSMBandConstructor
-
-#######################################
-# Methods and Functions
-#######################################
-
-begin KEYWORD2
-shutdown KEYWORD2
-gatVoiceCallStatus KEYWORD2
-ready KEYWORD2
-voiceCall KEYWORD2
-answerCall KEYWORD2
-hangCall KEYWORD2
-retrieveCallingNumber KEYWORD2
-beginSMS KEYWORD2
-endSMS KEYWORD2
-remoteNumber KEYWORD2
-attachGPRS KEYWORD2
-begnWrite KEYWORD2
-endWrite KEYWORD2
-getIMEI KEYWORD2
-getCurrentCarrier KEYWORD2
-getSignalStrength KEYWORD2
-readNetworks KEYWORD2
-isPIN KEYWORD2
-checkPIN KEYWORD2
-checkPUK KEYWORD2
-changePIN KEYWORD2
-switchPIN KEYWORD2
-checkReg KEYWORD2
-getPINUsed KEYWORD2
-setPINUsed KEYWORD2
-getBand KEYWORD2
-setBand KEYWORD2
-getvoiceCallStatus KEYWORD2
-
-#######################################
-# Constants
-#######################################
-
-ERROR LITERAL1
-IDLE LITERAL1
-CONNECTING LITERAL1
-GSM_READY LITERAL1
-GPRS_READY LITERAL1
-TRANSPARENT_CONNECTED LITERAL1
-IDLE_CALL LITERAL1
-CALLING LITERAL1
-RECEIVINGCALL LITERAL1
-TALKING LITERAL1
-GSM_MODE_UNDEFINED LITERAL1
-GSM_MODE_EGSM LITERAL1
-GSM_MODE_DCS LITERAL1
-GSM_MODE_PCS LITERAL1
-GSM_MODE_EGSM_DCS LITERAL1
-GSM_MODE_GSM850_PCS LITERAL1
-GSM_MODE_GSM850_EGSM_DCS_PCS LITERAL1
diff --git a/libraries/GSM/library.properties b/libraries/GSM/library.properties
deleted file mode 100644
index 201a0fe6c0..0000000000
--- a/libraries/GSM/library.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-name=GSM
-version=1.0.5
-author=Arduino
-maintainer=Arduino
-sentence=Enables GSM/GRPS network connection using the Arduino GSM Shield. For all Arduino boards BUT Arduino DUE.
-paragraph=Use this library to make/receive voice calls, to send and receive SMS with the Quectel M10 GSM module.This library also allows you to connect to internet through the GPRS networks. You can either use web Clients and Servers.
-category=Communication
-url=http://www.arduino.cc/en/Reference/GSM
-architectures=stm32
diff --git a/libraries/GSM/src/DEFAULT.h b/libraries/GSM/src/DEFAULT.h
deleted file mode 100644
index 4707f4c252..0000000000
--- a/libraries/GSM/src/DEFAULT.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-This file is part of GSM3ShieldV2 library developed by Arduino.org (http://arduino.org).
-
- GSM3ShieldV2 library is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- GSM3ShieldV2 library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GSM3ShieldV2 library. If not, see .
-*/
-
-#define DEFAULT_AlertSoundMode 0
-#define DEFAULT_RingerSoundLevel 10
-#define DEFAULT_Channel 1
-#define DEFAULT_MicrophoneGainLevel 10
-#define DEFAULT_LoudSpeakerVolumeLevel 30
-#define DEFAULT_muteControl 0
-#define DEFAULT_speakerMode 1
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM.h b/libraries/GSM/src/GSM.h
deleted file mode 100644
index 19d61bd795..0000000000
--- a/libraries/GSM/src/GSM.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-
-
-Added support for Arduino GSM Shield 2
-Modified Apr. 2015
-by Arduino.org team (http://arduino.org)
-
-*/
-#ifndef _GSM3SIMPLIFIERFILE_
-#define _GSM3SIMPLIFIERFILE_
-
-// This file simplifies the use of the GSM3 library
-// First we include everything.
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#define GSM GSM3ShieldV1AccessProvider
-#define GPRS GSM3ShieldV1DataNetworkProvider
-#define GSMClient GSM3MobileClientService
-#define GSMServer GSM3MobileServerService
-#define GSMVoiceCall GSM3VoiceCallService
-#define GSM_SMS GSM3SMSService
-
-#define GSMPIN GSM3ShieldV1PinManagement
-#define GSMModem GSM3ShieldV1ModemVerification
-#define GSMCell GSM3ShieldV1CellManagement
-#define GSMBand GSM3ShieldV1BandManagement
-#define GSMScanner GSM3ShieldV1ScanNetworks
-
-
-//#define GPRSPosition GSM3ShieldV2
-#define GSM2 GSM3ShieldV2
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3CircularBuffer.cpp b/libraries/GSM/src/GSM3CircularBuffer.cpp
deleted file mode 100644
index a2aa58eb1a..0000000000
--- a/libraries/GSM/src/GSM3CircularBuffer.cpp
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-GSM3CircularBuffer::GSM3CircularBuffer(GSM3CircularBufferManager* mgr)
-{
- head=0;
- tail=0;
- cbm=mgr;
-}
-
-int GSM3CircularBuffer::write(char c)
-{
- byte aux=(tail+1)& __BUFFERMASK__;
- if(aux!=head)
- {
- theBuffer[tail]=c;
- // Lets put an extra zero at the end, so we can
- // read chains as we like.
- // This is not exactly perfect, we are always 1+ behind the head
- theBuffer[aux]=0;
- tail=aux;
- return 1;
- }
- return 0;
-}
-
-char GSM3CircularBuffer::read()
-{
- char res;
- if(head!=tail)
- {
- res=theBuffer[head];
- head=(head+1)& __BUFFERMASK__;
- //if(cbm)
- // cbm->spaceAvailable();
- return res;
- }
- else
- {
- return 0;
- }
-}
-
-char GSM3CircularBuffer::peek(int increment)
-{
- char res;
- byte num_aux;
-
- if (tail>head) num_aux = tail-head;
- else num_aux = 128 - head + tail;
-
- if(increment < num_aux)
- {
- res=theBuffer[head];
- return res;
- }
- else
- {
- return 0;
- }
-}
-
-void GSM3CircularBufferManager::spaceAvailable(){return;};
-
-void GSM3CircularBuffer::flush()
-{
- head=tail;
-}
-
-char* GSM3CircularBuffer::nextString()
-{
- while(head!=tail)
- {
- head=(head+1) & __BUFFERMASK__;
- if(theBuffer[head]==0)
- {
- head=(head+1) & __BUFFERMASK__;
- return (char*)theBuffer+head;
- }
- }
- return 0;
-}
-
-
-bool GSM3CircularBuffer::locate(const char* reference)
-{
-
- return locate(reference, head, tail, 0, 0);
-}
-
-bool GSM3CircularBuffer::chopUntil(const char* reference, bool movetotheend, bool usehead)
-{
- byte from, to;
-
- if(locate(reference, head, tail, &from, &to))
- {
- if(usehead)
- {
- if(movetotheend)
- head=(to+1) & __BUFFERMASK__;
- else
- head=from;
- }
- else
- {
- if(movetotheend)
- tail=(to+1) & __BUFFERMASK__;
- else
- tail=from;
- }
- return true;
- }
- else
- {
- return false;
- }
-}
-
-bool GSM3CircularBuffer::locate(const char* reference, byte thishead, byte thistail, byte* from, byte* to)
-{
- int refcursor=0;
- bool into=false;
- byte b2, binit;
- bool possible=1;
-
- if(reference[0]==0)
- return true;
-
- for(byte b1=thishead; b1!=thistail;b1=(b1+1)& __BUFFERMASK__)
- {
- possible = 1;
- b2 = b1;
- while (possible&&(b2!=thistail))
- {
- if(theBuffer[b2]==reference[refcursor])
- {
- if(!into)
- binit=b2;
- into=true;
- refcursor++;
- if(reference[refcursor]==0)
- {
- if(from)
- *from=binit;
- if(to)
- *to=b2;
- return true;
- }
- }
- else if (into==true)
- {
- possible = 0;
- into=false;
- refcursor=0;
- }
- b2=(b2+1)& __BUFFERMASK__;
- }
- }
- return false;
-}
-
-bool GSM3CircularBuffer::extractSubstring(const char* from, const char* to, char* buffer, int bufsize)
-{
- byte t1;
- byte h2;
- byte b;
- int i;
-
-//DEBUG
-//Serial.println("Beginning extractSubstring");
-//Serial.print("head,tail=");Serial.print(int(head));Serial.print(",");Serial.println(int(tail));
-
- if(!locate(from, head, tail, 0, &t1))
- return false;
-
-//DEBUG
-//Serial.println("Located chain from.");
-
- t1++; //To point the next.
- if(!locate(to, t1, tail, &h2, 0))
- return false;
-
-//DEBUG
-//Serial.println("Located chain to.");
-/*Serial.print("t1=");Serial.println(int(t1));
-Serial.print("h2=");Serial.println(int(h2));*/
-
-
- for(i=0,b=t1;i='0')&&(c<='9'))
- {
- anyfound=true;
- res=(res*10)+(int)c-48;
- }
- else
- {
- if(negative)
- res=(-1)*res;
- return res;
- }
- }
- if(negative)
- res=(-1)*res;
- return res;
-}
-
-void GSM3CircularBuffer::debugBuffer()
-{
- byte h1=head;
- byte t1=tail;
- Serial.println();
- Serial.print(h1);
- Serial.print(" ");
- Serial.print(t1);
- Serial.print('>');
- for(byte b=h1; b!=t1; b=(b+1)& __BUFFERMASK__)
- printCharDebug(theBuffer[b]);
- Serial.println();
-}
-
-void GSM3CircularBuffer::printCharDebug(uint8_t c)
-{
- if((c>31)&&(c<127))
- Serial.print((char)c);
- else
- {
- Serial.print('%');
- Serial.print(c);
- Serial.print('%');
- }
-}
-
-bool GSM3CircularBuffer::retrieveBuffer(char* buffer, int bufsize, int& SizeWritten)
-{
- byte b;
- int i;
-
- /*for(i=0,b=head;i
-#include
-
-#ifndef byte
-#define byte uint8_t
-#endif
-
-// These values have to be interrelated
-// To-Do: may we have just one? (BUFFERMASK)
-#define __BUFFERSIZE__ 128
-#define __BUFFERMASK__ 0x7F
-
-class GSM3CircularBufferManager
-{
- public:
-
- /** If there is spaceAvailable in the buffer, lets send a XON
- */
- virtual void spaceAvailable();
-};
-
-class GSM3CircularBuffer
-{
- private:
- // Buffer pointers.
- // head=tail means buffer empty
- // tail=head-1 means buffer full
- // tail=head+1 means just one char (pointed by head)
- // REMEMBER. head can be moved only by the main program
- // REMEMBER. tail can be moved only by the other thread (interrupts)
- // REMEMBER. head and tail can move only FORWARD
- volatile byte head; // First written one
- volatile byte tail; // Last written one.
-
- GSM3CircularBufferManager* cbm; // Circular buffer manager
-
- // The buffer
- volatile byte theBuffer[__BUFFERSIZE__];
-
- /** Checks if a substring exists in the buffer
- @param reference Substring
- @param thishead Head
- @param thistail Tail
- @param from Initial byte position
- @param to Final byte position
- @return true if exists, in otherwise return false
- */
- bool locate(const char* reference, byte thishead, byte thistail, byte* from=0, byte* to=0);
-
- public:
-
- /** Constructor
- @param mgr Circular buffer manager
- */
- GSM3CircularBuffer(GSM3CircularBufferManager* mgr=0);
-
- // TO-DO.Check if this formule runs too at the buffer limit
-
- /** Get available bytes in circular buffer
- @return available bytes
- */
- inline byte availableBytes(){ return ((head-(tail+1))&__BUFFERMASK__);};
-
- /** Stored bytes in circular buffer
- @return stored bytes
- */
- inline byte storedBytes(){ return ((tail-head)&__BUFFERMASK__);};
-
- /** Write a character in circular buffer
- @param c Character
- @return 1 if successful
- */
- int write(char c);
-
- /** Returns a character and moves the pointer
- @return character
- */
- char read();
-
- /** Returns a character but does not move the pointer.
- @param increment Increment
- @return character
- */
- char peek(int increment);
-
- /** Returns a pointer to the head of the buffer
- @return buffer with pointer in head
- */
- inline char* firstString(){return (char*)theBuffer+head;};
-
- /** Go forward one string
- @return buffer with one string advance
- */
- char* nextString();
-
- /** Flush circular buffer
- */
- void flush();
-
- /** Get tail
- @return tail
- */
- inline byte getTail(){return tail;};
-
- /** Get head
- @return head
- */
- inline byte getHead(){return head;};
-
- // Only can be executed from the interrupt!
- /** Delete circular buffer to the end
- @param from Initial byte position
- */
- inline void deleteToTheEnd(byte from){tail=from;};
-
- /** Checks if a substring exists in the buffer
- move=0, dont move, =1,put head at the beginning of the string, =2, put head at the end
- @param reference
- @return true if exists, in otherwise return false
- */
- bool locate(const char* reference);
-
- /** Locates reference. If found, moves head (or tail) to the beginning (or end)
- @param reference
- @param movetotheend
- @param head
- @return true if successful
- */
- bool chopUntil(const char* reference, bool movetotheend, bool head=true);
-
- /** Reads an integer from the head. Stops with first non blank, non number character
- @return integer from the head
- */
- int readInt();
-
- // Caveat: copies the first bytes until buffer is full
-
- /** Extract a substring from circular buffer
- @param from Initial byte position
- @param to Final byte position
- @param buffer Buffer for copy substring
- @param bufsize Buffer size
- @return true if successful, false if substring does not exists
- */
- bool extractSubstring(const char* from, const char* to, char* buffer, int bufsize);
-
- /** Retrieve all the contents of buffer from head to tail
- @param buffer
- @param bufsize
- @param SizeWritten
- @return true if successful
- */
- bool retrieveBuffer(char* buffer, int bufsize, int& SizeWritten);
-
- /** Debug function to print the buffer after receiving data from the modem.
- */
- void debugBuffer();
-
- /** Utility: dump character if printable, else, put in %x%
- @param c Character
- */
- static void printCharDebug(uint8_t c);
-};
-
-
-#endif
diff --git a/libraries/GSM/src/GSM3IO.h b/libraries/GSM/src/GSM3IO.h
deleted file mode 100644
index da1e784768..0000000000
--- a/libraries/GSM/src/GSM3IO.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifdef TTOPEN_V1
- #define __POWERPIN__ 5
- #define __RESETPIN__ 6
-#else
- #define __RESETPIN__ 7
-#endif
-
-#if defined(__AVR_ATmega328P__)
- #ifdef TTOPEN_V1
- #define __TXPIN__ 3
- #define __RXPIN__ 4
- #define __RXINT__ 3
- #else
- #define __TXPIN__ 3
- #define __RXPIN__ 2
- #define __RXINT__ 3
- #endif
-#elif defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1280__)
- #define __TXPIN__ 3
- #define __RXPIN__ 10
- #define __RXINT__ 4
-#elif defined(__AVR_ATmega32U4__)
- #define __TXPIN__ 3
- #define __RXPIN__ 8
- #define __RXINT__ 3
-#endif
diff --git a/libraries/GSM/src/GSM3MobileAccessProvider.cpp b/libraries/GSM/src/GSM3MobileAccessProvider.cpp
deleted file mode 100644
index 225069b2b9..0000000000
--- a/libraries/GSM/src/GSM3MobileAccessProvider.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3MobileAccessProvider* theGSM3MobileAccessProvider;
diff --git a/libraries/GSM/src/GSM3MobileAccessProvider.h b/libraries/GSM/src/GSM3MobileAccessProvider.h
deleted file mode 100644
index b9b8d0f278..0000000000
--- a/libraries/GSM/src/GSM3MobileAccessProvider.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILEACCESSPROVIDER_
-#define _GSM3MOBILEACCESSPROVIDER_
-
-enum GSM3_NetworkStatus_t { GSM_ERROR, IDLE, CONNECTING, GSM_READY, GPRS_READY, TRANSPARENT_CONNECTED, OFF};
-
-class GSM3MobileAccessProvider
-{
- public:
- // Access functions
- //Configuration functions.
- /** Establish GSM connection
- @param pin PIN code
- @param restart Determines if hardware restart
- @param synchronous Determines sync mode
- @return If synchronous, GSM3_NetworkStatus_t. If asynchronous, returns 0.
- */
- virtual inline GSM3_NetworkStatus_t begin(char* pin=0,bool restart=true, bool synchronous=true)=0;
-
- /** Check network access status
- @return 1 if Alive, 0 if down
- */
- virtual inline int isAccessAlive()=0;
-
- /** Shutdown the modem (power off really)
- @return true if successful
- */
- virtual inline bool shutdown()=0;
-
- /** Secure shutdown the modem (power off really)
- @return always true
- */
- virtual inline bool secureShutdown()=0;
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileCellManagement.cpp b/libraries/GSM/src/GSM3MobileCellManagement.cpp
deleted file mode 100644
index 5db2717f86..0000000000
--- a/libraries/GSM/src/GSM3MobileCellManagement.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
diff --git a/libraries/GSM/src/GSM3MobileCellManagement.h b/libraries/GSM/src/GSM3MobileCellManagement.h
deleted file mode 100644
index 035dfee996..0000000000
--- a/libraries/GSM/src/GSM3MobileCellManagement.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILECELLMANAGEMENT_
-#define _GSM3MOBILECELLMANAGEMENT_
-
-#include
-
-class GSM3MobileCellManagement
-{
- public:
-
- virtual inline int getLocation() {return 0;};
-
- virtual inline int getICCID() {return 0;};
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileClientProvider.cpp b/libraries/GSM/src/GSM3MobileClientProvider.cpp
deleted file mode 100644
index 0de3ceea70..0000000000
--- a/libraries/GSM/src/GSM3MobileClientProvider.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3MobileClientProvider* theGSM3MobileClientProvider;
diff --git a/libraries/GSM/src/GSM3MobileClientProvider.h b/libraries/GSM/src/GSM3MobileClientProvider.h
deleted file mode 100644
index a771ff46d1..0000000000
--- a/libraries/GSM/src/GSM3MobileClientProvider.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_MOBILECLIENTPROVIDER__
-#define __GSM3_MOBILECLIENTPROVIDER__
-
-#include
-#include
-
-class GSM3MobileClientProvider
-{
- protected:
-
- uint8_t sockets;
-
- public:
-
- /** Constructor */
- GSM3MobileClientProvider(){};
-
- /** Minimum socket
- @return socket
- */
- virtual inline int minSocket()=0;
-
- /** Maximum socket
- @return socket
- */
- virtual inline int maxSocket()=0;
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-
- /** Get status socket client
- @param socket Socket
- @return 1 if connected
- */
- virtual bool getStatusSocketClient(uint8_t socket)=0;
-
- // Socket management
-
- /** Get socket
- @param socket Socket
- @return socket
- */
- virtual int getSocket(int socket=-1)=0;
-
- /** Release socket
- @param socket Socket
- */
- virtual void releaseSocket(int socket)=0;
-
- // Client socket functions
-
- /** Connect to a server via TCP connection
- @param server Server name or IP address in a String
- @param port Port
- @param id_socket Socket
- @return 0 if command running, 1 if success, otherwise error
- */
- virtual int connectTCPClient(const char* server, int port, int id_socket)=0;
-
- /** Connect to a server (by IP address) via TCP connection
- @param add IP address in IPAddress format
- @param port Port
- @param id_socket Socket
- @return 0 if command running, 1 if success, otherwise error
- */
- virtual int connectTCPClient(IPAddress add, int port, int id_socket)=0;
-
- /** Begin writing through a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- virtual void beginWriteSocket(bool client1Server0, int id_socket)=0;
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param c character to be written
- */
- virtual void writeSocket(uint8_t c)=0;
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param buf characters to be written (final 0 will not be written)
- */
- virtual void writeSocket(const char* buf)=0;
-
- /** Finish current writing
- */
- virtual void endWriteSocket()=0;
-
- /** Check if there are data to be read in socket.
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if there are data available, 4 if no data, otherwise error
- */
- virtual int availableSocket(bool client, int id_socket)=0;
-
- /** Read data (get a character) available in socket
- @return character
- */
- virtual int readSocket()=0;
-
- /** Flush socket
- */
- virtual void flushSocket()=0;
-
- /** Get a character but will not advance the buffer head
- @return character
- */
- virtual int peekSocket()=0;
-
- /** Close a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Socket
- @return 0 if command running, 1 if success, otherwise error
- */
- virtual int disconnectTCP(bool client1Server0, int idsocket)=0;
-
-};
-
-extern GSM3MobileClientProvider* theGSM3MobileClientProvider;
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileClientService.cpp b/libraries/GSM/src/GSM3MobileClientService.cpp
deleted file mode 100644
index 7fcb4fe653..0000000000
--- a/libraries/GSM/src/GSM3MobileClientService.cpp
+++ /dev/null
@@ -1,260 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-// While there is only a shield (ShieldV1) we will include it by default
-#include
-GSM3ShieldV1ClientProvider theShieldV1ClientProvider;
-
-
-#define GSM3MOBILECLIENTSERVICE_CLIENT 0x01 // 1: This side is Client. 0: This side is Server
-#define GSM3MOBILECLIENTSERVICE_WRITING 0x02 // 1: TRUE 0: FALSE
-#define GSM3MOBILECLIENTSERVICE_SYNCH 0x04 // 1: TRUE, compatible with other clients 0: FALSE
-
-#define __TOUTBEGINWRITE__ 10000
-
-
-GSM3MobileClientService::GSM3MobileClientService(bool synch)
-{
- flags = GSM3MOBILECLIENTSERVICE_CLIENT;
- if(synch)
- flags |= GSM3MOBILECLIENTSERVICE_SYNCH;
- mySocket=255;
-}
-
-GSM3MobileClientService::GSM3MobileClientService(int socket, bool synch)
-{
- // We are creating a socket on an existing, occupied one.
- flags=0;
- if(synch)
- flags |= GSM3MOBILECLIENTSERVICE_SYNCH;
- mySocket=socket;
- theGSM3MobileClientProvider->getSocket(socket);
-
-}
-
-// Returns 0 if last command is still executing
-// 1 if success
-// >1 if error
-int GSM3MobileClientService::ready()
-{
- return theGSM3MobileClientProvider->ready();
-}
-
-int GSM3MobileClientService::connect(IPAddress add, uint16_t port)
-{
- if(theGSM3MobileClientProvider==0)
- return 2;
-
- // TODO: ask for the socket id
- mySocket=theGSM3MobileClientProvider->getSocket();
-
- if(mySocket<0)
- return 2;
-
- int res=theGSM3MobileClientProvider->connectTCPClient(add, port, mySocket);
- if(flags & GSM3MOBILECLIENTSERVICE_SYNCH)
- res=waitForAnswer();
-
- return res;
-};
-
-int GSM3MobileClientService::connect(const char *host, uint16_t port)
-{
-
- if(theGSM3MobileClientProvider==0)
- return 2;
- // TODO: ask for the socket id
- mySocket=theGSM3MobileClientProvider->getSocket();
-
- if(mySocket<0)
- return 2;
-
- int res=theGSM3MobileClientProvider->connectTCPClient(host, port, mySocket);
- if(flags & GSM3MOBILECLIENTSERVICE_SYNCH)
- res=waitForAnswer();
-
- return res;
-}
-
-int GSM3MobileClientService::waitForAnswer()
-{
- unsigned long m;
- m=millis();
- int res;
-
- while(((millis()-m)< __TOUTBEGINWRITE__ )&&(ready()==0))
- delay(100);
-
- res=ready();
-
- // If we get something different from a 1, we are having a problem
- if(res!=1)
- res=0;
-
- return res;
-}
-
-void GSM3MobileClientService::beginWrite(bool sync)
-{
- flags |= GSM3MOBILECLIENTSERVICE_WRITING;
- theGSM3MobileClientProvider->beginWriteSocket(flags & GSM3MOBILECLIENTSERVICE_CLIENT, mySocket);
- if(sync)
- waitForAnswer();
-}
-
-size_t GSM3MobileClientService::write(uint8_t c)
-{
- if(!(flags & GSM3MOBILECLIENTSERVICE_WRITING))
- beginWrite(true);
- theGSM3MobileClientProvider->writeSocket(c);
- return 1;
-}
-
-size_t GSM3MobileClientService::write(const uint8_t* buf)
-{
- if(!(flags & GSM3MOBILECLIENTSERVICE_WRITING))
- beginWrite(true);
- theGSM3MobileClientProvider->writeSocket((const char*)(buf));
- return strlen((const char*)buf);
-}
-
-size_t GSM3MobileClientService::write(const uint8_t* buf, size_t sz)
-{
- if(!(flags & GSM3MOBILECLIENTSERVICE_WRITING))
- beginWrite(true);
- for(unsigned int i=0;iwriteSocket(buf[i]);
- return sz;
-}
-
-void GSM3MobileClientService::endWrite(bool sync)
-{
- flags ^= GSM3MOBILECLIENTSERVICE_WRITING;
- theGSM3MobileClientProvider->endWriteSocket();
- if(sync)
- waitForAnswer();
-}
-
-uint8_t GSM3MobileClientService::connected()
-{
- if(mySocket==255)
- return 0;
- return theGSM3MobileClientProvider->getStatusSocketClient(mySocket);
-}
-
-GSM3MobileClientService::operator bool()
-{
- return connected()==1;
-};
-
-int GSM3MobileClientService::available()
-{
- int res;
-
- // Even if not connected, we are looking for available data
-
- if(flags & GSM3MOBILECLIENTSERVICE_WRITING)
- endWrite(true);
-
- res=theGSM3MobileClientProvider->availableSocket(flags & GSM3MOBILECLIENTSERVICE_CLIENT,mySocket);
- if(flags & GSM3MOBILECLIENTSERVICE_SYNCH)
- res=waitForAnswer();
-
- return res;
-}
-
-int GSM3MobileClientService::read(uint8_t *buf, size_t size)
-{
- unsigned int i;
- uint8_t c;
-
- for(i=0;ireadSocket(flags & GSM3MOBILECLIENTSERVICE_CLIENT, (char *)(buf), size, mySocket);
-
- return res;
-*/
-}
-
-int GSM3MobileClientService::read()
-{
- if(flags & GSM3MOBILECLIENTSERVICE_WRITING)
- endWrite(true);
- int c=theGSM3MobileClientProvider->readSocket();
- return c;
-}
-
-int GSM3MobileClientService::peek()
-{
- if(flags & GSM3MOBILECLIENTSERVICE_WRITING)
- endWrite(true);
- return theGSM3MobileClientProvider->peekSocket(/*mySocket, false*/);
-}
-
-void GSM3MobileClientService::flush()
-{
- if(flags & GSM3MOBILECLIENTSERVICE_WRITING)
- endWrite(true);
- theGSM3MobileClientProvider->flushSocket(/*mySocket*/);
- if(flags & GSM3MOBILECLIENTSERVICE_SYNCH)
- waitForAnswer();
-
-}
-
-void GSM3MobileClientService::stop()
-{
- if(flags & GSM3MOBILECLIENTSERVICE_WRITING)
- endWrite(true);
- theGSM3MobileClientProvider->disconnectTCP(flags & GSM3MOBILECLIENTSERVICE_CLIENT, mySocket);
- theGSM3MobileClientProvider->releaseSocket(mySocket);
- mySocket = 0;
- if(flags & GSM3MOBILECLIENTSERVICE_SYNCH)
- waitForAnswer();
-}
-
diff --git a/libraries/GSM/src/GSM3MobileClientService.h b/libraries/GSM/src/GSM3MobileClientService.h
deleted file mode 100644
index 5a36a975c9..0000000000
--- a/libraries/GSM/src/GSM3MobileClientService.h
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILECLIENTSERVICE_
-#define _GSM3MOBILECLIENTSERVICE_
-
-#include
-#include
-
-
-class GSM3MobileClientService : public Client
-{
- private:
-
- uint8_t mySocket;
- uint8_t flags;
-
- /** Blocks waiting for an answer
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int waitForAnswer();
-
- public:
-
- /** Constructor
- @param synch Sync mode
- */
- GSM3MobileClientService(bool synch=true);
-
- /** Constructor
- @param socket Socket
- @param synch Sync mode
- */
- GSM3MobileClientService(int socket, bool synch);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
-
- // we take this function out as IPAddress is complex to bring to
- // version 1.
- /** Connect to server by IP address
- @param (IPAddress)
- @param (uint16_t)
- @return returns 0 if last command is still executing, 1 success, 2 if there are no resources
- */
- inline int connect(IPAddress, uint16_t);
-
- /** Connect to server by hostname
- @param host Hostname
- @param port Port
- @return returns 0 if last command is still executing, 1 success, 2 if there are no resources
- */
- int connect(const char *host, uint16_t port);
-
- /** Initialize write in request
- @param sync Sync mode
- */
- void beginWrite(bool sync=false);
-
- /** Write a character in request
- @param c Character
- @return size
- */
- size_t write(uint8_t c);
-
- /** Write a characters buffer in request
- @param buf Buffer
- @return buffer size
- */
- size_t write(const uint8_t *buf);
-
- /** Write a characters buffer with size in request
- @param (uint8_t*) Buffer
- @param (size_t) Buffer size
- @return buffer size
- */
- size_t write(const uint8_t*, size_t);
-
- /** Finish write request
- @param sync Sync mode
- */
- void endWrite(bool sync=false);
-
- /** Check if connected to server
- @return 1 if connected
- */
- uint8_t connected();
-
- operator bool();
-
- /** Read from response buffer and copy size specified to buffer
- @param buf Buffer
- @param size Buffer size
- @return bytes read
- */
- int read(uint8_t *buf, size_t size);
-
- /** Read a character from response buffer
- @return character
- */
- int read();
-
- /** Check if exists a response available
- @return 1 if exists, 0 if not exists
- */
- int available();
-
- /** Read a character from response buffer but does not move the pointer.
- @return character
- */
- int peek();
-
- /** Flush response buffer
- */
- void flush();
-
- /** Stop client
- */
- void stop();
-
- /** Get socket
- @return socket
- */
- inline int getSocket(){return (int)mySocket;};
-
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3MobileDataNetworkProvider.cpp b/libraries/GSM/src/GSM3MobileDataNetworkProvider.cpp
deleted file mode 100644
index c57c341687..0000000000
--- a/libraries/GSM/src/GSM3MobileDataNetworkProvider.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-// GSM3MobileDataNetworkProvider* theGSM3MobileDataNetworkProvider;
diff --git a/libraries/GSM/src/GSM3MobileDataNetworkProvider.h b/libraries/GSM/src/GSM3MobileDataNetworkProvider.h
deleted file mode 100644
index bffd381fa7..0000000000
--- a/libraries/GSM/src/GSM3MobileDataNetworkProvider.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILEDATANETWORKPROVIDER_
-#define _GSM3MOBILEDATANETWORKPROVIDER_
-
-#include
-
-// This class is not really useful, but serves as a guideline for programmers
-// We keep it but it should never be linked
-class GSM3MobileDataNetworkProvider
-{
- public:
-
- /** Attach to GPRS/GSM network
- @param networkId APN GPRS
- @param user Username
- @param pass Password
- @return connection status
- */
- virtual GSM3_NetworkStatus_t networkAttach(char* networId, char* user, char* pass)=0;
-
- /** Detach GPRS/GSM network
- @return connection status
- */
- virtual GSM3_NetworkStatus_t networkDetach()=0;
-
-};
-
-extern GSM3MobileDataNetworkProvider* theGSM3MobileDataNetworkProvider;
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3MobileMockupProvider.cpp b/libraries/GSM/src/GSM3MobileMockupProvider.cpp
deleted file mode 100644
index e3eba258d3..0000000000
--- a/libraries/GSM/src/GSM3MobileMockupProvider.cpp
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-//#include
-#include
-
-
-GSM3MobileMockupProvider::GSM3MobileMockupProvider()
-{
- lineStatus=IDLE;
- msgExample="Hello#World";
- msgIndex=0;
-}
-
-int GSM3MobileMockupProvider::begin(char* pin)
-{
- Serial.println("GSM3MobileMockupProvider::begin()");
- return 0;
-}
-
-int GSM3MobileMockupProvider::ready()
-{
- Serial.println("GSM3MobileMockupProvider::ready()");
- return 1;
-}
-
-int GSM3MobileMockupProvider::beginSMS(const char* number)
-{
- Serial.println("SM3MobileMockupProvider::beginSMS()");
- return 0;
-}
-
-void GSM3MobileMockupProvider::writeSMS(char c)
-{
- Serial.print(c);
-}
-
-int GSM3MobileMockupProvider::endSMS()
-{
- Serial.println("GSM3MobileMockupProvider::endSMS()");
- return 1;
-}
-
-int GSM3MobileMockupProvider::availableSMS()
-{
- Serial.println("GSM3MobileMockupProvider::availableSMS()");
- return 120;
-}
-
-int GSM3MobileMockupProvider::peek()
-{
- return (int)'H';
-}
-
-int GSM3MobileMockupProvider::remoteSMSNumber(char* number, int nlength)
-{
- if(nlength>=13)
- strcpy(number, "+34630538546");
- return 12;
-}
-
-
-void GSM3MobileMockupProvider::flushSMS()
-{
- Serial.println("GSM3MobileMockupProvider::flushSMS()");
-}
-
-int GSM3MobileMockupProvider::readSMS()
-{
- if(msgExample[msgIndex]==0)
- {
- msgIndex=0;
- return 0;
- }
- else
- {
- msgIndex++;
- return msgExample[msgIndex-1];
- };
-}
-
-int GSM3MobileMockupProvider::connectTCPClient(const char* server, int port, int id_socket)
-{
- Serial.println("GSM3MobileMockupProvider::connectTCPClient()");
- Serial.print(server);Serial.print(":");Serial.print(port);Serial.print("-");Serial.println(id_socket);
- return 1;
-}
-
-void GSM3MobileMockupProvider::writeSocket(const uint8_t *buf, size_t size, int id_socket)
-{
- unsigned int i;
- for(i=0;i=minSocket())&&(socket<=maxSocket()))
- return 1;
- else
- return 0;
-};
-*/
-
-int GSM3MobileMockupProvider::readSocket(uint8_t *buf, size_t size, int idsocket)
-{
- unsigned int i;
- unsigned int l=strlen(msgExample);
- for(i=0;(i12))
- strcpy("192.168.1.1", localIP);
- return 1;
-}
-
-bool GSM3MobileMockupProvider::getSocketModemStatus(uint8_t s)
-{
- // Feeling lazy
- return true;
-}
-
diff --git a/libraries/GSM/src/GSM3MobileMockupProvider.h b/libraries/GSM/src/GSM3MobileMockupProvider.h
deleted file mode 100644
index 90bacbc5ef..0000000000
--- a/libraries/GSM/src/GSM3MobileMockupProvider.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILEMOCKUPPROVIDER_
-#define _GSM3MOBILEMOCKUPPROVIDER_
-
-#include
-#include
-
-class GSM3MobileMockupProvider: public GSM3MobileNetworkProvider
-{
- private:
- // Introducing this status is quite "heavy". But something like this should
- // be added to ShieldV1. Or not.
- // Note, in ShieldV1 there is no "RECEIVINGSMS" status.
- enum GSM3_modemlinest_e { IDLE, WAITINGANSWER, SENDINGSMS};
- GSM3_modemlinest_e lineStatus;
- const char* msgExample;
- int msgIndex;
-
- public:
-
- /** Minimum socket
- @return 1
- */
- inline int minSocket(){return 1;};
-
- /** Maximum socket
- @return 8
- */
- inline int maxSocket(){return 8;};
-
- /** Constructor */
- GSM3MobileMockupProvider();
-
- /** Get network status
- @return network status
- */
- inline GSM3_NetworkStatus_t getStatus(){return GSM_ERROR;};
-
- /** Get voice call status
- @return call status
- */
- inline GSM3_voiceCall_st getvoiceCallStatus(){return IDLE_CALL;};
-
- /** Get last command status
- @return Returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
- inline void closeCommand(int code){};
-
- //Configuration functions.
-
- /** Begin connection
- @param pin PIN code
- @return
- */
- int begin(char* pin=0);
-
- /** Check if is modem alive
- @return 0
- */
- inline int isModemAlive(){return 0;};
-
- /** Shutdown the modem (power off really)
- @return true if successful
- */
- inline bool shutdown(){return false;};
-
- //Call functions
-
- /** Launch a voice call
- @param number Phone number to be called
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- inline int voiceCall(const char* number){return 0;};
-
- /** Answer a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- inline int answerCall(){return 0;};
-
- /** Hang a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- inline int hangCall(){return 0;};
-
- /** Retrieve phone number of caller
- @param buffer Buffer for copy phone number
- @param bufsize Buffer size
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- inline int retrieveCallingNumber(char* buffer, int*& bufsize){return 0;};
-
- // SMS functions
-
- /** Begin a SMS to send it
- @param number Destination
- @return error command if it exists
- */
- int beginSMS(const char* number);
-
- /** End SMS
- @return error command if it exists
- */
- int endSMS();
-
- /** Check if SMS available and prepare it to be read
- @return error command if it exists
- */
- int availableSMS();
-
- /** Read a byte but do not advance the buffer header (circular buffer)
- @return character
- */
- int peek();
-
- /** Delete the SMS from Modem memory and proccess answer
- */
- void flushSMS();
-
- /** Read sender number phone
- @param number Buffer for save number phone
- @param nlength Buffer length
- @return 1 success, >1 error
- */
- int remoteSMSNumber(char* number, int nlength);
-
- /** Read one char for SMS buffer (advance circular buffer)
- @return character
- */
- int readSMS();
-
- /** Write a SMS character by character
- @param c Character
- */
- void writeSMS(char c);
-
- // Socket functions
-
- /** Connect to a remote TCP server
- @param server String with IP or server name
- @param port Remote port number
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int connectTCPClient(const char* server, int port, int id_socket);
-
- // Attention to parameter rewriting in ShieldV1
- /** Write buffer information into a socket
- @param buf Buffer
- @param size Buffer size
- @param idsocket Socket
- */
- void writeSocket(const uint8_t *buf, size_t size, int idsocket);
-
- // ShieldV1 will have two reading mechanisms:
- // Mechanism 1: Call AT+QIRD for size bytes. Put them in the circular buffer,
- // fill buf. Take care to xon/xoff effect, as we may copy just a part of the
- // incoming bytes.
- /** Read socket and put information in a buffer
- @param buf Buffer
- @param size Buffer size
- @param idsocket Socket
- @return
- */
- int readSocket(uint8_t *buf, size_t size, int idsocket);
-
- // Mechanism 2 in ShieldV1:
- // When called "available()" or "read()" reuse readSocket code to execute
- // QIRD SYNCHRONOUSLY. Ask the modem for 1500 bytes but do not copy them anywhere,
- // leave data in the circular buffer. Put buffer head at the start of received data.
- // Peek() will get a character but will not advance the buffer head.
- // Read() will get one character. XON/XOFF will take care of buffer filling
- // If Read() gets to the end of the QIRD response, execute again QIRD SYNCHRONOUSLY
- // If the user executes flush(), execute read() until there is nothing more to read()
- // (the modem gives no way to empty the socket of incoming data)
-
- /** Check if there are data to be read in socket.
- @param idsocket Local socket number
- @return 0 if command running, 1 if there are data available, 4 if no data, otherwise error
- */
- int availableSocket(int idsocket);
-
- /** Read data (get a character) available in socket
- @param idsocket Socket
- @param advance Determines if advance the buffer head
- @return character
- */
- int readSocket(int idsocket, bool advance=true);
-
- /** Flush socket
- @param idsocket Socket
- */
- void flushSocket(int idsocket);
-
- // This is the same in ShieldV1
- /** Close a socket
- @param idsocket Socket
- @return 0 if command running, 1 if success, otherwise error
- */
- int disconnectTCP(int idsocket);
-
- // TCP Server. Attention. Changing the int*&. We'll receive a buffer for the IP
- // If the pointer ins NULL just forget it
- // I think that opening a server does not occupy a socket. Is that true?
- /** Establish a TCP connection
- @param port Port
- @param localIP IP address
- @param localIPlength IP address size in characters
- @return command error if exists
- */
- int connectTCPServer(int port, char* localIP, int* localIPlength);
-
- // Modem sockets status. Return TRUE if the modem thinks the socket is occupied.
- // This should be detected through an unrequisited response
- /** Get modem status
- @param s Socket
- @return modem status (true if connected)
- */
- bool getSocketModemStatus(uint8_t s);
-
-
-};
-#endif
diff --git a/libraries/GSM/src/GSM3MobileNetworkProvider.cpp b/libraries/GSM/src/GSM3MobileNetworkProvider.cpp
deleted file mode 100644
index c9fe01af31..0000000000
--- a/libraries/GSM/src/GSM3MobileNetworkProvider.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3MobileNetworkProvider* theProvider;
-
-GSM3MobileNetworkProvider::GSM3MobileNetworkProvider()
-{
- socketsAsServer=0x0000;
-};
-
-
-int GSM3MobileNetworkProvider::getNewOccupiedSocketAsServer()
-{
- int i;
- for(i=minSocketAsServer(); i<=maxSocketAsServer(); i++)
- {
- if ((!(socketsAsServer&(0x0001<
-#include
-#include
-#include
-
-class GSM3MobileNetworkProvider
-{
- private:
-
- /** Restart hardware
- @return 1 if successful
- */
- int HWrestart();
-
- uint16_t socketsAsServer; // Server socket
-
- /** Get modem status
- @param s Socket
- @return modem status (true if connected)
- */
- virtual inline bool getSocketAsServerModemStatus(int s){return false;};
-
- public:
-
- /** minSocketAsServer
- @return 0
- */
- virtual inline int minSocketAsServer(){return 0;};
-
- /** maxSocketAsServer
- @return 0
- */
- virtual inline int maxSocketAsServer(){return 0;};
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-
- /** Constructor */
- GSM3MobileNetworkProvider();
-
- /** Get network status
- @return network status
- */
- virtual inline GSM3_NetworkStatus_t getStatus(){return GSM_ERROR;};
-
- /** Get socket client status
- @param socket Socket
- @return 1 if connected, 0 otherwise
- */
- bool getStatusSocketClient(uint8_t socket);
-
- /** Close a AT command
- @param code Close code
- */
- virtual inline void closeCommand(int code){};
-
- /** Establish a TCP connection
- @param port Port
- @param localIP IP address
- @param localIPlength IP address size in characters
- @return command error if exists
- */
- virtual inline int connectTCPServer(int port, char* localIP, int localIPlength){return 0;};
-
- /** Get local IP address
- @param LocalIP Buffer for save IP address
- @param LocalIPlength Buffer size
- */
- virtual inline int getIP(char* LocalIP, int LocalIPlength){return 0;};
-
- /** Get new occupied socket
- @return -1 if no new socket has been occupied
- */
- int getNewOccupiedSocketAsServer();
-
- /** Get socket status as server
- @param socket Socket to get status
- @return socket status
- */
- bool getStatusSocketAsServer(uint8_t socket);
-
- /** Close a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int disconnectTCP(bool client1Server0, int idsocket){return 1;};
-
- /** Release socket
- @param socket Socket
- */
- void releaseSocket(int socket){};
-
-};
-
-extern GSM3MobileNetworkProvider* theProvider;
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileNetworkRegistry.cpp b/libraries/GSM/src/GSM3MobileNetworkRegistry.cpp
deleted file mode 100644
index 5e22f3af81..0000000000
--- a/libraries/GSM/src/GSM3MobileNetworkRegistry.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3MobileNetworkRegistry::GSM3MobileNetworkRegistry()
-{
- theProvider=0;
-};
-
-void GSM3MobileNetworkRegistry::registerMobileNetworkProvider(GSM3MobileNetworkProvider* provider)
-{
- theProvider=provider;
-}
-
-GSM3MobileNetworkProvider* GSM3MobileNetworkRegistry::getMobileNetworkProvider()
-{
- return theProvider;
-}
-
-GSM3MobileNetworkRegistry theMobileNetworkRegistry;
diff --git a/libraries/GSM/src/GSM3MobileNetworkRegistry.h b/libraries/GSM/src/GSM3MobileNetworkRegistry.h
deleted file mode 100644
index de4397725f..0000000000
--- a/libraries/GSM/src/GSM3MobileNetworkRegistry.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILENETWORKREGISTRY_
-#define _GSM3MOBILENETWORKREGISTRY_
-#include
-
-class GSM3MobileNetworkRegistry
-{
- private:
-
- GSM3MobileNetworkProvider* theProvider; // Network provider
-
- public:
-
- /** Constructor */
- GSM3MobileNetworkRegistry();
-
- /** Register in mobile network provider
- @param provider Provider
- */
- void registerMobileNetworkProvider(GSM3MobileNetworkProvider* provider);
-
- /** Returns network provider object pointer
- @return mobile network provider
- */
- GSM3MobileNetworkProvider* getMobileNetworkProvider();
-
-};
-
-extern GSM3MobileNetworkRegistry theMobileNetworkRegistry;
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3MobileSMSProvider.cpp b/libraries/GSM/src/GSM3MobileSMSProvider.cpp
deleted file mode 100644
index e5575ceb87..0000000000
--- a/libraries/GSM/src/GSM3MobileSMSProvider.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3MobileSMSProvider* theGSM3SMSProvider;
diff --git a/libraries/GSM/src/GSM3MobileSMSProvider.h b/libraries/GSM/src/GSM3MobileSMSProvider.h
deleted file mode 100644
index aa72711014..0000000000
--- a/libraries/GSM/src/GSM3MobileSMSProvider.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILESMSPROVIDER_
-#define _GSM3MOBILESMSPROVIDER_
-
-class GSM3MobileSMSProvider
-{
- public:
-
- /** Begin a SMS to send it
- @param to Destination
- @return error command if it exists
- */
- virtual inline int beginSMS(const char* to){return 0;};
-
- /** Write a SMS character by character
- @param c Character
- */
- virtual inline void writeSMS(const char c){};
-
- /** End SMS
- @return error command if it exists
- */
- virtual inline int endSMS(){return 0;};
-
- /** Check if SMS available and prepare it to be read
- @return number of bytes in a received SMS
- */
- virtual inline int availableSMS(){return 0;};
-
- /** Read a byte but do not advance the buffer header (circular buffer)
- @return character
- */
- virtual inline int peekSMS(){return 0;};
-
- /** Delete the SMS from Modem memory and proccess answer
- */
- virtual inline void flushSMS(){return;};
-
- /** Read sender number phone
- @param number Buffer for save number phone
- @param nlength Buffer length
- @return 1 success, >1 error
- */
- virtual inline int remoteSMSNumber(char* number, int nlength){return 0;};
-
- /** Read one char for SMS buffer (advance circular buffer)
- @return character
- */
- virtual inline int readSMS(){return 0;};
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-};
-
-extern GSM3MobileSMSProvider* theGSM3SMSProvider;
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileServerProvider.cpp b/libraries/GSM/src/GSM3MobileServerProvider.cpp
deleted file mode 100644
index d101bbab2a..0000000000
--- a/libraries/GSM/src/GSM3MobileServerProvider.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#include
-
-GSM3MobileServerProvider* theGSM3MobileServerProvider;
-
-
diff --git a/libraries/GSM/src/GSM3MobileServerProvider.h b/libraries/GSM/src/GSM3MobileServerProvider.h
deleted file mode 100644
index e4eb9c5030..0000000000
--- a/libraries/GSM/src/GSM3MobileServerProvider.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_MOBILESERVERPROVIDER__
-#define __GSM3_MOBILESERVERPROVIDER__
-
-
-#include
-#include
-#include
-
-
-class GSM3MobileServerProvider
-{
- /** Get socket status
- @param s Socket
- @return modem status (true if connected)
- */
- virtual bool getSocketAsServerModemStatus(int s)=0;
-
- public:
-
- /** minSocketAsServer
- @return socket
- */
- virtual int minSocketAsServer()=0;
-
- /** maxSocketAsServer
- @return socket
- */
- virtual int maxSocketAsServer()=0;
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-
- /** Constructor */
- GSM3MobileServerProvider(){};
-
- /** Connect server to TCP port
- @param port TCP port
- @return command error if exists
- */
- virtual int connectTCPServer(int port)=0;
- //virtual int getIP(char* LocalIP, int LocalIPlength)=0;
-
- /** Get new occupied socket as server
- @return return -1 if no new socket has been occupied
- */
- virtual int getNewOccupiedSocketAsServer()=0;
-
- /** Get socket status
- @param socket Socket
- @return socket status (true if connected)
- */
- virtual bool getStatusSocketAsServer(uint8_t socket)=0;
-
- // virtual int disconnectTCP(bool client1Server0, int idsocket)=0;
-
-};
-
-extern GSM3MobileServerProvider* theGSM3MobileServerProvider;
-
-#endif
diff --git a/libraries/GSM/src/GSM3MobileServerService.cpp b/libraries/GSM/src/GSM3MobileServerService.cpp
deleted file mode 100644
index 861bf5d05b..0000000000
--- a/libraries/GSM/src/GSM3MobileServerService.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-
-#define __TOUTSERVER__ 10000
-#define BUFFERSIZETWEET 100
-
-#define GSM3MOBILESERVERSERVICE_SYNCH 0x01 // 1: TRUE, compatible with other clients 0: FALSE
-
-// While there is only a shield (ShieldV1) we will include it by default
-#include
-GSM3ShieldV1ServerProvider theShieldV1ServerProvider;
-
-
-GSM3MobileServerService::GSM3MobileServerService(uint8_t port, bool synch)
-{
- mySocket=0;
- _port=port;
- flags = 0;
-
- // If synchronous
- if(synch)
- flags |= GSM3MOBILESERVERSERVICE_SYNCH;
-}
-
-// Returns 0 if last command is still executing
-// 1 if success
-// >1 if error
-int GSM3MobileServerService::ready()
-{
- return theGSM3MobileServerProvider->ready();
-}
-
-void GSM3MobileServerService::begin()
-{
- if(theGSM3MobileServerProvider==0)
- return;
- theGSM3MobileServerProvider->connectTCPServer(_port);
-
- if(flags & GSM3MOBILESERVERSERVICE_SYNCH)
- waitForAnswer();
-}
-
-GSM3MobileClientService GSM3MobileServerService::available(bool synch)
-{
- int newSocket;
- // In case we are debugging, we'll need to force a look at the buffer
- ready();
-
- newSocket=theGSM3MobileServerProvider->getNewOccupiedSocketAsServer();
-
- // Instatiate new client. If we are synch, the client is synchronous/blocking
- GSM3MobileClientService client((uint8_t)(newSocket), (flags & GSM3MOBILESERVERSERVICE_SYNCH));
-
- return client;
-}
-
-size_t GSM3MobileServerService::write(uint8_t c)
-{
-// Adapt to the new, lean implementation
-// theGSM3MobileServerProvider->writeSocket(c);
- return 1;
-}
-
-void GSM3MobileServerService::beginWrite()
-{
-// Adapt to the new, lean implementation
-// theGSM3MobileServerProvider->beginWriteSocket(local1Remote0, mySocket);
-}
-
-size_t GSM3MobileServerService::write(const uint8_t* buf)
-{
-// Adapt to the new, lean implementation
-// theGSM3MobileServerProvider->writeSocket((const char*)(buf));
- return strlen((const char*)buf);
-}
-
-size_t GSM3MobileServerService::write(const uint8_t* buf, size_t sz)
-{
-// Adapt to the new, lean implementation
-// theGSM3MobileServerProvider->writeSocket((const char*)(buf));
- return strlen((const char*)buf);
-}
-
-void GSM3MobileServerService::endWrite()
-{
-// Adapt to the new, lean implementation
-// theGSM3MobileServerProvider->endWriteSocket();
-}
-
-void GSM3MobileServerService::stop()
-{
-
- // Review, should be the server?
- theGSM3MobileClientProvider->disconnectTCP(local1Remote0, mySocket);
- if(flags & GSM3MOBILESERVERSERVICE_SYNCH)
- waitForAnswer();
- theGSM3MobileClientProvider->releaseSocket(mySocket);
- mySocket = -1;
-}
-
-
-/*int GSM3MobileServerService::getIP(char* LocalIP, int LocalIPlength)
-{
- return theGSM3MobileServerProvider->getIP(LocalIP, LocalIPlength);
-}*/
-
-int GSM3MobileServerService::waitForAnswer()
-{
- unsigned long m;
- m=millis();
- int res;
-
- while(((millis()-m)< __TOUTSERVER__ )&&(ready()==0))
- delay(10);
-
- res=ready();
-
- // If we get something different from a 1, we are having a problem
- if(res!=1)
- res=0;
-
- return res;
-}
-
-
diff --git a/libraries/GSM/src/GSM3MobileServerService.h b/libraries/GSM/src/GSM3MobileServerService.h
deleted file mode 100644
index 12165eed1b..0000000000
--- a/libraries/GSM/src/GSM3MobileServerService.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILESERVERSERVICE_
-#define _GSM3MOBILESERVERSERVICE_
-
-#include
-#include
-#include
-
-class GSM3MobileServerService : public Server
-{
- private:
-
- uint8_t _port; // Port
- uint8_t mySocket; // Actual socket
- uint8_t flags;
- bool local1Remote0;
-
- /** Internal utility, used in synchronous calls
- @return operation result, 1 if success, 0 otherwise
- */
- int waitForAnswer();
-
- public:
-
- /** Constructor
- @param port Port
- @param synch True if the server acts synchronously
- */
- GSM3MobileServerService(uint8_t port, bool synch=true);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
-
- /** Initialize server
- */
- void begin();
-
- /** Check if there is an incoming client request
- @param synch If true, the returned client is synchronous or
- blocking.
- @return Client if successful, else error
- */
- GSM3MobileClientService available(bool synch=true);
-
- // Just to keep in line with Ethernet.
- // Write to every open socket...
- //void write(uint8_t);
- //void write(const uint8_t *buf, size_t size);
-
- /** Begin write in socket
- */
- void beginWrite();
-
- /** Write character in socket
- @param c Character
- @return size
- */
- size_t write(uint8_t c);
-
- /** Write buffer in socket
- @param buf Buffer
- @return size
- */
- size_t write(const uint8_t *buf);
-
- /** Write buffer in socket with size
- @param buf Buffer
- @param sz Buffer size
- @return size
- */
- size_t write(const uint8_t *buf, size_t sz);
-
- /** End write in socket
- */
- void endWrite();
-
- /** Stop server
- */
- void stop();
-
- // we take this function out as IPAddress is complex to bring to
- // version 1.
- // inline int connect(IPAddress ip, uint16_t port){return 0;};
- // Returns 2 if there are no resources
- //int getIP(char* LocalIP, int LocalIPlength);
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3MobileVoiceProvider.cpp b/libraries/GSM/src/GSM3MobileVoiceProvider.cpp
deleted file mode 100644
index 57c132932d..0000000000
--- a/libraries/GSM/src/GSM3MobileVoiceProvider.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-//GSM3MobileVoiceProvider* theGSM3MobileVoiceProvider;
diff --git a/libraries/GSM/src/GSM3MobileVoiceProvider.h b/libraries/GSM/src/GSM3MobileVoiceProvider.h
deleted file mode 100644
index add06c19f0..0000000000
--- a/libraries/GSM/src/GSM3MobileVoiceProvider.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3MOBILEVOICEPROVIDER_
-#define _GSM3MOBILEVOICEPROVIDER_
-
-enum GSM3_voiceCall_st { IDLE_CALL, CALLING, RECEIVINGCALL, TALKING};
-
-class GSM3MobileVoiceProvider
-{
- public:
-
- /** Initialize the object relating it to the general infrastructure
- @param
- @return void
- */
- virtual void initialize(){};
-
- /** Launch a voice call
- @param number Phone number to be called
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- virtual int voiceCall(const char* number)=0;
-
- /** Answer a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- virtual int answerCall()=0;
-
- /** Hang a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- virtual int hangCall()=0;
-
- /** Retrieve phone number of caller
- @param buffer Buffer for copy phone number
- @param bufsize Buffer size
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- virtual int retrieveCallingNumber(char* buffer, int bufsize)=0;
-
- /** Returns voice call status
- @return voice call status
- */
- virtual GSM3_voiceCall_st getvoiceCallStatus()=0;
-
- /** Set voice call status
- @param status New status for voice call
- */
- virtual void setvoiceCallStatus(GSM3_voiceCall_st status)=0;
-
- /** Get last command status
- @return Returns 0 if last command is still executing, 1 success, >1 error
- */
- virtual int ready()=0;
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3SMSService.cpp b/libraries/GSM/src/GSM3SMSService.cpp
deleted file mode 100644
index 378dc2cc82..0000000000
--- a/libraries/GSM/src/GSM3SMSService.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-// While there is only a shield (ShieldV1) we will include it by default
-#include
-GSM3ShieldV1SMSProvider theShieldV1SMSProvider;
-
-#define GSM3SMSSERVICE_SYNCH 0x01 // 1: synchronous 0: asynchronous
-#define __TOUT__ 10000
-
-
-GSM3SMSService::GSM3SMSService(bool synch)
-{
- if(synch)
- flags |= GSM3SMSSERVICE_SYNCH;
-}
-
-// Returns 0 if last command is still executing
-// 1 if success
-// >1 if error
-int GSM3SMSService::ready()
-{
- return theGSM3SMSProvider->ready();
-}
-
-int GSM3SMSService::beginSMS(const char *number)
-{
- return waitForAnswerIfNeeded(theGSM3SMSProvider->beginSMS(number));
-};
-
-int GSM3SMSService::endSMS()
-{
- return waitForAnswerIfNeeded(theGSM3SMSProvider->endSMS());
-};
-
-size_t GSM3SMSService::write(uint8_t c)
-{
- theGSM3SMSProvider->writeSMS(c);
- return 1;
-}
-
-void GSM3SMSService::flush()
-{
- theGSM3SMSProvider->flushSMS();
- waitForAnswerIfNeeded(1);
-};
-
-int GSM3SMSService::available()
-{
- return waitForAnswerIfNeeded(theGSM3SMSProvider->availableSMS());
-};
-
-int GSM3SMSService::remoteNumber(char* number, int nlength)
-{
- return theGSM3SMSProvider->remoteSMSNumber(number, nlength);
-
-}
-
-int GSM3SMSService::read()
-{
- return theGSM3SMSProvider->readSMS();
-};
-int GSM3SMSService::peek()
-{
- return theGSM3SMSProvider->peekSMS();
-};
-
-int GSM3SMSService::waitForAnswerIfNeeded(int returnvalue)
-{
- // If synchronous
- if(flags & GSM3SMSSERVICE_SYNCH )
- {
- unsigned long m;
- m=millis();
- // Wait for __TOUT__
- while(((millis()-m)< __TOUT__ )&&(ready()==0))
- delay(100);
- // If everything was OK, return 1
- // else (timeout or error codes) return 0;
- if(ready()==1)
- return 1;
- else
- return 0;
- }
- // If not synchronous just kick ahead the coming result
- return ready();
-}
-
-
-
-
-
diff --git a/libraries/GSM/src/GSM3SMSService.h b/libraries/GSM/src/GSM3SMSService.h
deleted file mode 100644
index 878be114b2..0000000000
--- a/libraries/GSM/src/GSM3SMSService.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SMSSERVICE_
-#define _GSM3SMSSERVICE_
-
-#include
-#include
-
-class GSM3SMSService : public Stream
-{
- private:
-
- uint8_t flags;
-
- /** Makes synchronous the functions, if needed
- @param returnvalue Return value
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int waitForAnswerIfNeeded(int returnvalue);
-
- public:
-
- /** Constructor
- @param synch Determines sync mode
- */
- GSM3SMSService(bool synch=true);
-
- /** Write a character in SMS message
- @param c Character
- @return size
- */
- size_t write(uint8_t c);
-
- /** Begin a SMS to send it
- @param to Destination
- @return error command if it exists
- */
- int beginSMS(const char* to);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
-
- /** End SMS
- @return error command if it exists
- */
- int endSMS();
-
- /** Check if SMS available and prepare it to be read
- @return number of bytes in a received SMS
- */
- int available();
-
- /** Read sender number phone
- @param number Buffer for save number phone
- @param nlength Buffer length
- @return 1 success, >1 error
- */
- int remoteNumber(char* number, int nlength);
-
- /** Read one char for SMS buffer (advance circular buffer)
- @return byte
- */
- int read();
-
- /** Read a byte but do not advance the buffer header (circular buffer)
- @return byte
- */
- int peek();
-
- /** Delete the SMS from Modem memory and proccess answer
- */
- void flush();
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1.cpp b/libraries/GSM/src/GSM3ShieldV1.cpp
deleted file mode 100644
index b478472aa3..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-#define __RESETPIN__ 7
-#define __TOUTLOCALCOMS__ 500
-#define __TOUTSHUTDOWN__ 5000
-#define __TOUTMODEMCONFIGURATION__ 5000//equivalent to 30000 because of time in interrupt routine.
-#define __TOUTAT__ 1000
-#define __TOUTSMS__ 7000
-#define __TOUTCALL__ 15000
-#define __TOUTGPRS__ 10000
-#define __NCLIENTS_MAX__ 3
-
-//Constructor.
-GSM3ShieldV1::GSM3ShieldV1(bool db)
-{
- theGSM3ShieldV1ModemCore.setCommandCounter(1);
- socketsAccepted=0;
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
- theProvider=this;
-}
-
-//Response management.
-void GSM3ShieldV1::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
-
- default:
- break;
- }
-}
-
-//Function for 2 sec delay inside an interruption.
-void GSM3ShieldV1::delayInsideInterrupt2seg()
-{
- for (int k=0;k<40;k++) theGSM3ShieldV1ModemCore.gss.tunedDelay(50000);
-}
-
-///////////////////////////////////////////////////////UNSOLICITED RESULT CODE (URC) FUNCTIONS///////////////////////////////////////////////////////////////////
-
-//URC recognize.
-bool GSM3ShieldV1::recognizeUnsolicitedEvent(byte oldTail)
-{
-
-//int nlength;
-char auxLocate [15];
- //POWER DOWN.
- prepareAuxLocate(PSTR("POWER DOWN"), auxLocate);
- if(theGSM3ShieldV1ModemCore.gss.cb.locate(auxLocate))
- {
- theGSM3ShieldV1ModemCore.gss.cb.flush();
- return true;
- }
-
- return false;
-}
-
-
-
diff --git a/libraries/GSM/src/GSM3ShieldV1.h b/libraries/GSM/src/GSM3ShieldV1.h
deleted file mode 100644
index db52f7b0e0..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SHIELDV1__
-#define __GSM3_SHIELDV1__
-
-#include
-#include
-#include
-#include
-
-
-class GSM3ShieldV1 : public GSM3MobileNetworkProvider, public GSM3ShieldV1BaseProvider
-{
- // General code, for modem management
- private:
-
- /** Delay inside an interrupt (2 seconds)
- */
- void delayInsideInterrupt2seg();
-
- // Code for SMS Service
- private:
-
-
- long commandMillis;
- bool commandSent;
-
- const char* pinConfig; //PIN.
- char* accessPoint; //APN.
- char* userName; //User.
- char* passw; //Password.
- const char* remoteID; //Server.
-
- char* dataSocket; //Data socket.
- int local_Port; //Local Port.
- char* local_IP; //Local IP.
- int local_IP_Length; //Local IP length.
-
-
- int socketDataSize; //Size of socket data to be read.
- int socketDataSizeWritten; //Number of socket data written in buffer not to overflow the buffer
-
- int socketsAccepted; //Status for remote clients accepted of closed.
-
- public:
-
- /** Constructor **/
- GSM3ShieldV1(bool debug=false);
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Parse modem response
- @param rsp Returns true if expected response exists
- @param string1 Substring expected in response
- @param string2 Second substring expected in response
- @return true if parsed successful
- */
- bool genericParse_rsp2(bool& rsp, char* string1, char* string2);
-
- /** Recognize URC
- @param oldTail
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte oldTail);
-
- /** Receive answer
- @return true if successful
- */
- bool answerReceived();
-
- /** Receive socket
- @param id_socket Socket ID
- @return true if successful
- */
- bool socketReceived(int id_socket);
-
- /** Update active ID sockets
- @param active Active sockets
- @param ID Id for update
- */
- void update_activeIDsockets (bool active, int ID);
-
- /** Assign ID to socket
- @param ID Id to assign to socket
- @return true if successful
- */
- bool assignIDsocket (int& ID);
-
- /** Close data socket
- @return true if successful
- */
- bool closedDataSocket(); //Flag closed current data socket.
-
- //bool writeIncomingCalls(char* bufferForCallerId) If isn't zero, doesn't wait calls
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1AccessProvider.cpp b/libraries/GSM/src/GSM3ShieldV1AccessProvider.cpp
deleted file mode 100644
index 87b5b62d12..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1AccessProvider.cpp
+++ /dev/null
@@ -1,364 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-#include "GSM3IO.h"
-
-#define __TOUTSHUTDOWN__ 5000
-#define __TOUTMODEMCONFIGURATION__ 5000//equivalent to 30000 because of time in interrupt routine.
-#define __TOUTAT__ 1000
-
-const char _command_AT[] PROGMEM = "AT";
-const char _command_CGREG[] PROGMEM = "AT+CGREG?";
-
-
-GSM3ShieldV1AccessProvider::GSM3ShieldV1AccessProvider(bool debug)
-{
- theGSM3ShieldV1ModemCore.setDebug(debug);
-
-}
-
-void GSM3ShieldV1AccessProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case MODEMCONFIG:
- ModemConfigurationContinue();
- break;
- case ALIVETEST:
- isModemAliveContinue();
- break;
-
- default:
- break;
- }
-}
-
-///////////////////////////////////////////////////////CONFIGURATION FUNCTIONS///////////////////////////////////////////////////////////////////
-
-// Begin
-// Restart or start the modem
-// May be synchronous
-GSM3_NetworkStatus_t GSM3ShieldV1AccessProvider::begin(char* pin, bool restart, bool synchronous)
-{
- pinMode(__RESETPIN__, OUTPUT);
-
- #ifdef TTOPEN_V1
- pinMode(__POWERPIN__, OUTPUT);
- digitalWrite(__POWERPIN__, HIGH);
- #endif
-
- // If asked for modem restart, restart
- if (restart)
- HWrestart();
- else
- HWstart();
-
- theGSM3ShieldV1ModemCore.gss.begin(9600);
-
- if(NULL != theGSM3MobileVoiceProvider)
- theGSM3MobileVoiceProvider->linkToModemProvider();
-
- // Launch modem configuration commands
- ModemConfiguration(pin);
- // If synchronous, wait till ModemConfiguration is over
- if(synchronous)
- {
- // if we shorten this delay, the command fails
- while(ready()==0)
- delay(1000);
- }
- return getStatus();
-}
-
-//HWrestart.
-int GSM3ShieldV1AccessProvider::HWrestart()
-{
- #ifdef TTOPEN_V1
- digitalWrite(__POWERPIN__, HIGH);
- delay(1000);
- #endif
-
- theGSM3ShieldV1ModemCore.setStatus(IDLE);
- digitalWrite(__RESETPIN__, HIGH);
- delay(12000);
- digitalWrite(__RESETPIN__, LOW);
- delay(1000);
-
- return 1; //configandwait(pin);
-}
-
-//HWrestart.
-int GSM3ShieldV1AccessProvider::HWstart()
-{
- theGSM3ShieldV1ModemCore.setStatus(IDLE);
- digitalWrite(__RESETPIN__, HIGH);
- delay(2000);
- digitalWrite(__RESETPIN__, LOW);
- //delay(1000);
-
- return 1; //configandwait(pin);
-}
-
-//Initial configuration main function.
-int GSM3ShieldV1AccessProvider::ModemConfiguration(char* pin)
-{
- theGSM3ShieldV1ModemCore.setPhoneNumber(pin);
- theGSM3ShieldV1ModemCore.openCommand(this,MODEMCONFIG);
- theGSM3ShieldV1ModemCore.setStatus(CONNECTING);
- ModemConfigurationContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Initial configuration continue function.
-void GSM3ShieldV1AccessProvider::ModemConfigurationContinue()
-{
- bool resp;
-
- // 1: Send AT
- // 2: Wait AT OK and SetPin or CGREG
- // 3: Wait Pin OK and CGREG
- // 4: Wait CGREG and Flow SW control or CGREG
- // 5: Wait IFC OK and SMS Text Mode
- // 6: Wait SMS text Mode OK and Calling line identification
- // 7: Wait Calling Line Id OK and Echo off
- // 8: Wait for OK and COLP command for connecting line identification.
- // 9: Wait for OK.
- int ct=theGSM3ShieldV1ModemCore.getCommandCounter();
- if(ct==1)
- {
- // Launch AT
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_AT);
- }
- else if(ct==2)
- {
- // Wait for AT - OK.
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // OK received
- if(theGSM3ShieldV1ModemCore.getPhoneNumber() && (theGSM3ShieldV1ModemCore.getPhoneNumber()[0]!=0))
- {
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CPIN="), false);
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- theGSM3ShieldV1ModemCore.genericCommand_rqc(theGSM3ShieldV1ModemCore.getPhoneNumber());
- }
- else
- {
- //DEBUG
- //Serial.println("AT+CGREG?");
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- theGSM3ShieldV1ModemCore.takeMilliseconds();
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_CGREG);
- }
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==3)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- theGSM3ShieldV1ModemCore.takeMilliseconds();
- theGSM3ShieldV1ModemCore.delayInsideInterrupt(2000);
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_CGREG);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==4)
- {
- char auxLocate1 [12];
- char auxLocate2 [12];
- prepareAuxLocate(PSTR("+CGREG: 0,1"), auxLocate1);
- prepareAuxLocate(PSTR("+CGREG: 0,5"), auxLocate2);
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, auxLocate1, auxLocate2))
- {
- if(resp)
- {
- theGSM3ShieldV1ModemCore.setCommandCounter(5);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+IFC=1,1"));
- }
- else
- {
- // If not, launch command again
- if(theGSM3ShieldV1ModemCore.takeMilliseconds() > __TOUTMODEMCONFIGURATION__)
- {
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- else
- {
- theGSM3ShieldV1ModemCore.delayInsideInterrupt(2000);
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_CGREG);
- }
- }
- }
- }
- else if(ct==5)
- {
- // 5: Wait IFC OK
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- //Delay for SW flow control being active.
- theGSM3ShieldV1ModemCore.delayInsideInterrupt(2000);
- // 9: SMS Text Mode
- theGSM3ShieldV1ModemCore.setCommandCounter(6);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CMGF=1"));
- }
- }
- else if(ct==6)
- {
- // 6: Wait SMS text Mode OK
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- //Calling line identification
- theGSM3ShieldV1ModemCore.setCommandCounter(7);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CLIP=1"));
- }
- }
- else if(ct==7)
- {
- // 7: Wait Calling Line Id OK
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Echo off
- theGSM3ShieldV1ModemCore.setCommandCounter(8);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("ATE0"));
- }
- }
- else if(ct==8)
- {
- // 8: Wait ATEO OK, send COLP
- // In Arduino Mega, attention, take away the COLP step
- // It looks as we can only have 8 steps
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- theGSM3ShieldV1ModemCore.setCommandCounter(9);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+COLP=1"));
- }
- }
- else if(ct==9)
- {
- // 9: Wait ATCOLP OK
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if (resp)
- {
- theGSM3ShieldV1ModemCore.setStatus(GSM_READY);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
-}
-
-//Alive Test main function.
-int GSM3ShieldV1AccessProvider::isAccessAlive()
-{
- theGSM3ShieldV1ModemCore.setCommandError(0);
- theGSM3ShieldV1ModemCore.setCommandCounter(1);
- theGSM3ShieldV1ModemCore.openCommand(this,ALIVETEST);
- isModemAliveContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Alive Test continue function.
-void GSM3ShieldV1AccessProvider::isModemAliveContinue()
-{
-bool rsp;
-switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_AT);
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(rsp))
- {
- if (rsp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Shutdown.
-bool GSM3ShieldV1AccessProvider::shutdown()
-{
- unsigned long m;
- bool resp;
- char auxLocate [18];
-
- // It makes no sense to have an asynchronous shutdown
- pinMode(__RESETPIN__, OUTPUT);
- digitalWrite(__RESETPIN__, HIGH);
- delay(1500);
- digitalWrite(__RESETPIN__, LOW);
- theGSM3ShieldV1ModemCore.setStatus(IDLE);
- theGSM3ShieldV1ModemCore.gss.close();
-
- m=millis();
- prepareAuxLocate(PSTR("POWER DOWN"), auxLocate);
- while((millis()-m) < __TOUTSHUTDOWN__)
- {
- delay(1);
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, auxLocate))
- return resp;
- }
- return false;
-}
-
-//Secure shutdown.
-bool GSM3ShieldV1AccessProvider::secureShutdown()
-{
- // It makes no sense to have an asynchronous shutdown
- pinMode(__RESETPIN__, OUTPUT);
- digitalWrite(__RESETPIN__, HIGH);
- delay(900);
- digitalWrite(__RESETPIN__, LOW);
- theGSM3ShieldV1ModemCore.setStatus(OFF);
- theGSM3ShieldV1ModemCore.gss.close();
-
-#ifdef TTOPEN_V1
- _delay_ms(12000);
- digitalWrite(__POWERPIN__, LOW);
-#endif
-
- return true;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1AccessProvider.h b/libraries/GSM/src/GSM3ShieldV1AccessProvider.h
deleted file mode 100644
index 638fb5f176..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1AccessProvider.h
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SHIELDV1ACCESSPROVIDER_
-#define _GSM3SHIELDV1ACCESSPROVIDER_
-
-#include
-#include
-#include
-
-class GSM3ShieldV1AccessProvider : public GSM3MobileAccessProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- /** Initialize main modem configuration
- @param pin PIN code
- @return command error if exists
- */
- int ModemConfiguration(char* pin);
-
- /** Continue to modem configuration function
- */
- void ModemConfigurationContinue();
-
- /** Continue to check if modem alive function
- */
- void isModemAliveContinue();
-
-
- public:
-
- /** Constructor
- @param debug Determines debug mode
- */
-
- GSM3ShieldV1AccessProvider(bool debug=false);
-
- /** Start the GSM/GPRS modem, attaching to the GSM network
- @param pin SIM PIN number (4 digits in a string, example: "1234"). If
- NULL the SIM has no configured PIN.
- @param restart Restart the modem. Default is TRUE. The modem receives
- a signal through the Ctrl/D7 pin. If it is shut down, it will
- start-up. If it is running, it will restart. Takes up to 10
- seconds
- @param synchronous If TRUE the call only returns after the Start is complete
- or fails. If FALSE the call will return inmediately. You have
- to call repeatedly ready() until you get a result. Default is TRUE.
- @return If synchronous, GSM3_NetworkStatus_t. If asynchronous, returns 0.
- */
- GSM3_NetworkStatus_t begin(char* pin=0,bool restart=true, bool synchronous=true);
-
- /** Check network access status
- @return 1 if Alive, 0 if down
- */
- int isAccessAlive();
-
- /** Shutdown the modem (power off really)
- @return true if successful
- */
- bool shutdown();
-
- /** Secure shutdown the modem (power off really)
- @return true if successful
- */
- bool secureShutdown();
-
- /** Returns 0 if last command is still executing
- @return 1 if success, >1 if error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Returns modem status
- @return modem network status
- */
- inline GSM3_NetworkStatus_t getStatus(){return theGSM3ShieldV1ModemCore.getStatus();};
-
- void manageResponse(byte from, byte to);
-
- /** Restart the modem (will shut down if running)
- @return 1 if success, >1 if error
- */
- int HWrestart();
-
- /** Start the modem (will not shut down if running)
- @return 1 if success, >1 if error
- */
- int HWstart();
-
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1BandManagement.cpp b/libraries/GSM/src/GSM3ShieldV1BandManagement.cpp
deleted file mode 100644
index 48132dfb10..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1BandManagement.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3ShieldV1BandManagement::GSM3ShieldV1BandManagement(bool trace): modem(trace)
-{
- quectelStrings[UNDEFINED]="";
- quectelStrings[EGSM_MODE]="\"EGSM_MODE\"";
- quectelStrings[DCS_MODE]="\"DCS_MODE\"";
- quectelStrings[PCS_MODE]="\"PCS_MODE\"";
- quectelStrings[EGSM_DCS_MODE]="\"EGSM_DCS_MODE\"";
- quectelStrings[GSM850_PCS_MODE]="\"GSM850_PCS_MODE\"";
- quectelStrings[GSM850_EGSM_DCS_PCS_MODE]="\"GSM850_EGSM_DCS_PCS_MODE\"";
-}
-
-GSM3_NetworkStatus_t GSM3ShieldV1BandManagement::begin()
-{
- // check modem response
- modem.begin();
-
- // reset hardware
- modem.restartModem();
-
- return IDLE;
-}
-
-String GSM3ShieldV1BandManagement::getBand()
-{
- String modemResponse=modem.writeModemCommand("AT+QBAND?", 2000);
-
- for(GSM3GSMBand i=GSM850_EGSM_DCS_PCS_MODE;i>UNDEFINED;i=(GSM3GSMBand)((int)i-1))
- {
- if(modemResponse.indexOf(quectelStrings[i])>=0)
- return quectelStrings[i];
- }
-
- Serial.print("Unrecognized modem answer:");
- Serial.println(modemResponse);
-
- return "";
-}
-
-bool GSM3ShieldV1BandManagement::setBand(String band)
-{
- String command;
- String modemResponse;
- bool found=false;
-
- command="AT+QBAND=";
- for(GSM3GSMBand i=EGSM_MODE;((i<=GSM850_EGSM_DCS_PCS_MODE)&&(!found));i=(GSM3GSMBand)((int)i+1))
- {
- String aux=quectelStrings[i];
- if(aux.indexOf(band)>=0)
- {
- command+=aux;
- found=true;
- }
- }
-
- if(!found)
- return false;
- // Quad-band takes an awful lot of time
- modemResponse=modem.writeModemCommand(command, 15000);
-
- if(modemResponse.indexOf("QBAND")>=0)
- return true;
- else
- return false;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1BandManagement.h b/libraries/GSM/src/GSM3ShieldV1BandManagement.h
deleted file mode 100644
index 8a17c098c9..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1BandManagement.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3SHIELDV1BANDMANAGEMENT__
-#define __GSM3SHIELDV1BANDMANAGEMENT__
-
-// This class executes band management functions for the ShieldV1
-#include
-
-#define NUMBEROFBANDS 7
-#define GSM_MODE_UNDEFINED "UNDEFINED"
-#define GSM_MODE_EGSM "EGSM_MODE"
-#define GSM_MODE_DCS "DCS_MODE"
-#define GSM_MODE_PCS "PCS_MODE"
-#define GSM_MODE_EGSM_DCS "EGSM_DCS_MODE"
-#define GSM_MODE_GSM850_PCS "GSM850_PCS_MODE"
-#define GSM_MODE_GSM850_EGSM_DCS_PCS "GSM850_EGSM_DCS_PCS_MODE"
-
-typedef enum {UNDEFINED, EGSM_MODE, DCS_MODE, PCS_MODE, EGSM_DCS_MODE, GSM850_PCS_MODE, GSM850_EGSM_DCS_PCS_MODE} GSM3GSMBand;
-
-//
-// These are the bands and scopes:
-//
-// E-GSM(900)
-// DCS(1800)
-// PCS(1900)
-// E-GSM(900)+DCS(1800) ex: Europe
-// GSM(850)+PCS(1900) Ex: USA, South Am.
-// GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)
-
-class GSM3ShieldV1BandManagement
-{
- private:
-
- GSM3ShieldV1DirectModemProvider modem; // Direct access to modem
-
- const char* quectelStrings[NUMBEROFBANDS];// = {"\"EGSM_MODE\"", "\"DCS_MODE\"", "\"PCS_MODE\"",
- //"\"EGSM_DCS_MODE\"", "\"GSM850_PCS_MODE\"",
- //"\"GSM850_EGSM_DCS_PCS_MODE\""};
-
-
- public:
-
- /** Constructor
- @param trace If true, dumps all AT dialogue to Serial
- */
- GSM3ShieldV1BandManagement(bool trace=false);
-
- /** Forces modem hardware restart, so we begin from scratch
- @return always returns IDLE status
- */
- GSM3_NetworkStatus_t begin();
-
- /** Get current modem work band
- @return current modem work band
- */
- String getBand();
-
- /** Changes the modem operating band
- @param band Desired new band
- @return true if success, false otherwise
- */
- bool setBand(String band);
-
-};
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV1BaseProvider.cpp b/libraries/GSM/src/GSM3ShieldV1BaseProvider.cpp
deleted file mode 100644
index a5dd71fc38..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1BaseProvider.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-// Returns 0 if last command is still executing
-// 1 if success
-// >1 if error
-int GSM3ShieldV1BaseProvider::ready()
-{
- theGSM3ShieldV1ModemCore.manageReceivedData();
- return theGSM3ShieldV1ModemCore.getCommandError();
-};
-
-void GSM3ShieldV1BaseProvider::prepareAuxLocate(PGM_P str, char auxLocate[])
-{
- int i=0;
- char c;
-
- do
- {
- c=pgm_read_byte_near(str + i);
- auxLocate[i]=c;
- i++;
- } while (c!=0);
-}
-
diff --git a/libraries/GSM/src/GSM3ShieldV1BaseProvider.h b/libraries/GSM/src/GSM3ShieldV1BaseProvider.h
deleted file mode 100644
index 8f03947cd1..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1BaseProvider.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SHIELDV1BASEPROVIDER_
-#define _GSM3SHIELDV1BASEPROVIDER_
-
-#include
-
-enum GSM3_commandType_e { XON, NONE, MODEMCONFIG, ALIVETEST, BEGINSMS, ENDSMS, AVAILABLESMS, FLUSHSMS,
- VOICECALL, ANSWERCALL, HANGCALL, RETRIEVECALLINGNUMBER,
- ATTACHGPRS, DETACHGPRS, CONNECTTCPCLIENT, DISCONNECTTCP, BEGINWRITESOCKET, ENDWRITESOCKET,
- AVAILABLESOCKET, FLUSHSOCKET, CONNECTSERVER, GETIP, GETCONNECTSTATUS, GETLOCATION, GETICCID};
-
-class GSM3ShieldV1BaseProvider
-{
- public:
-
- /** Get last command status
- @return Returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
-
- /** This function locates strings from PROGMEM in the buffer
- @param str PROGMEN
- @param auxLocate Buffer where to locate strings
- */
- void prepareAuxLocate(PGM_P str, char auxLocate[]);
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- virtual void manageResponse(byte from, byte to);
-
- /** Recognize URC
- @param from
- @return true if successful (default: false)
- */
- virtual bool recognizeUnsolicitedEvent(byte from){return false;};
-
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV1CellManagement.cpp b/libraries/GSM/src/GSM3ShieldV1CellManagement.cpp
deleted file mode 100644
index 2419ed8e6a..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1CellManagement.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-
-GSM3ShieldV1CellManagement::GSM3ShieldV1CellManagement()
-{
-}
-
-bool GSM3ShieldV1CellManagement::parseQCCID_available(bool& rsp)
-{
- char c;
- bool iccidFound = false;
- int i = 0;
-
- while(((c = theGSM3ShieldV1ModemCore.theBuffer().read()) != 0) & (i < 19))
- {
- if((c < 58) & (c > 47))
- iccidFound = true;
-
- if(iccidFound)
- {
- bufferICCID[i] = c;
- i++;
- }
- }
- bufferICCID[i]=0;
-
- return true;
-}
-
-bool GSM3ShieldV1CellManagement::parseQENG_available(bool& rsp)
-{
- char c;
- char location[50] = "";
- int i = 0;
-
- if (!(theGSM3ShieldV1ModemCore.theBuffer().chopUntil("+QENG: ", true)))
- rsp = false;
- else
- rsp = true;
-
- if (!(theGSM3ShieldV1ModemCore.theBuffer().chopUntil("+QENG:", true)))
- rsp = false;
- else
- rsp = true;
-
- while(((c = theGSM3ShieldV1ModemCore.theBuffer().read()) != 0) & (i < 50))
- {
- location[i] = c;
- i++;
- }
- location[i]=0;
-
- char* res_tok = strtok(location, ",");
- res_tok=strtok(NULL, ",");
- strcpy(countryCode, res_tok);
- res_tok=strtok(NULL, ",");
- strcpy(networkCode, res_tok);
- res_tok=strtok(NULL, ",");
- strcpy(locationArea, res_tok);
- res_tok=strtok(NULL, ",");
- strcpy(cellId, res_tok);
-
- return true;
-}
-
-int GSM3ShieldV1CellManagement::getLocation(char *country, char *network, char *area, char *cell)
-{
- if((theGSM3ShieldV1ModemCore.getStatus() != GSM_READY) && (theGSM3ShieldV1ModemCore.getStatus() != GPRS_READY))
- return 2;
-
- countryCode=country;
- networkCode=network;
- locationArea=area;
- cellId=cell;
-
- theGSM3ShieldV1ModemCore.openCommand(this,GETLOCATION);
- getLocationContinue();
-
- unsigned long timeOut = millis();
- while(((millis() - timeOut) < 5000) & (ready() == 0));
-
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-void GSM3ShieldV1CellManagement::getLocationContinue()
-{
- bool resp;
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.gss.tunedDelay(3000);
- delay(3000);
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QENG=1"), false);
- theGSM3ShieldV1ModemCore.print("\r");
- break;
- case 2:
- if (theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- theGSM3ShieldV1ModemCore.gss.tunedDelay(3000);
- delay(3000);
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QENG?"), false);
- theGSM3ShieldV1ModemCore.print("\r");
- }
- else theGSM3ShieldV1ModemCore.closeCommand(1);
- break;
- case 3:
- if (resp)
- {
- parseQENG_available(resp);
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(2);
- break;
- }
-}
-
-int GSM3ShieldV1CellManagement::getICCID(char *iccid)
-{
- if((theGSM3ShieldV1ModemCore.getStatus() != GSM_READY) && (theGSM3ShieldV1ModemCore.getStatus() != GPRS_READY))
- return 2;
-
- bufferICCID=iccid;
- theGSM3ShieldV1ModemCore.openCommand(this,GETICCID);
- getICCIDContinue();
-
- unsigned long timeOut = millis();
- while(((millis() - timeOut) < 5000) & (ready() == 0));
-
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-void GSM3ShieldV1CellManagement::getICCIDContinue()
-{
- bool resp;
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QCCID"), false);
- theGSM3ShieldV1ModemCore.print("\r");
- break;
- case 2:
- if (theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- parseQCCID_available(resp);
- theGSM3ShieldV1ModemCore.closeCommand(2);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(1);
- break;
- }
-}
-
-void GSM3ShieldV1CellManagement::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case GETLOCATION:
- getLocationContinue();
- break;
- case GETICCID:
- getICCIDContinue();
- break;
-
- default:
- break;
- }
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1CellManagement.h b/libraries/GSM/src/GSM3ShieldV1CellManagement.h
deleted file mode 100644
index 78307da3b0..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1CellManagement.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SHIELDV1CELLMANAGEMENT__
-#define __GSM3_SHIELDV1CELLMANAGEMENT__
-
-#include
-#include
-#include
-
-class GSM3ShieldV1CellManagement : public GSM3MobileCellManagement, public GSM3ShieldV1BaseProvider
-{
- public:
-
- /** Constructor
- */
- GSM3ShieldV1CellManagement();
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** getLocation
- @return current cell location
- */
- int getLocation(char *country, char *network, char *area, char *cell);
-
- /** getICCID
- */
- int getICCID(char *iccid);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- private:
-
- char *countryCode;
- char *networkCode;
- char *locationArea;
- char *cellId;
-
- char *bufferICCID;
-
- /** Continue to getLocation function
- */
- void getLocationContinue();
-
- /** Continue to getICCID function
- */
- void getICCIDContinue();
-
- bool parseQENG_available(bool& rsp);
-
- bool parseQCCID_available(bool& rsp);
-
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1ClientProvider.cpp b/libraries/GSM/src/GSM3ShieldV1ClientProvider.cpp
deleted file mode 100644
index 86ad84a58a..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ClientProvider.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-GSM3ShieldV1ClientProvider::GSM3ShieldV1ClientProvider()
-{
- theGSM3MobileClientProvider=this;
-};
-
-//Response management.
-void GSM3ShieldV1ClientProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case CONNECTTCPCLIENT:
- connectTCPClientContinue();
- break;
- case FLUSHSOCKET:
- flushSocketContinue();
- break;
-
- default:
- break;
- }
-}
-
-//Connect TCP main function.
-int GSM3ShieldV1ClientProvider::connectTCPClient(const char* server, int port, int id_socket)
-{
- theGSM3ShieldV1ModemCore.setPort(port);
- idSocket = id_socket;
-
- theGSM3ShieldV1ModemCore.setPhoneNumber((char*)server);
- theGSM3ShieldV1ModemCore.openCommand(this,CONNECTTCPCLIENT);
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
- connectTCPClientContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-int GSM3ShieldV1ClientProvider::connectTCPClient(IPAddress add, int port, int id_socket)
-{
- remoteIP=add;
- theGSM3ShieldV1ModemCore.setPhoneNumber(0);
- return connectTCPClient(0, port, id_socket);
-}
-
-//Connect TCP continue function.
-void GSM3ShieldV1ClientProvider::connectTCPClientContinue()
-{
- bool resp;
- // 0: Dot or DNS notation activation
- // 1: Disable SW flow control
- // 2: Waiting for IFC OK
- // 3: Start-up TCP connection "AT+QIOPEN"
- // 4: Wait for connection OK
- // 5: Wait for CONNECT
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIDNSIP="), false);
- if ((theGSM3ShieldV1ModemCore.getPhoneNumber()!=0)&&
- ((*(theGSM3ShieldV1ModemCore.getPhoneNumber())<'0')||((*(theGSM3ShieldV1ModemCore.getPhoneNumber())>'9'))))
- {
- theGSM3ShieldV1ModemCore.print('1');
- theGSM3ShieldV1ModemCore.print('\r');
- }
- else
- {
- theGSM3ShieldV1ModemCore.print('0');
- theGSM3ShieldV1ModemCore.print('\r');
- }
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- //Response received
- if(resp)
- {
- // AT+QIOPEN
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIOPEN="),false);
- theGSM3ShieldV1ModemCore.print("\"TCP\",\"");
- if(theGSM3ShieldV1ModemCore.getPhoneNumber()!=0)
- {
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPhoneNumber());
- }
- else
- {
- remoteIP.printTo(theGSM3ShieldV1ModemCore);
- }
- theGSM3ShieldV1ModemCore.print('"');
- theGSM3ShieldV1ModemCore.print(',');
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPort());
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
-
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- if(resp)
- {
- // OK Received
- // Great. Go for the next step
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 4:
- char auxLocate [12];
- prepareAuxLocate(PSTR("CONNECT\r\n"), auxLocate);
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp,auxLocate))
- {
- // Response received
- if(resp)
- {
- // Received CONNECT OK
- // Great. We're done
- theGSM3ShieldV1ModemCore.setStatus(TRANSPARENT_CONNECTED);
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil(auxLocate, true);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
-
- }
-}
-
-//Disconnect TCP main function.
-int GSM3ShieldV1ClientProvider::disconnectTCP(bool client1Server0, int id_socket)
-{
- // id Socket does not really mean anything, in this case we have
- // only one socket running
- theGSM3ShieldV1ModemCore.openCommand(this,DISCONNECTTCP);
-
- // If we are not closed, launch the command
-//[ZZ] if(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED)
-// {
- delay(1000);
- theGSM3ShieldV1ModemCore.print("+++");
- delay(1000);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QICLOSE"));
- theGSM3ShieldV1ModemCore.setStatus(GPRS_READY);
-// }
- // Looks like it runs everytime, so we simply flush to death and go on
- do
- {
- // Empty the local buffer, and tell the modem to XON
- // If meanwhile we receive a DISCONNECT we should detect it as URC.
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- // Give some time for the buffer to refill
- delay(100);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }while(theGSM3ShieldV1ModemCore.theBuffer().storedBytes()>0);
-
- theGSM3ShieldV1ModemCore.unRegisterUMProvider(this);
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-
-//Write socket first chain main function.
-void GSM3ShieldV1ClientProvider::beginWriteSocket(bool client1Server0, int id_socket)
-{
-}
-
-
-//Write socket next chain function.
-void GSM3ShieldV1ClientProvider::writeSocket(const char* buf)
-{
- if(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED)
- theGSM3ShieldV1ModemCore.print(buf);
-}
-
-//Write socket character function.
-void GSM3ShieldV1ClientProvider::writeSocket(uint8_t c)
-{
- if(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED)
- theGSM3ShieldV1ModemCore.print((char)c);
-}
-
-//Write socket last chain main function.
-void GSM3ShieldV1ClientProvider::endWriteSocket()
-{
-}
-
-
-//Available socket main function.
-int GSM3ShieldV1ClientProvider::availableSocket(bool client1Server0, int id_socket)
-{
-
- if(!(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED))
- theGSM3ShieldV1ModemCore.closeCommand(4);
-
- if(theGSM3ShieldV1ModemCore.theBuffer().storedBytes())
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(4);
-
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-int GSM3ShieldV1ClientProvider::readSocket()
-{
- char charSocket;
-
- if(theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==/*0*/__BUFFERSIZE__)
- {
- return 0;
- }
-
- charSocket = theGSM3ShieldV1ModemCore.theBuffer().read();
-
- if(theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==100)
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
-
- return charSocket;
-
-}
-
-//Read socket main function.
-int GSM3ShieldV1ClientProvider::peekSocket()
-{
- return theGSM3ShieldV1ModemCore.theBuffer().peek(0);
-}
-
-
-//Flush SMS main function.
-void GSM3ShieldV1ClientProvider::flushSocket()
-{
- theGSM3ShieldV1ModemCore.openCommand(this,FLUSHSOCKET);
-
- flushSocketContinue();
-}
-
-//Send SMS continue function.
-void GSM3ShieldV1ClientProvider::flushSocketContinue()
-{
- // If we have incomed data
- if(theGSM3ShieldV1ModemCore.theBuffer().storedBytes()>0)
- {
- // Empty the local buffer, and tell the modem to XON
- // If meanwhile we receive a DISCONNECT we should detect it as URC.
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- }
- else
- {
- //We're done
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
-}
-
-// URC recognize.
-// Yes, we recognize "closes" in client mode
-bool GSM3ShieldV1ClientProvider::recognizeUnsolicitedEvent(byte oldTail)
-{
- char auxLocate [12];
- prepareAuxLocate(PSTR("CLOSED"), auxLocate);
-
- if((theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED) & theGSM3ShieldV1ModemCore.theBuffer().chopUntil(auxLocate, false, false))
- {
- theGSM3ShieldV1ModemCore.setStatus(GPRS_READY);
- theGSM3ShieldV1ModemCore.unRegisterUMProvider(this);
- return true;
- }
-
- return false;
-}
-
-int GSM3ShieldV1ClientProvider::getSocket(int socket)
-{
- return 0;
-}
-
-void GSM3ShieldV1ClientProvider::releaseSocket(int socket)
-{
-
-}
-
-bool GSM3ShieldV1ClientProvider::getStatusSocketClient(uint8_t socket)
-{
- return (theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED);
-
-};
-
-
-
diff --git a/libraries/GSM/src/GSM3ShieldV1ClientProvider.h b/libraries/GSM/src/GSM3ShieldV1ClientProvider.h
deleted file mode 100644
index fa2f8b58a8..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ClientProvider.h
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SHIELDV1CLIENTPROVIDER__
-#define __GSM3_SHIELDV1CLIENTPROVIDER__
-
-#include
-#include
-
-class GSM3ShieldV1ClientProvider : public GSM3MobileClientProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- int remotePort; //Current operation remote port.
- IPAddress remoteIP; // Remote IP address
- int idSocket; // Remote ID socket.
-
-
- /** Continue to connect TCP client function
- */
- void connectTCPClientContinue();
-
- /** Continue to available socket function
- */
- void availableSocketContinue();
-
- /** Continue to flush socket function
- */
- void flushSocketContinue();
-
- public:
-
- /** Constructor */
- GSM3ShieldV1ClientProvider();
-
- /** minSocket
- @return 0
- */
- int minSocket(){return 0;};
-
- /** maxSocket
- @return 0
- */
- int maxSocket(){return 0;};
-
- /** Connect to a remote TCP server
- @param server String with IP or server name
- @param port Remote port number
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int connectTCPClient(const char* server, int port, int id_socket);
-
- /** Connect to a remote TCP server
- @param add Remote IP address
- @param port Remote port number
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int connectTCPClient(IPAddress add, int port, int id_socket);
-
- /** Begin writing through a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- void beginWriteSocket(bool client1Server0, int id_socket);
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param buf characters to be written (final 0 will not be written)
- */
- void writeSocket(const char* buf);
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param c character to be written
- */
- void writeSocket(uint8_t c);
-
- /** Finish current writing
- */
- void endWriteSocket();
-
- /** Check if there are data to be read in socket.
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if there are data available, 4 if no data, otherwise error
- */
- int availableSocket(bool client, int id_socket); // With "available" and "readSocket" ask the modem for 1500 bytes.
-
- /** Read data (get a character) available in socket
- @return character
- */
- int readSocket(); //If Read() gets to the end of the QIRD response, execute again QIRD SYNCHRONOUSLY
-
- /** Flush socket
- */
- void flushSocket();
-
- /** Get a character but will not advance the buffer head
- @return character
- */
- int peekSocket();
-
- /** Close a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Socket
- @return 0 if command running, 1 if success, otherwise error
- */
- int disconnectTCP(bool client1Server0, int id_socket);
-
- /** Recognize unsolicited event
- @param oldTail
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte from);
-
- /** Manages modem response
- @param from Initial byte position
- @param to Final byte position
- */
- void manageResponse(byte from, byte to);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- // Client socket management, just to be compatible
- // with the Multi option
-
- /** Get socket
- @param socket Socket
- @return socket
- */
- int getSocket(int socket=-1);
-
- /** Release socket
- @param socket Socket
- */
- void releaseSocket(int socket);
-
- /** Get socket client status
- @param socket Socket
- @return 1 if connected, 0 otherwise
- */
- bool getStatusSocketClient(uint8_t socket);
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.cpp b/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.cpp
deleted file mode 100644
index 88372d6cb5..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.cpp
+++ /dev/null
@@ -1,401 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-const char _command_CGATT[] PROGMEM = "AT+CGATT=";
-const char _command_SEPARATOR[] PROGMEM = "\",\"";
-
-//Attach GPRS main function.
-GSM3_NetworkStatus_t GSM3ShieldV1DataNetworkProvider::attachGPRS(char* apn, char* user_name, char* password, bool synchronous)
-{
- user = user_name;
- passwd = password;
- // A sad use of byte reuse
- theGSM3ShieldV1ModemCore.setPhoneNumber(apn);
-
- theGSM3ShieldV1ModemCore.openCommand(this,ATTACHGPRS);
- theGSM3ShieldV1ModemCore.setStatus(CONNECTING);
-
- attachGPRSContinue();
-
- // If synchronous, wait till attach is over, or not.
- if(synchronous)
- {
- // if we shorten this delay, the command fails
- while(ready()==0)
- delay(100);
- }
-
- return theGSM3ShieldV1ModemCore.getStatus();
-}
-
-//Atthach GPRS continue function.
-void GSM3ShieldV1DataNetworkProvider::attachGPRSContinue()
-{
- bool resp;
- // 1: Attach to GPRS service "AT+CGATT=1"
- // 2: Wait attach OK and Set the context 0 as FGCNT "AT+QIFGCNT=0"
- // 3: Wait context OK and Set bearer type as GPRS, APN, user name and pasword "AT+QICSGP=1..."
- // 4: Wait bearer OK and Enable the function of MUXIP "AT+QIMUX=1"
- // 5: Wait for disable MUXIP OK and Set the session mode as non transparent "AT+QIMODE=0"
- // 6: Wait for session mode OK and Enable notification when data received "AT+QINDI=1"
- // 8: Wait domain name OK and Register the TCP/IP stack "AT+QIREGAPP"
- // 9: Wait for Register OK and Activate FGCNT "AT+QIACT"
- // 10: Wait for activate OK
-
- int ct=theGSM3ShieldV1ModemCore.getCommandCounter();
- if(ct==1)
- {
- //AT+CGATT
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_CGATT,false);
- theGSM3ShieldV1ModemCore.print(1);
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- }
- else if(ct==2)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- //AT+QIFGCNT
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIFGCNT=0"));
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==3)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // Great. Go for the next step
- //DEBUG
- //Serial.println("AT+QICSGP.");
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QICSGP=1,\""),false);
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPhoneNumber());
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_SEPARATOR,false);
- theGSM3ShieldV1ModemCore.print(user);
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_SEPARATOR,false);
- theGSM3ShieldV1ModemCore.print(passwd);
- theGSM3ShieldV1ModemCore.print("\"\r");
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==4)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // AT+QIMUX=1 for multisocket
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIMUX=0"));
- theGSM3ShieldV1ModemCore.setCommandCounter(5);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==5)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- //AT+QIMODE=0 for multisocket
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIMODE=1"));
- theGSM3ShieldV1ModemCore.setCommandCounter(6);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==6)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // AT+QINDI=1
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QINDI=1"));
- theGSM3ShieldV1ModemCore.setCommandCounter(8);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==8)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // AT+QIREGAPP
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIREGAPP"));
- theGSM3ShieldV1ModemCore.setCommandCounter(9);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==9)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if(resp)
- {
- // AT+QIACT
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIACT"));
- theGSM3ShieldV1ModemCore.setCommandCounter(10);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- else if(ct==10)
- {
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if (resp)
- {
- theGSM3ShieldV1ModemCore.setStatus(GPRS_READY);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
-}
-
-//Detach GPRS main function.
-GSM3_NetworkStatus_t GSM3ShieldV1DataNetworkProvider::detachGPRS(bool synchronous)
-{
- theGSM3ShieldV1ModemCore.openCommand(this,DETACHGPRS);
- theGSM3ShieldV1ModemCore.setStatus(CONNECTING);
- detachGPRSContinue();
-
- if(synchronous)
- {
- while(ready()==0)
- delay(1);
- }
-
- return theGSM3ShieldV1ModemCore.getStatus();
-}
-
-void GSM3ShieldV1DataNetworkProvider::detachGPRSContinue()
-{
- bool resp;
- // 1: Detach to GPRS service "AT+CGATT=0"
- // 2: Wait dettach +PDP DEACT
- // 3: Wait for OK
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //AT+CGATT=0
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_CGATT,false);
- theGSM3ShieldV1ModemCore.print(0);
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- char auxLocate[12];
- prepareAuxLocate(PSTR("+PDP DEACT"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- if(resp)
- {
- // Received +PDP DEACT;
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // OK received
- if (resp)
- {
- theGSM3ShieldV1ModemCore.setStatus(GSM_READY);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- break;
- }
-}
-
-//QILOCIP parse.
-bool GSM3ShieldV1DataNetworkProvider::parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp)
-{
- if (!(theGSM3ShieldV1ModemCore.theBuffer().extractSubstring("\r\n","\r\n", LocalIP, LocalIPlength)))
- rsp = false;
- else
- rsp = true;
- return true;
-}
-
-//Get IP main function.
-int GSM3ShieldV1DataNetworkProvider::getIP(char* LocalIP, int LocalIPlength)
-{
- theGSM3ShieldV1ModemCore.setPhoneNumber(LocalIP);
- theGSM3ShieldV1ModemCore.setPort(LocalIPlength);
- theGSM3ShieldV1ModemCore.openCommand(this,GETIP);
- getIPContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-void GSM3ShieldV1DataNetworkProvider::getIPContinue()
-{
-
- bool resp;
- // 1: Read Local IP "AT+QILOCIP"
- // 2: Waiting for IP.
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //AT+QILOCIP
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QILOCIP"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseQILOCIP_rsp(theGSM3ShieldV1ModemCore.getPhoneNumber(), theGSM3ShieldV1ModemCore.getPort(), resp))
- {
- if (resp)
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- break;
- }
-}
-
-//Get IP with IPAddress object
-IPAddress GSM3ShieldV1DataNetworkProvider::getIPAddress() {
- char ip_temp[15]="";
- getIP(ip_temp, 15);
- unsigned long m=millis();
-
- while((millis()-m)<10*1000 && (!ready())){
- // wait for a response from the modem:
- delay(100);
- }
- IPAddress ip;
- inet_aton(ip_temp, ip);
- return ip;
-}
-
-int GSM3ShieldV1DataNetworkProvider::inet_aton(const char* aIPAddrString, IPAddress& aResult)
-{
- // See if we've been given a valid IP address
- const char* p =aIPAddrString;
- while (*p &&
- ( (*p == '.') || (*p >= '0') || (*p <= '9') ))
- {
- p++;
- }
-
- if (*p == '\0')
- {
- // It's looking promising, we haven't found any invalid characters
- p = aIPAddrString;
- int segment =0;
- int segmentValue =0;
- while (*p && (segment < 4))
- {
- if (*p == '.')
- {
- // We've reached the end of a segment
- if (segmentValue > 255)
- {
- // You can't have IP address segments that don't fit in a byte
- return 0;
- }
- else
- {
- aResult[segment] = (byte)segmentValue;
- segment++;
- segmentValue = 0;
- }
- }
- else
- {
- // Next digit
- segmentValue = (segmentValue*10)+(*p - '0');
- }
- p++;
- }
- // We've reached the end of address, but there'll still be the last
- // segment to deal with
- if ((segmentValue > 255) || (segment > 3))
- {
- // You can't have IP address segments that don't fit in a byte,
- // or more than four segments
- return 0;
- }
- else
- {
- aResult[segment] = (byte)segmentValue;
- return 1;
- }
- }
- else
- {
- return 0;
- }
-}
-
-//Response management.
-void GSM3ShieldV1DataNetworkProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case ATTACHGPRS:
- attachGPRSContinue();
- break;
- case DETACHGPRS:
- detachGPRSContinue();
- break;
- case GETIP:
- getIPContinue();
- break;
-
- default:
- break;
- }
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.h b/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.h
deleted file mode 100644
index 012a0ca541..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1DataNetworkProvider.h
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SHIELDV1DATANETWORKPROVIDER_
-#define _GSM3SHIELDV1DATANETWORKPROVIDER_
-
-#include
-#include
-#include
-#include
-
-class GSM3ShieldV1DataNetworkProvider : public GSM3MobileDataNetworkProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- char* user; // Username for GPRS
- char* passwd; // Password for GPRS
-
- /** Continue to attach GPRS function
- */
- void attachGPRSContinue();
-
- /** Continue to detach GPRS function
- */
- void detachGPRSContinue();
-
- /** Parse QILOCIP response
- @param LocalIP Buffer for save local IP address
- @param LocalIPlength Buffer size
- @param rsp Returns true if expected response exists
- @return true if command executed correctly
- */
- bool parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp);
-
- /** Continue to get IP function
- */
- void getIPContinue();
-
- /** Implementation of inet_aton standard function
- @param aIPAddrString IP address in characters buffer
- @param aResult IP address in IPAddress format
- @return 1 if the address is successfully converted, or 0 if the conversion failed
- */
- int inet_aton(const char* aIPAddrString, IPAddress& aResult);
-
- public:
-
- /** Attach to GPRS/GSM network
- @param networkId APN GPRS
- @param user Username
- @param pass Password
- @return connection status
- */
- GSM3_NetworkStatus_t networkAttach(char* networkId, char* user, char* pass)
- {
- return attachGPRS(networkId, user, pass);
- };
-
- /** Detach GPRS/GSM network
- @return connection status
- */
- GSM3_NetworkStatus_t networkDetach(){ return detachGPRS();};
-
- /** Attach to GPRS service
- @param apn APN GPRS
- @param user_name Username
- @param password Password
- @param synchronous Sync mode
- @return connection status
- */
- GSM3_NetworkStatus_t attachGPRS(char* apn, char* user_name, char* password, bool synchronous=true);
-
- /** Detach GPRS service
- @param synchronous Sync mode
- @return connection status
- */
- GSM3_NetworkStatus_t detachGPRS(bool synchronous=true);
-
- /** Returns 0 if last command is still executing
- @return 1 if success, >1 if error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Get network status (connection)
- @return status
- */
- inline GSM3_NetworkStatus_t getStatus(){return theGSM3ShieldV1ModemCore.getStatus();};
-
- /** Get actual assigned IP address
- @param LocalIP Buffer for copy IP address
- @param LocalIPlength Buffer length
- @return command error if exists
- */
- int getIP(char* LocalIP, int LocalIPlength);
-
- /** Get actual assigned IP address in IPAddress format
- @return IP address in IPAddress format
- */
- IPAddress getIPAddress();
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
-
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.cpp b/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.cpp
deleted file mode 100644
index 454b27f622..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-#include
-
-#define __RESETPIN__ 7
-
-//Constructor
-GSM3ShieldV1DirectModemProvider::GSM3ShieldV1DirectModemProvider(bool t)
-{
- trace=t;
-};
-
-void GSM3ShieldV1DirectModemProvider::begin()
-{
- theGSM3ShieldV1ModemCore.gss.begin(9600);
-}
-
-void GSM3ShieldV1DirectModemProvider::restartModem()
-{
- pinMode(__RESETPIN__, OUTPUT);
- digitalWrite(__RESETPIN__, HIGH);
- delay(12000);
- digitalWrite(__RESETPIN__, LOW);
- delay(1000);
-
-}
-
-//To enable the debug process
-void GSM3ShieldV1DirectModemProvider::connect()
-{
- theGSM3ShieldV1ModemCore.registerActiveProvider(this);
-}
-
-//To disable the debug process
-void GSM3ShieldV1DirectModemProvider::disconnect()
-{
- theGSM3ShieldV1ModemCore.registerActiveProvider(0);
-}
-
-//Write to the modem by means of SoftSerial
-size_t GSM3ShieldV1DirectModemProvider::write(uint8_t c)
-{
- return theGSM3ShieldV1ModemCore.write(c);
-}
-
-//Detect if data to be read
-int/*bool*/ GSM3ShieldV1DirectModemProvider::available()
-{
- if (theGSM3ShieldV1ModemCore.gss.cb.peek(1)) return 1;
- else return 0;
-}
-
-//Read data
-int/*char*/ GSM3ShieldV1DirectModemProvider::read()
-{
- int dataRead;
- dataRead = theGSM3ShieldV1ModemCore.gss.cb.read();
- //In case last char in xof mode.
- if (!(theGSM3ShieldV1ModemCore.gss.cb.peek(0))) {
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- delay(100);
- }
- return dataRead;
-}
-
-//Peek data
-int/*char*/ GSM3ShieldV1DirectModemProvider::peek()
-{
- return theGSM3ShieldV1ModemCore.gss.cb.peek(0);
-}
-
-//Flush data
-void GSM3ShieldV1DirectModemProvider::flush()
-{
- return theGSM3ShieldV1ModemCore.gss.cb.flush();
-}
-
-String GSM3ShieldV1DirectModemProvider::writeModemCommand(String ATcommand, int responseDelay)
-{
- if(trace)
- Serial.println(ATcommand);
-
- // Flush other texts
- flush();
-
- //Enter debug mode.
- connect();
- //Send the AT command.
- println(ATcommand);
-
- delay(responseDelay);
-
- //Get response data from modem.
- String result = "";
- if(trace)
- theGSM3ShieldV1ModemCore.gss.cb.debugBuffer();
-
- while (available())
- {
- char c = read();
- result += c;
- }
- if(trace)
- Serial.println(result);
- //Leave the debug mode.
- disconnect();
- return result;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.h b/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.h
deleted file mode 100644
index 2d20412b47..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1DirectModemProvider.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#ifndef __GSM3DIRECTMODEMPROVIDER__
-#define __GSM3DIRECTMODEMPROVIDER__
-
-#include
-#include
-#include
-#include
-#include
-
-class GSM3ShieldV1DirectModemProvider : public GSM3ShieldV1BaseProvider, public Stream
-{
- private:
-
- bool trace;
-
- public:
-
- /** Constructor
- @param trace if true, dumps all AT dialogue to Serial
- */
- GSM3ShieldV1DirectModemProvider(bool trace=false);
-
- /**
- */
- void begin();
-
- /**
- */
- void restartModem();
-
- /** Enable the debug process.
- */
- void connect();
-
- /** Disable the debug process.
- */
- void disconnect();
-
- /** Debug write to modem by means of SoftSerial.
- @param c Character
- @return size
- */
- size_t write(uint8_t c);
-
- /** Check for incoming bytes in buffer
- @return
- */
- int available();
-
- /** Read from circular buffer
- @return character
- */
- int read();
-
- /** Read from circular buffer, but do not delete it
- @return character
- */
- int peek();
-
- /** Empty circular buffer
- */
- void flush();
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to){};
-
- /** Recognize unsolicited event
- @param from
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte from){return false;};
-
- /** Send AT command to modem
- @param command AT command
- @param delay Time to wait for response
- @return response from modem
- */
- String writeModemCommand(String command, int delay);
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1ModemCore.cpp b/libraries/GSM/src/GSM3ShieldV1ModemCore.cpp
deleted file mode 100644
index a9f5af6479..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ModemCore.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-GSM3ShieldV1ModemCore theGSM3ShieldV1ModemCore;
-
-char* __ok__="OK";
-
-GSM3ShieldV1ModemCore::GSM3ShieldV1ModemCore() : gss()
-{
- gss.registerMgr(this);
- _dataInBufferFrom=0;
- _dataInBufferTo=0;
- commandError=1;
- commandCounter=0;
- ongoingCommand=NONE;
- takeMilliseconds();
-
- for(int i=0;irecognizeUnsolicitedEvent(from);
- }
- }
- if((!recognized)&&(activeProvider))
- activeProvider->manageResponse(from, to);
-}
-
-
-void GSM3ShieldV1ModemCore::openCommand(GSM3ShieldV1BaseProvider* provider, GSM3_commandType_e c)
-{
- activeProvider=provider;
- commandError=0;
- commandCounter=1;
- ongoingCommand=c;
- _dataInBufferFrom=0;
- _dataInBufferTo=0;
-
-};
-
-size_t GSM3ShieldV1ModemCore::writePGM(PGM_P str, bool CR)
-{
- int i=0;
- char c;
-
- do
- {
- c=pgm_read_byte_near(str + i);
- if(c!=0)
- write(c);
- i++;
- } while (c!=0);
- if(CR)
- print("\r");
-
- return 1;
-}
-
-size_t GSM3ShieldV1ModemCore::write(uint8_t c)
-{
- if(_debug)
- GSM3CircularBuffer::printCharDebug(c);
- return gss.write(c);
-}
-
-unsigned long GSM3ShieldV1ModemCore::takeMilliseconds()
-{
- unsigned long now=millis();
- unsigned long delta;
- delta=now-milliseconds;
- milliseconds=now;
- return delta;
-}
-
-void GSM3ShieldV1ModemCore::delayInsideInterrupt(unsigned long milliseconds)
-{
- for (unsigned long k=0;k
-#include
-#include
-#include
-
-#define UMPROVIDERS 3
-
-class GSM3ShieldV1ModemCore : public GSM3SoftSerialMgr, public Print
-{
- private:
-
- // Phone number, used when calling, sending SMS and reading calling numbers
- // Also PIN in modem configuration
- // Also APN
- // Also remote server
- char* phoneNumber;
-
- // Working port. Port used in the ongoing command, while opening a server
- // Also for IP address length
- int port;
-
- // 0 = ongoing
- // 1 = OK
- // 2 = Error. Incorrect state
- // 3 = Unexpected modem message
- // 4 = OK but not available data.
- uint8_t commandError;
-
- // Counts the steps by the command
- uint8_t commandCounter;
-
- // Presently ongoing command
- GSM3_commandType_e ongoingCommand;
-
- // Enable/disable debug
- bool _debug;
- byte _dataInBufferFrom;
- byte _dataInBufferTo;
-
- // This is the modem (known) status
- GSM3_NetworkStatus_t _status;
-
- GSM3ShieldV1BaseProvider* UMProvider[UMPROVIDERS];
- GSM3ShieldV1BaseProvider* activeProvider;
-
- // Private function for anage message
- void manageMsgNow(byte from, byte to);
-
- unsigned long milliseconds;
-
- public:
-
- /** Constructor */
- GSM3ShieldV1ModemCore();
-
- GSM3SoftSerial gss; // Direct access to modem
-
- /** Get phone number
- @return phone number
- */
- char *getPhoneNumber(){return phoneNumber;};
-
- /** Establish a new phone number
- @param n Phone number
- */
- void setPhoneNumber(char *n){phoneNumber=n;};
-
- /** Get port used
- @return port
- */
- int getPort(){return port;};
-
- /** Establish a new port for use
- @param p Port
- */
- void setPort(int p){port=p;};
-
- /** Get command error
- @return command error
- */
- uint8_t getCommandError(){return commandError;};
-
- /** Establish a command error
- @param n Command error
- */
- void setCommandError(uint8_t n){commandError=n;};
-
- /** Get command counter
- @return command counter
- */
- uint8_t getCommandCounter(){return commandCounter;};
-
- /** Set command counter
- @param c Initial value
- */
- void setCommandCounter(uint8_t c){commandCounter=c;};
-
- /** Get ongoing command
- @return command
- */
- GSM3_commandType_e getOngoingCommand(){return ongoingCommand;};
-
- /** Set ongoing command
- @param c New ongoing command
- */
- void setOngoingCommand(GSM3_commandType_e c){ongoingCommand=c;};
-
- /** Open command
- @param activeProvider Active provider
- @param c Command for open
- */
- void openCommand(GSM3ShieldV1BaseProvider* activeProvider, GSM3_commandType_e c);
-
- /** Close command
- @param code Close code
- */
- void closeCommand(int code);
-
- // These functions allow writing to the SoftwareSerial
- // If debug is set, dump to the console
-
- /** Write a character in serial
- @param c Character
- @return size
- */
- size_t write(uint8_t c);
-
- /** Write PGM
- @param str Buffer for write
- @param CR Carriadge return adding automatically
- @return size
- */
- virtual size_t writePGM(PGM_P str, bool CR=true);
-
- /** Establish debug mode
- @param db Boolean that indicates debug on or off
- */
- void setDebug(bool db){_debug=db;};
-
- /** Generic response parser
- @param rsp Returns true if expected response exists
- @param string Substring expected in response
- @param string2 Second substring expected in response
- @return true if parsed correctly
- */
- bool genericParse_rsp(bool& rsp, char* string=0, char* string2=0);
-
- /** Generates a generic AT command request from PROGMEM buffer
- @param str Buffer with AT command
- @param addCR Carriadge return adding automatically
- */
- void genericCommand_rq(PGM_P str, bool addCR=true);
-
- /** Generates a generic AT command request from a simple char buffer
- @param str Buffer with AT command
- @param addCR Carriadge return adding automatically
- */
- void genericCommand_rqc(const char* str, bool addCR=true);
-
- /** Returns the circular buffer
- @return circular buffer
- */
- inline GSM3CircularBuffer& theBuffer(){return gss.cb;};
-
- /** Establish a new network status
- @param status Network status
- */
- inline void setStatus(GSM3_NetworkStatus_t status) { _status = status; };
-
- /** Returns actual network status
- @return network status
- */
- inline GSM3_NetworkStatus_t getStatus() { return _status; };
-
- /** Register provider as willing to receive unsolicited messages
- @param provider Pointer to provider able to receive unsolicited messages
- */
- void registerUMProvider(GSM3ShieldV1BaseProvider* provider);
-
- /** unegister provider as willing to receive unsolicited messages
- @param provider Pointer to provider able to receive unsolicited messages
- */
- void unRegisterUMProvider(GSM3ShieldV1BaseProvider* provider);
-
-
- /** Register a provider as "dialoguing" talking in facto with the modem
- @param provider Pointer to provider receiving responses
- */
- void registerActiveProvider(GSM3ShieldV1BaseProvider* provider){activeProvider=provider;};
-
- /** Needed to manage the SoftSerial. Receives the call when received data
- If _debugging, no code is called
- @param from Starting byte to read
- @param to Last byte to read
- */
- void manageMsg(byte from, byte to);
-
- /** If _debugging, this call is assumed to be made out of interrupts
- Prints incoming info and calls manageMsgNow
- */
- void manageReceivedData();
-
- /** Chronometer. Measure milliseconds from last call
- @return milliseconds from las time function was called
- */
- unsigned long takeMilliseconds();
-
- /** Delay for interrupts
- @param milliseconds Delay time in milliseconds
- */
- void delayInsideInterrupt(unsigned long milliseconds);
-};
-
-extern GSM3ShieldV1ModemCore theGSM3ShieldV1ModemCore;
-
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV1ModemVerification.cpp b/libraries/GSM/src/GSM3ShieldV1ModemVerification.cpp
deleted file mode 100644
index f6afae86ad..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ModemVerification.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#include
-
-// constructor
-GSM3ShieldV1ModemVerification::GSM3ShieldV1ModemVerification()
-{
-};
-
-// reset the modem for direct access
-int GSM3ShieldV1ModemVerification::begin()
-{
- int result=0;
- String modemResponse;
-
- // check modem response
- modemAccess.begin();
-
- // reset hardware
- modemAccess.restartModem();
-
- modemResponse=modemAccess.writeModemCommand("AT", 1000);
- if(modemResponse.indexOf("OK")>=0)
- result=1;
- modemResponse=modemAccess.writeModemCommand("ATE0", 1000);
- return result;
-}
-
-// get IMEI
-String GSM3ShieldV1ModemVerification::getIMEI()
-{
- String number("");
- // AT command for obtain IMEI
- String modemResponse = modemAccess.writeModemCommand("AT+GSN", 2000);
- // Parse and check response
- char res_to_compare[modemResponse.length()];
- modemResponse.toCharArray(res_to_compare, modemResponse.length());
- if(strstr(res_to_compare,"OK") != NULL)
- number = modemResponse.substring(1, 17);
- return number;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1ModemVerification.h b/libraries/GSM/src/GSM3ShieldV1ModemVerification.h
deleted file mode 100644
index 98dbc49888..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ModemVerification.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SHIELDV1MODEMVERIFICATION_
-#define _GSM3SHIELDV1MODEMVERIFICATION_
-
-#include
-#include
-
-class GSM3ShieldV1ModemVerification
-{
-
- private:
-
- GSM3ShieldV1DirectModemProvider modemAccess;
- GSM3ShieldV1AccessProvider gsm; // Access provider to GSM/GPRS network
-
- public:
-
- /** Constructor */
- GSM3ShieldV1ModemVerification();
-
- /** Check modem response and restart it
- */
- int begin();
-
- /** Obtain modem IMEI (command AT)
- @return modem IMEI number
- */
- String getIMEI();
-
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1MultiClientProvider.cpp b/libraries/GSM/src/GSM3ShieldV1MultiClientProvider.cpp
deleted file mode 100644
index c75ee300f6..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1MultiClientProvider.cpp
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-const char _command_MultiQISRVC[] PROGMEM = "AT+QISRVC=";
-
-#define __TOUTFLUSH__ 10000
-
-GSM3ShieldV1MultiClientProvider::GSM3ShieldV1MultiClientProvider()
-{
- theGSM3MobileClientProvider=this;
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
-};
-
-//Response management.
-void GSM3ShieldV1MultiClientProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case XON:
- if (flagReadingSocket)
- {
-// flagReadingSocket = 0;
- fullBufferSocket = (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()<3);
- }
- else theGSM3ShieldV1ModemCore.setOngoingCommand(NONE);
- break;
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case CONNECTTCPCLIENT:
- connectTCPClientContinue();
- break;
- case DISCONNECTTCP:
- disconnectTCPContinue();
- break;
- case BEGINWRITESOCKET:
- beginWriteSocketContinue();
- break;
- case ENDWRITESOCKET:
- endWriteSocketContinue();
- break;
- case AVAILABLESOCKET:
- availableSocketContinue();
- break;
- case FLUSHSOCKET:
- fullBufferSocket = (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()<3);
- flushSocketContinue();
- break;
-
- default:
- break;
- }
-}
-
-//Connect TCP main function.
-int GSM3ShieldV1MultiClientProvider::connectTCPClient(const char* server, int port, int id_socket)
-{
- theGSM3ShieldV1ModemCore.setPort(port);
- idSocket = id_socket;
-
- theGSM3ShieldV1ModemCore.setPhoneNumber((char*)server);
- theGSM3ShieldV1ModemCore.openCommand(this,CONNECTTCPCLIENT);
- connectTCPClientContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-int GSM3ShieldV1MultiClientProvider::connectTCPClient(IPAddress add, int port, int id_socket)
-{
- remoteIP=add;
- theGSM3ShieldV1ModemCore.setPhoneNumber(0);
- return connectTCPClient(0, port, id_socket);
-}
-
-//Connect TCP continue function.
-void GSM3ShieldV1MultiClientProvider::connectTCPClientContinue()
-{
- bool resp;
- // 0: Dot or DNS notation activation
- // 1: Disable SW flow control
- // 2: Waiting for IFC OK
- // 3: Start-up TCP connection "AT+QIOPEN"
- // 4: Wait for connection OK
- // 5: Wait for CONNECT
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIDNSIP="), false);
- if ((theGSM3ShieldV1ModemCore.getPhoneNumber()!=0)&&
- ((*(theGSM3ShieldV1ModemCore.getPhoneNumber())<'0')||((*(theGSM3ShieldV1ModemCore.getPhoneNumber())>'9'))))
- {
- theGSM3ShieldV1ModemCore.print('1');
- theGSM3ShieldV1ModemCore.print('\r');
- }
- else
- {
- theGSM3ShieldV1ModemCore.print('0');
- theGSM3ShieldV1ModemCore.print('\r');
- }
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- //Response received
- if(resp)
- {
- // AT+QIOPEN
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIOPEN="),false);
- theGSM3ShieldV1ModemCore.print(idSocket);
- theGSM3ShieldV1ModemCore.print(",\"TCP\",\"");
- if(theGSM3ShieldV1ModemCore.getPhoneNumber()!=0)
- {
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPhoneNumber());
- }
- else
- {
- remoteIP.printTo(theGSM3ShieldV1ModemCore);
- }
- theGSM3ShieldV1ModemCore.print('"');
- theGSM3ShieldV1ModemCore.print(',');
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPort());
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
-
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- if(resp)
- {
- // OK Received
- // Great. Go for the next step
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 4:
- char auxLocate [12];
- prepareAuxLocate(PSTR("CONNECT OK"), auxLocate);
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp,auxLocate))
- {
- // Response received
- if(resp)
- {
- // Received CONNECT OK
- // Great. We're done
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
-
- }
-}
-
-//Disconnect TCP main function.
-int GSM3ShieldV1MultiClientProvider::disconnectTCP(bool client1Server0, int id_socket)
-{
- idSocket = id_socket;
-
- // First of all, we will flush the socket synchronously
- unsigned long m;
- m=millis();
- flushSocket();
- while(((millis()-m)< __TOUTFLUSH__ )&&(ready()==0))
- delay(10);
-
- // Could not flush the communications... strange
- if(ready()==0)
- {
- theGSM3ShieldV1ModemCore.setCommandError(2);
- return theGSM3ShieldV1ModemCore.getCommandError();
- }
-
- // Set up the command
- client1_server0 = client1Server0;
- flagReadingSocket=0;
- theGSM3ShieldV1ModemCore.openCommand(this,DISCONNECTTCP);
- disconnectTCPContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Disconnect TCP continue function
-void GSM3ShieldV1MultiClientProvider::disconnectTCPContinue()
-{
- bool resp;
- // 1: Send AT+QISRVC
- // 2: "AT+QICLOSE"
- // 3: Wait for OK
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_MultiQISRVC, false);
- if (client1_server0) theGSM3ShieldV1ModemCore.print('1');
- else theGSM3ShieldV1ModemCore.print('2');
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- // Parse response to QISRVC
- theGSM3ShieldV1ModemCore.genericParse_rsp(resp);
- if(resp)
- {
- // Send QICLOSE command
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QICLOSE="),false);
- theGSM3ShieldV1ModemCore.print(idSocket);
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- break;
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- theGSM3ShieldV1ModemCore.setCommandCounter(0);
- if (resp)
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Write socket first chain main function.
-void GSM3ShieldV1MultiClientProvider::beginWriteSocket(bool client1Server0, int id_socket)
-{
- idSocket = id_socket;
- client1_server0 = client1Server0;
- theGSM3ShieldV1ModemCore.openCommand(this,BEGINWRITESOCKET);
- beginWriteSocketContinue();
-}
-
-//Write socket first chain continue function.
-void GSM3ShieldV1MultiClientProvider::beginWriteSocketContinue()
-{
- bool resp;
- // 1: Send AT+QISRVC
- // 2: Send AT+QISEND
- // 3: wait for > and Write text
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- // AT+QISRVC
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_MultiQISRVC, false);
- if (client1_server0)
- theGSM3ShieldV1ModemCore.print('1');
- else
- theGSM3ShieldV1ModemCore.print('2');
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- if(resp)
- {
- // AT+QISEND
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QISEND="), false);
- theGSM3ShieldV1ModemCore.print(idSocket);
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else
- {
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- break;
- case 3:
- char aux[2];
- aux[0]='>';
- aux[1]=0;
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, aux))
- {
- if(resp)
- {
- // Received ">"
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else
- {
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- }
- break;
- }
-}
-
-//Write socket next chain function.
-void GSM3ShieldV1MultiClientProvider::writeSocket(const char* buf)
-{
- theGSM3ShieldV1ModemCore.print(buf);
-}
-
-//Write socket character function.
-void GSM3ShieldV1MultiClientProvider::writeSocket(char c)
-{
- theGSM3ShieldV1ModemCore.print(c);
-}
-
-//Write socket last chain main function.
-void GSM3ShieldV1MultiClientProvider::endWriteSocket()
-{
- theGSM3ShieldV1ModemCore.openCommand(this,ENDWRITESOCKET);
- endWriteSocketContinue();
-}
-
-//Write socket last chain continue function.
-void GSM3ShieldV1MultiClientProvider::endWriteSocketContinue()
-{
- bool resp;
- // 1: Write text (ctrl-Z)
- // 2: Wait for OK
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.write(26); // Ctrl-Z
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // OK received
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Available socket main function.
-int GSM3ShieldV1MultiClientProvider::availableSocket(bool client1Server0, int id_socket)
-{
- if(flagReadingSocket==1)
- {
- theGSM3ShieldV1ModemCore.setCommandError(1);
- return 1;
- }
- client1_server0 = client1Server0;
- idSocket = id_socket;
- theGSM3ShieldV1ModemCore.openCommand(this,AVAILABLESOCKET);
- availableSocketContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Available socket continue function.
-void GSM3ShieldV1MultiClientProvider::availableSocketContinue()
-{
- bool resp;
- // 1: AT+QIRD
- // 2: Wait for OK and Next necessary AT+QIRD
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QIRD=0,"),false);
- if (client1_server0)
- theGSM3ShieldV1ModemCore.print('1');
- else
- theGSM3ShieldV1ModemCore.print('2');
- theGSM3ShieldV1ModemCore.print(',');
- theGSM3ShieldV1ModemCore.print(idSocket);
- theGSM3ShieldV1ModemCore.print(",1500");
- // theGSM3ShieldV1ModemCore.print(",120");
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseQIRD_head(resp))
- {
- if (!resp)
- {
- theGSM3ShieldV1ModemCore.closeCommand(4);
- }
- else
- {
- flagReadingSocket=1;
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- }
- else
- {
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Read Socket Parse head.
-bool GSM3ShieldV1MultiClientProvider::parseQIRD_head(bool& rsp)
-{
- char _qird [8];
- prepareAuxLocate(PSTR("+QIRD:"), _qird);
- fullBufferSocket = (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()<3);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(_qird))
- {
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil(_qird, true);
- // Saving more memory, reuse _qird
- _qird[0]='\n';
- _qird[1]=0;
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil(_qird, true);
- rsp = true;
- return true;
- }
- else if(theGSM3ShieldV1ModemCore.theBuffer().locate("OK"))
- {
- rsp = false;
- return true;
- }
- else
- {
- rsp = false;
- return false;
- }
-}
-/*
-//Read socket main function.
-int GSM3ShieldV1MultiClientProvider::readSocket()
-{
- char charSocket;
- charSocket = theGSM3ShieldV1ModemCore.theBuffer().read();
- //Case buffer not full
- if (!fullBufferSocket)
- {
- //The last part of the buffer after data is CRLFOKCRLF
- if (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==125)
- {
- //Start again availableSocket function.
- flagReadingSocket=0;
- theGSM3ShieldV1ModemCore.openCommand(this,AVAILABLESOCKET);
- availableSocketContinue();
- }
- }
- else if (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==127)
- {
- // The buffer is full, no more action is possible until we have read()
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- flagReadingSocket = 1;
- theGSM3ShieldV1ModemCore.openCommand(this,XON);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- //A small delay to assure data received after xon.
- delay(10);
- }
- //To distinguish the case no more available data in socket.
- if (ready()==1)
- return charSocket;
- else
- return 0;
-}
-*/
-int GSM3ShieldV1MultiClientProvider::readSocket()
-{
- char charSocket;
-
- if(theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==0)
- {
- Serial.println();Serial.println("*");
- return 0;
- }
-
- charSocket = theGSM3ShieldV1ModemCore.theBuffer().read();
- //Case buffer not full
- if (!fullBufferSocket)
- {
- //The last part of the buffer after data is CRLFOKCRLF
- if (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==125)
- {
- //Start again availableSocket function.
- flagReadingSocket=0;
- theGSM3ShieldV1ModemCore.openCommand(this,AVAILABLESOCKET);
- availableSocketContinue();
- }
- }
- else if (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()>=100)
- {
- // The buffer was full, we have to let the data flow again
- // theGSM3ShieldV1ModemCore.theBuffer().flush();
- flagReadingSocket = 1;
- theGSM3ShieldV1ModemCore.openCommand(this,XON);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- //A small delay to assure data received after xon.
- delay(100);
- if(theGSM3ShieldV1ModemCore.theBuffer().availableBytes() >=6)
- fullBufferSocket=false;
- }
-
- return charSocket;
-
-}
-
-//Read socket main function.
-int GSM3ShieldV1MultiClientProvider::peekSocket()
-{
- return theGSM3ShieldV1ModemCore.theBuffer().peek(0);
-}
-
-
-//Flush SMS main function.
-void GSM3ShieldV1MultiClientProvider::flushSocket()
-{
- flagReadingSocket=0;
- theGSM3ShieldV1ModemCore.openCommand(this,FLUSHSOCKET);
- flushSocketContinue();
-}
-
-//Send SMS continue function.
-void GSM3ShieldV1MultiClientProvider::flushSocketContinue()
-{
- //bool resp;
- // 1: Deleting SMS
- // 2: wait for OK
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //DEBUG
- //Serial.println("Flushing Socket.");
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- if (fullBufferSocket)
- {
- //Serial.println("Buffer flushed.");
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- }
- else
- {
- //Serial.println("Socket flushed completely.");
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- break;
- }
-}
-
-//URC recognize.
-// Momentarily, we will not recognize "closes" in client mode
-bool GSM3ShieldV1MultiClientProvider::recognizeUnsolicitedEvent(byte oldTail)
-{
- return false;
-}
-
-int GSM3ShieldV1MultiClientProvider::getSocket(int socket)
-{
- if(socket==-1)
- {
- int i;
- for(i=minSocket(); i<=maxSocket(); i++)
- {
- if (!(sockets&(0x0001<8)
- return 0;
- if(sockets&(0x0001<
-#include
-
-class GSM3ShieldV1MultiClientProvider : public GSM3MobileClientProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- int remotePort; // Current operation remote port
- int idSocket; // Remote ID socket
- IPAddress remoteIP; // Remote IP address
-
- uint16_t sockets;
-
- /** Continue to connect TCP client function
- */
- void connectTCPClientContinue();
-
- /** Continue to disconnect TCP client function
- */
- void disconnectTCPContinue();
-
- /** Continue to begin socket for write function
- */
- void beginWriteSocketContinue();
-
- /** Continue to end write socket function
- */
- void endWriteSocketContinue();
-
- /** Continue to available socket function
- */
- void availableSocketContinue();
-
- /** Continue to flush socket function
- */
- void flushSocketContinue();
-
- // GATHER!
- bool flagReadingSocket; //In case socket data being read, update fullBufferSocket in the next buffer.
- bool fullBufferSocket; //To detect if the socket data being read needs another buffer.
- bool client1_server0; //1 Client, 0 Server.
-
- /** Parse QIRD response
- @param rsp Returns true if expected response exists
- @return true if command executed correctly
- */
- bool parseQIRD_head(bool& rsp);
-
- public:
-
- /** Constructor */
- GSM3ShieldV1MultiClientProvider();
-
- /** Minimum socket
- @return 0
- */
- int minSocket(){return 0;};
-
- /** Maximum socket
- @return 5
- */
- int maxSocket(){return 5;};
-
- /** Connect to a remote TCP server
- @param server String with IP or server name
- @param port Remote port number
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int connectTCPClient(const char* server, int port, int id_socket);
-
- /** Connect to a remote TCP server
- @param add Remote IP address
- @param port Remote port number
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int connectTCPClient(IPAddress add, int port, int id_socket);
-
- /** Begin writing through a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- void beginWriteSocket(bool client1Server0, int id_socket);
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param buf characters to be written (final 0 will not be written)
- */
- void writeSocket(const char* buf);
-
- /** Write through a socket. MUST go after beginWriteSocket()
- @param c character to be written
- */
- void writeSocket(char c);
-
- /** Finish current writing
- */
- void endWriteSocket();
-
- /** Check if there are data to be read in socket.
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if there are data available, 4 if no data, otherwise error
- */
- int availableSocket(bool client, int id_socket); // With "available" and "readSocket" ask the modem for 1500 bytes.
-
- /** Read a character from socket
- @return socket
- */
- int readSocket(); //If Read() gets to the end of the QIRD response, execute again QIRD SYNCHRONOUSLY
-
- /** Flush socket
- */
- void flushSocket();
-
- /** Get a character but will not advance the buffer head
- @return character
- */
- int peekSocket();
-
- /** Close a socket
- @param client1Server0 1 if modem acts as client, 0 if acts as server
- @param id_socket Local socket number
- @return 0 if command running, 1 if success, otherwise error
- */
- int disconnectTCP(bool client1Server0, int id_socket);
-
- /** Recognize unsolicited event
- @param from
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte from);
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Get client socket
- @param socket
- @return socket
- */
- int getSocket(int socket=-1);
-
- /** Release socket
- @param socket Socket for release
- */
- void releaseSocket(int socket);
-
- /** Get socket client status
- @param socket Socket
- @return socket client status
- */
- bool getStatusSocketClient(uint8_t socket);
-
-};
-
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1MultiServerProvider.cpp b/libraries/GSM/src/GSM3ShieldV1MultiServerProvider.cpp
deleted file mode 100644
index c43568ba48..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1MultiServerProvider.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-#define __NCLIENTS_MAX__ 3
-
-const char _command_QILOCIP[] PROGMEM = "AT+QILOCIP";
-
-GSM3ShieldV1MultiServerProvider::GSM3ShieldV1MultiServerProvider()
-{
- theGSM3MobileServerProvider=this;
- socketsAsServer=0;
- socketsAccepted=0;
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
-};
-
-//Response management.
-void GSM3ShieldV1MultiServerProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case CONNECTSERVER:
- connectTCPServerContinue();
- break;
- case GETIP:
- getIPContinue();
- break;
-
- default:
- break;
- }
-}
-
-//Connect Server main function.
-int GSM3ShieldV1MultiServerProvider::connectTCPServer(int port)
-{
- // We forget about LocalIP as it has no real use, the modem does whatever it likes
- theGSM3ShieldV1ModemCore.setPort(port);
- theGSM3ShieldV1ModemCore.openCommand(this,CONNECTSERVER);
- connectTCPServerContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Connect Server continue function.
-void GSM3ShieldV1MultiServerProvider::connectTCPServerContinue()
-{
-
- bool resp;
- // 1: Read Local IP "AT+QILOCIP"
- // 2: Waiting for IP and Set local port "AT+QILPORT"
- // 3: Waiting for QILPOR OK andConfigure as server "AT+QISERVER"
- // 4: Wait for SERVER OK
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //"AT+QILOCIP."
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_QILOCIP);
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- //Not IP storing but the command is necessary.
- //if(parseQILOCIP_rsp(local_IP, local_IP_Length, resp))
- // This awful trick saves some RAM bytes
- char aux[3];
- aux[0]='\r';aux[1]='\n';aux[2]=0;
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, aux))
- {
- //Response received
- if(resp)
- {
- // Great. Go for the next step
- // AT+QILPORT
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QILPORT=\"TCP\","),false);
- theGSM3ShieldV1ModemCore.print( theGSM3ShieldV1ModemCore.getPort());
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- if(resp)
- {
- // OK received
- // Great. Go for the next step
- // AT+QISERVER
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QISERVER=0,"),false);
- theGSM3ShieldV1ModemCore.print(__NCLIENTS_MAX__);
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 4:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- // OK received, kathapoon, chessespoon
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//QILOCIP parse.
-bool GSM3ShieldV1MultiServerProvider::parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp)
-{
- if (!(theGSM3ShieldV1ModemCore.theBuffer().extractSubstring("\r\n","\r\n", LocalIP, LocalIPlength)))
- rsp = false;
- else
- rsp = true;
- return true;
-}
-
-//Get IP main function.
-int GSM3ShieldV1MultiServerProvider::getIP(char* LocalIP, int LocalIPlength)
-{
- theGSM3ShieldV1ModemCore.setPhoneNumber(LocalIP);
- theGSM3ShieldV1ModemCore.setPort(LocalIPlength);
- theGSM3ShieldV1ModemCore.openCommand(this,GETIP);
- getIPContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-void GSM3ShieldV1MultiServerProvider::getIPContinue()
-{
-
- bool resp;
- // 1: Read Local IP "AT+QILOCIP"
- // 2: Waiting for IP.
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //AT+QILOCIP
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_QILOCIP);
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseQILOCIP_rsp(theGSM3ShieldV1ModemCore.getPhoneNumber(), theGSM3ShieldV1ModemCore.getPort(), resp))
- {
- if (resp)
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-bool GSM3ShieldV1MultiServerProvider::getSocketAsServerModemStatus(int s)
-{
- if (socketsAccepted&(0x0001<
-#include
-
-class GSM3ShieldV1MultiServerProvider : public GSM3MobileServerProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- // Used sockets
- uint8_t socketsAsServer;
- uint8_t socketsAccepted;
-
- /** Continue to connect TCP server function
- */
- void connectTCPServerContinue();
-
- /** Continue to get IP function
- */
- void getIPContinue();
-
- /** Release socket
- @param socket Socket
- */
- void releaseSocket(int socket);
-
- /** Parse QILOCIP response
- @param LocalIP Buffer for save local IP address
- @param LocalIPlength Buffer size
- @param rsp Returns if expected response exists
- @return true if command executed correctly
- */
- bool parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp);
-
- public:
-
- /** Constructor */
- GSM3ShieldV1MultiServerProvider();
-
- /** minSocketAsServer
- @return 0
- */
- int minSocketAsServer(){return 0;};
-
- /** maxSocketAsServer
- @return 0
- */
- int maxSocketAsServer(){return 4;};
-
- /** Get modem status
- @param s
- @return modem status (true if connected)
- */
- bool getSocketAsServerModemStatus(int s);
-
- /** Get new occupied socket as server
- @return command error if exists
- */
- int getNewOccupiedSocketAsServer();
-
- /** Connect server to TCP port
- @param port TCP port
- @return command error if exists
- */
- int connectTCPServer(int port);
-
- /** Get server IP address
- @param LocalIP Buffer for copy IP address
- @param LocalIPlength Length of buffer
- @return command error if exists
- */
- int getIP(char* LocalIP, int LocalIPlength);
-
-// int disconnectTCP(bool client1Server0, int id_socket);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Get socket status as server
- @param socket Socket to get status
- @return socket status
- */
- bool getStatusSocketAsServer(uint8_t socket);
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** Recognize unsolicited event
- @param oldTail
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte oldTail);
-
-
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV1PinManagement.cpp b/libraries/GSM/src/GSM3ShieldV1PinManagement.cpp
deleted file mode 100644
index 5a5504816d..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1PinManagement.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#include
-
-// constructor
-GSM3ShieldV1PinManagement::GSM3ShieldV1PinManagement()
-{
-};
-
-// reset the modem for direct access
-void GSM3ShieldV1PinManagement::begin()
-{
- modemAccess.begin();
-
- // reset hardware
- gsm.HWrestart();
-
- pin_used = false;
-
- // check modem response
- modemAccess.writeModemCommand("AT", 1000);
- modemAccess.writeModemCommand("ATE0", 1000);
-}
-
-/*
- Check PIN status
-*/
-int GSM3ShieldV1PinManagement::isPIN()
-{
- String res = modemAccess.writeModemCommand("AT+CPIN?",1000);
- // Check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "READY") != NULL)
- return 0;
- else if(strstr(res_to_compare, "SIM PIN") != NULL)
- return 1;
- else if(strstr(res_to_compare, "SIM PUK") != NULL)
- return -1;
- else
- return -2;
-}
-
-/*
- Check PIN code
-*/
-int GSM3ShieldV1PinManagement::checkPIN(String pin)
-{
- String res = modemAccess.writeModemCommand("AT+CPIN=" + pin,1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "OK") == NULL)
- return -1;
- else
- return 0;
-}
-
-/*
- Check PUK code
-*/
-int GSM3ShieldV1PinManagement::checkPUK(String puk, String pin)
-{
- String res = modemAccess.writeModemCommand("AT+CPIN=\"" + puk + "\",\"" + pin + "\"",1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "OK") == NULL)
- return -1;
- else
- return 0;
-}
-
-/*
- Change PIN code
-*/
-void GSM3ShieldV1PinManagement::changePIN(String old, String pin)
-{
- String res = modemAccess.writeModemCommand("AT+CPWD=\"SC\",\"" + old + "\",\"" + pin + "\"",2000);
- Serial.println(res);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "OK") != NULL)
- Serial.println("Pin changed succesfully.");
- else
- Serial.println("ERROR");
-}
-
-/*
- Switch PIN status
-*/
-void GSM3ShieldV1PinManagement::switchPIN(String pin)
-{
- String res = modemAccess.writeModemCommand("AT+CLCK=\"SC\",2",1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "0") != NULL)
- {
- res = modemAccess.writeModemCommand("AT+CLCK=\"SC\",1,\"" + pin + "\"",1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "OK") == NULL)
- {
- Serial.println("ERROR");
- pin_used = false;
- }
- else
- {
- Serial.println("OK. PIN lock on.");
- pin_used = true;
- }
- }
- else if(strstr(res_to_compare, "1") != NULL)
- {
- res = modemAccess.writeModemCommand("AT+CLCK=\"SC\",0,\"" + pin + "\"",1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "OK") == NULL)
- {
- Serial.println("ERROR");
- pin_used = true;
- }
- else
- {
- Serial.println("OK. PIN lock off.");
- pin_used = false;
- }
- }
- else
- {
- Serial.println("ERROR");
- }
-}
-
-/*
- Check registrer
-*/
-int GSM3ShieldV1PinManagement::checkReg()
-{
- delay(5000);
- String res = modemAccess.writeModemCommand("AT+CREG?",1000);
- // check response
- char res_to_compare[res.length()];
- res.toCharArray(res_to_compare, res.length());
- if(strstr(res_to_compare, "1") != NULL)
- return 0;
- else if(strstr(res_to_compare, "5") != NULL)
- return 1;
- else
- return -1;
-}
-
-/*
- Return if PIN lock is used
-*/
-bool GSM3ShieldV1PinManagement::getPINUsed()
-{
- return pin_used;
-}
-
-/*
- Set if PIN lock is used
-*/
-void GSM3ShieldV1PinManagement::setPINUsed(bool used)
-{
- pin_used = used;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1PinManagement.h b/libraries/GSM/src/GSM3ShieldV1PinManagement.h
deleted file mode 100644
index d5924ea1fe..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1PinManagement.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3SHIELDV1PINMANAGEMENT_
-#define _GSM3SHIELDV1PINMANAGEMENT_
-
-#include
-#include
-
-class GSM3ShieldV1PinManagement
-{
-
- private:
-
- GSM3ShieldV1AccessProvider gsm; // GSM access required for network register with PIN code
- GSM3ShieldV1DirectModemProvider modemAccess;
- bool pin_used; // determines if pin lock is activated
-
- public:
-
- /** Constructor */
- GSM3ShieldV1PinManagement();
-
- /** Check modem response and restart it
- */
- void begin();
-
- /** Check if PIN lock or PUK lock is activated
- @return 0 if PIN lock is off, 1 if PIN lock is on, -1 if PUK lock is on, -2 if error exists
- */
- int isPIN();
-
- /** Check if PIN code is correct and valid
- @param pin PIN code
- @return 0 if is correct, -1 if is incorrect
- */
- int checkPIN(String pin);
-
- /** Check if PUK code is correct and establish new PIN code
- @param puk PUK code
- @param pin New PIN code
- @return 0 if successful, otherwise return -1
- */
- int checkPUK(String puk, String pin);
-
- /** Change PIN code
- @param old Old PIN code
- @param pin New PIN code
- */
- void changePIN(String old, String pin);
-
- /** Change PIN lock status
- @param pin PIN code
- */
- void switchPIN(String pin);
-
- /** Check if modem was registered in GSM/GPRS network
- @return 0 if modem was registered, 1 if modem was registered in roaming, -1 if error exists
- */
- int checkReg();
-
- /** Return if PIN lock is used
- @return true if PIN lock is used, otherwise, return false
- */
- bool getPINUsed();
-
- /** Set PIN lock status
- @param used New PIN lock status
- */
- void setPINUsed(bool used);
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1SMSProvider.cpp b/libraries/GSM/src/GSM3ShieldV1SMSProvider.cpp
deleted file mode 100644
index ac7d3aac36..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1SMSProvider.cpp
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-GSM3ShieldV1SMSProvider::GSM3ShieldV1SMSProvider()
-{
- theGSM3SMSProvider=this;
-};
-
-//Send SMS begin function.
-int GSM3ShieldV1SMSProvider::beginSMS(const char* to)
-{
- if((theGSM3ShieldV1ModemCore.getStatus() != GSM_READY)&&(theGSM3ShieldV1ModemCore.getStatus() != GPRS_READY))
- return 2;
-
- theGSM3ShieldV1ModemCore.setPhoneNumber((char*)to);
- theGSM3ShieldV1ModemCore.openCommand(this,BEGINSMS);
- beginSMSContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Send SMS continue function.
-void GSM3ShieldV1SMSProvider::beginSMSContinue()
-{
- bool resp;
- // 1: Send AT
- // 2: wait for > and write text
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CMGS=\""), false);
- theGSM3ShieldV1ModemCore.print(theGSM3ShieldV1ModemCore.getPhoneNumber());
- theGSM3ShieldV1ModemCore.print("\"\r");
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, ">"))
- {
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Send SMS write function.
-void GSM3ShieldV1SMSProvider::writeSMS(char c)
-{
- theGSM3ShieldV1ModemCore.write(c);
-}
-
-//Send SMS begin function.
-int GSM3ShieldV1SMSProvider::endSMS()
-{
- theGSM3ShieldV1ModemCore.openCommand(this,ENDSMS);
- endSMSContinue();
- while(ready()==0) delay(100);
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Send SMS continue function.
-void GSM3ShieldV1SMSProvider::endSMSContinue()
-{
- bool resp;
- // 1: Send #26
- // 2: wait for OK
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.write(26);
- theGSM3ShieldV1ModemCore.print("\r");
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if (resp)
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Available SMS main function.
-int GSM3ShieldV1SMSProvider::availableSMS()
-{
- flagReadingSMS = 0;
- theGSM3ShieldV1ModemCore.openCommand(this,AVAILABLESMS);
- availableSMSContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Available SMS continue function.
-void GSM3ShieldV1SMSProvider::availableSMSContinue()
-{
- // 1: AT+CMGL="REC UNREAD",1
- // 2: Receive +CMGL: _id_ ... READ","_numero_" ... \n_mensaje_\nOK
- // 3: Send AT+CMGD= _id_
- // 4: Receive OK
- // 5: Remaining SMS text in case full buffer.
- // This implementation really does not care much if the modem aswers trash to CMGL
- bool resp;
- //int msglength_aux;
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CMGL=\"REC UNREAD\",1"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseCMGL_available(resp))
- {
- if (!resp) theGSM3ShieldV1ModemCore.closeCommand(4);
- else theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- break;
- }
-
-}
-
-//SMS available parse.
-bool GSM3ShieldV1SMSProvider::parseCMGL_available(bool& rsp)
-{
- fullBufferSMS = (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()<=4);
- if (!(theGSM3ShieldV1ModemCore.theBuffer().chopUntil("+CMGL:", true)))
- rsp = false;
- else
- rsp = true;
- idSMS=theGSM3ShieldV1ModemCore.theBuffer().readInt();
-
- //If there are 2 SMS in buffer, response is ...CRLFCRLF+CMGL
- twoSMSinBuffer = theGSM3ShieldV1ModemCore.theBuffer().locate("\r\n\r\n+");
-
- checkSecondBuffer = 0;
-
- return true;
-}
-
-//remoteNumber SMS function.
-int GSM3ShieldV1SMSProvider::remoteSMSNumber(char* number, int nlength)
-{
- theGSM3ShieldV1ModemCore.theBuffer().extractSubstring("READ\",\"", "\"", number, nlength);
-
- return 1;
-}
-
-//remoteNumber SMS function.
-int GSM3ShieldV1SMSProvider::readSMS()
-{
- char charSMS;
- //First char.
- if (!flagReadingSMS)
- {
- flagReadingSMS = 1;
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil("\n", true);
- }
- charSMS = theGSM3ShieldV1ModemCore.theBuffer().read();
-
- //Second Buffer.
- if (checkSecondBuffer)
- {
- checkSecondBuffer = 0;
- twoSMSinBuffer = theGSM3ShieldV1ModemCore.theBuffer().locate("\r\n\r\n+");
- }
-
- //Case the last char in buffer.
- if ((!twoSMSinBuffer)&&fullBufferSMS&&(theGSM3ShieldV1ModemCore.theBuffer().availableBytes()==127))
- {
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- fullBufferSMS = 0;
- checkSecondBuffer = 1;
- theGSM3ShieldV1ModemCore.openCommand(this,XON);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- delay(10);
-
- return charSMS;
- }
- //Case two SMS in buffer
- else if (twoSMSinBuffer)
- {
- if (theGSM3ShieldV1ModemCore.theBuffer().locate("\r\n\r\n+"))
- {
- return charSMS;
- }
- else
- {
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.openCommand(this,XON);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- delay(10);
- return 0;
- }
- }
- //Case 1 SMS and buffer not full
- else if (!fullBufferSMS)
- {
- if (theGSM3ShieldV1ModemCore.theBuffer().locate("\r\n\r\nOK"))
- {
- return charSMS;
- }
- else
- {
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.openCommand(this,XON);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- delay(10);
- return 0;
- }
- }
- //Case to read all the chars in buffer to the end.
- else
- {
- return charSMS;
- }
-}
-
-//Read socket main function.
-int GSM3ShieldV1SMSProvider::peekSMS()
-{
- if (!flagReadingSMS)
- {
- flagReadingSMS = 1;
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil("\n", true);
- }
-
- return theGSM3ShieldV1ModemCore.theBuffer().peek(0);
-}
-
-//Flush SMS main function.
-void GSM3ShieldV1SMSProvider::flushSMS()
-{
-
- //With this, sms data can fill up to 2x128+5x128 bytes.
- for (int aux = 0;aux<5;aux++)
- {
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- delay(10);
- }
-
- theGSM3ShieldV1ModemCore.openCommand(this,FLUSHSMS);
- flushSMSContinue();
-}
-
-//Send SMS continue function.
-void GSM3ShieldV1SMSProvider::flushSMSContinue()
-{
- bool resp;
- // 1: Deleting SMS
- // 2: wait for OK
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CMGD="), false);
- theGSM3ShieldV1ModemCore.print(idSMS);
- theGSM3ShieldV1ModemCore.print("\r");
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-void GSM3ShieldV1SMSProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
-/* case XON:
- if (flagReadingSocket)
- {
-// flagReadingSocket = 0;
- fullBufferSocket = (theGSM3ShieldV1ModemCore.theBuffer().availableBytes()<3);
- }
- else theGSM3ShieldV1ModemCore.openCommand(this,NONE);
- break;
-*/ case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case BEGINSMS:
- beginSMSContinue();
- break;
- case ENDSMS:
- endSMSContinue();
- break;
- case AVAILABLESMS:
- availableSMSContinue();
- break;
- case FLUSHSMS:
- flushSMSContinue();
- break;
-
- default:
- break;
- }
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1SMSProvider.h b/libraries/GSM/src/GSM3ShieldV1SMSProvider.h
deleted file mode 100644
index 408da338e1..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1SMSProvider.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SHIELDV1SMSPROVIDER__
-#define __GSM3_SHIELDV1SMSPROVIDER__
-
-#include
-#include
-#include
-
-
-class GSM3ShieldV1SMSProvider : public GSM3MobileSMSProvider, public GSM3ShieldV1BaseProvider
-{
- public:
- GSM3ShieldV1SMSProvider();
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** Begin a SMS to send it
- @param to Destination
- @return error command if it exists
- */
- inline int beginSMS(const char* to);
-
- /** Write a SMS character by character
- @param c Character
- */
- inline void writeSMS(char c);
-
- /** End SMS
- @return error command if it exists
- */
- inline int endSMS();
-
- /** Check if SMS available and prepare it to be read
- @return number of bytes in a received SMS
- */
- int availableSMS();
-
- /** Read a byte but do not advance the buffer header (circular buffer)
- @return character
- */
- int peekSMS();
-
- /** Delete the SMS from Modem memory and proccess answer
- */
- void flushSMS();
-
- /** Read sender number phone
- @param number Buffer for save number phone
- @param nlength Buffer length
- @return 1 success, >1 error
- */
- int remoteSMSNumber(char* number, int nlength); //Before reading the SMS, read the phone number.
-
- /** Read one char for SMS buffer (advance circular buffer)
- @return character
- */
- int readSMS();
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- private:
-
- int idSMS; // Id from current SMS being read.
- bool flagReadingSMS; // To detect first SMS char if not yet reading.
- bool fullBufferSMS; // To detect if the SMS being read needs another buffer.
- bool twoSMSinBuffer; // To detect if the buffer has more than 1 SMS.
- bool checkSecondBuffer; // Pending to detect if the second buffer has more than 1 SMS.
-
- /** Continue to begin SMS function
- */
- void beginSMSContinue();
-
- /** Continue to end SMS function
- */
- void endSMSContinue();
-
- /** Continue to available SMS function
- */
- void availableSMSContinue();
-
- /** Continue to flush SMS function
- */
- void flushSMSContinue();
-
- /** Parse CMGL response
- @param rsp Returns true if expected response exists
- @return true if command executed correctly
- */
- bool parseCMGL_available(bool& rsp);
-};
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1ScanNetworks.cpp b/libraries/GSM/src/GSM3ShieldV1ScanNetworks.cpp
deleted file mode 100644
index 8b5d5e4989..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ScanNetworks.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#include
-
-GSM3ShieldV1ScanNetworks::GSM3ShieldV1ScanNetworks(bool trace): modem(trace)
-{
-}
-
-GSM3_NetworkStatus_t GSM3ShieldV1ScanNetworks::begin()
-{
- modem.begin();
- modem.restartModem();
- // check modem response
- modem.writeModemCommand("AT", 1000);
- modem.writeModemCommand("ATE0", 1000);
- return IDLE;
-}
-
-String GSM3ShieldV1ScanNetworks::getCurrentCarrier()
-{
- String modemResponse = modem.writeModemCommand("AT+COPS?", 2000);
-
- // Parse and check response
- char res_to_split[modemResponse.length()];
- modemResponse.toCharArray(res_to_split, modemResponse.length());
- if(strstr(res_to_split,"ERROR") == NULL){
- // Tokenizer
- char *ptr_token;
- ptr_token = strtok(res_to_split, "\"");
- ptr_token = strtok(NULL, "\"");
- String final_result = ptr_token;
- return final_result;
- }else{
- return String(NULL);
- }
-}
-
-String GSM3ShieldV1ScanNetworks::getSignalStrength()
-{
- String modemResponse = modem.writeModemCommand("AT+CSQ", 2000);
- char res_to_split[modemResponse.length()];
- modemResponse.toCharArray(res_to_split, modemResponse.length());
- if((strstr(res_to_split,"ERROR") == NULL) | (strstr(res_to_split,"99") == NULL)){
- // Tokenizer
- char *ptr_token;
- ptr_token = strtok(res_to_split, ":");
- ptr_token = strtok(NULL, ":");
- ptr_token = strtok(ptr_token, ",");
- String final_result = ptr_token;
- final_result.trim();
- return final_result;
- }else{
- return String(NULL);
- }
-}
-
-String GSM3ShieldV1ScanNetworks::readNetworks()
-{
- String modemResponse = modem.writeModemCommand("AT+COPS=?",20000);
- String result;
- bool inQuotes=false;
- int quoteCounter=0;
- for(unsigned int i=0; i
-#include
-
-class GSM3ShieldV1ScanNetworks
-{
- private:
- GSM3ShieldV1DirectModemProvider modem;
-
- public:
-
- /** Constructor
- @param trace if true, dumps all AT dialogue to Serial
- @return -
- */
- GSM3ShieldV1ScanNetworks(bool trace=false);
-
- /** begin (forces modem hardware restart, so we begin from scratch)
- @return Always returns IDLE status
- */
- GSM3_NetworkStatus_t begin();
-
- /** Read current carrier
- @return Current carrier
- */
- String getCurrentCarrier();
-
- /** Obtain signal strength
- @return Signal Strength
- */
- String getSignalStrength();
-
- /** Search available carriers
- @return A string with list of networks available
- */
- String readNetworks();
-};
-
-#endif
\ No newline at end of file
diff --git a/libraries/GSM/src/GSM3ShieldV1ServerProvider.cpp b/libraries/GSM/src/GSM3ShieldV1ServerProvider.cpp
deleted file mode 100644
index 463fba6d34..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ServerProvider.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-#include
-
-GSM3ShieldV1ServerProvider::GSM3ShieldV1ServerProvider()
-{
- theGSM3MobileServerProvider=this;
-};
-
-//Response management.
-void GSM3ShieldV1ServerProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case NONE:
- theGSM3ShieldV1ModemCore.gss.cb.deleteToTheEnd(from);
- break;
- case CONNECTSERVER:
- connectTCPServerContinue();
- break;
- /*case GETIP:
- getIPContinue();
- break;*/
-
- default:
- break;
- }
-}
-
-//Connect Server main function.
-int GSM3ShieldV1ServerProvider::connectTCPServer(int port)
-{
- // We forget about LocalIP as it has no real use, the modem does whatever it likes
- theGSM3ShieldV1ModemCore.setPort(port);
- theGSM3ShieldV1ModemCore.openCommand(this,CONNECTSERVER);
- // From this moment on we wait for a call
- connectTCPServerContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Connect Server continue function.
-void GSM3ShieldV1ServerProvider::connectTCPServerContinue()
-{
-
- bool resp;
- // 1: Read Local IP "AT+QILOCIP"
- // 2: Waiting for IP and Set local port "AT+QILPORT"
- // 3: Waiting for QILPOR OK andConfigure as server "AT+QISERVER"
- // 4: Wait for SERVER OK
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //"AT+QILOCIP."
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QILOCIP"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- //Not IP storing but the command is necessary.
- //if(parseQILOCIP_rsp(local_IP, local_IP_Length, resp))
- // This awful trick saves some RAM bytes
- char aux[3];
- aux[0]='\r';aux[1]='\n';aux[2]=0;
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp, aux))
- {
- //Response received
- if(resp)
- {
- // Great. Go for the next step
- // AT+QILPORT
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QILPORT=\"TCP\","),false);
- theGSM3ShieldV1ModemCore.print( theGSM3ShieldV1ModemCore.getPort());
- theGSM3ShieldV1ModemCore.print('\r');
- theGSM3ShieldV1ModemCore.setCommandCounter(3);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 3:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- if(resp)
- {
- // OK received
- // Great. Go for the next step
- // AT+QISERVER
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+QISERVER"),true);
- theGSM3ShieldV1ModemCore.setCommandCounter(4);
- }
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- case 4:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- // Response received
- // OK received, kathapoon, chessespoon
- if (resp)
- {
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//QILOCIP parse.
-/*bool GSM3ShieldV1ServerProvider::parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp)
-{
- if (!(theGSM3ShieldV1ModemCore.theBuffer().extractSubstring("\r\n","\r\n", LocalIP, LocalIPlength)))
- rsp = false;
- else
- rsp = true;
- return true;
-}
-
-//Get IP main function.
-int GSM3ShieldV1ServerProvider::getIP(char* LocalIP, int LocalIPlength)
-{
- theGSM3ShieldV1ModemCore.setPhoneNumber(LocalIP);
- theGSM3ShieldV1ModemCore.setPort(LocalIPlength);
- theGSM3ShieldV1ModemCore.openCommand(this,GETIP);
- getIPContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-void GSM3ShieldV1ServerProvider::getIPContinue()
-{
-
- bool resp;
- // 1: Read Local IP "AT+QILOCIP"
- // 2: Waiting for IP.
-
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //AT+QILOCIP
- theGSM3ShieldV1ModemCore.genericCommand_rq(_command_MonoQILOCIP);
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseQILOCIP_rsp(theGSM3ShieldV1ModemCore.getPhoneNumber(), theGSM3ShieldV1ModemCore.getPort(), resp))
- {
- if (resp)
- theGSM3ShieldV1ModemCore.closeCommand(1);
- else
- theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- break;
- }
-}*/
-
-bool GSM3ShieldV1ServerProvider::getSocketAsServerModemStatus(int s)
-{
- if(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED)
- return true;
- else
- return false;
-}
-
-
-//URC recognize.
-bool GSM3ShieldV1ServerProvider::recognizeUnsolicitedEvent(byte oldTail)
-{
-
- //int nlength;
- char auxLocate [15];
-
- //REMOTE SOCKET CLOSED.
- prepareAuxLocate(PSTR("CLOSED\r\n"), auxLocate);
- if(theGSM3ShieldV1ModemCore.gss.cb.locate(auxLocate))
- {
- //To detect remote socket closed for example inside socket data.
- theGSM3ShieldV1ModemCore.setStatus(GPRS_READY);
- }
-
-
- //REMOTE SOCKET ACCEPTED.
- prepareAuxLocate(PSTR("CONNECT\r\n"), auxLocate);
- if(theGSM3ShieldV1ModemCore.gss.cb.locate(auxLocate))
- {
- //To detect remote socket closed for example inside socket data.
- theGSM3ShieldV1ModemCore.theBuffer().chopUntil(auxLocate, true);
- theGSM3ShieldV1ModemCore.gss.spaceAvailable();
- theGSM3ShieldV1ModemCore.setStatus(TRANSPARENT_CONNECTED);
- return true;
- }
-
- return false;
-}
-
-bool GSM3ShieldV1ServerProvider::getStatusSocketAsServer(uint8_t socket)
-{
- return(theGSM3ShieldV1ModemCore.getStatus()==TRANSPARENT_CONNECTED);
-};
-
-void GSM3ShieldV1ServerProvider::releaseSocket(int socket)
-{
-}
-
-int GSM3ShieldV1ServerProvider::getNewOccupiedSocketAsServer()
-{
- return 0;
-}
diff --git a/libraries/GSM/src/GSM3ShieldV1ServerProvider.h b/libraries/GSM/src/GSM3ShieldV1ServerProvider.h
deleted file mode 100644
index 93fcd89a56..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1ServerProvider.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SHIELDV1SERVERPROVIDER__
-#define __GSM3_SHIELDV1SERVERPROVIDER__
-
-#include
-#include
-
-class GSM3ShieldV1ServerProvider : public GSM3MobileServerProvider, public GSM3ShieldV1BaseProvider
-{
- private:
-
- /** Continue to connect to server with TCP protocol function
- */
- void connectTCPServerContinue();
-
- /** Continue to get IP address function
- */
- //void getIPContinue();
-
- /** Parse QILOCIP response
- @param LocalIP Buffer for save local IP address
- @param LocalIPlength Buffer size
- @param rsp Returns if expected response exists
- @return true if command executed correctly
- */
- //bool parseQILOCIP_rsp(char* LocalIP, int LocalIPlength, bool& rsp);
-
- /** Release socket
- @param socket Socket
- */
- void releaseSocket(int socket);
-
- public:
-
- /** Constructor */
- GSM3ShieldV1ServerProvider();
-
- /** minSocketAsServer
- @return 0
- */
- int minSocketAsServer(){return 0;};
-
- /** maxSocketAsServer
- @return 0
- */
- int maxSocketAsServer(){return 0;};
-
- /** Get modem status
- @param s Socket
- @return modem status (true if connected)
- */
- bool getSocketAsServerModemStatus(int s);
-
- /** Get new occupied socket as server
- @return return -1 if no new socket has been occupied
- */
- int getNewOccupiedSocketAsServer();
-
- /** Connect server to TCP port
- @param port TCP port
- @return command error if exists
- */
- int connectTCPServer(int port);
-
- //int getIP(char* LocalIP, int LocalIPlength);
-// int disconnectTCP(bool client1Server0, int id_socket);
-
- /** Get last command status
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Get socket status as server
- @param socket Socket to get status
- @return socket status
- */
- bool getStatusSocketAsServer(uint8_t socket);
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- /** Recognize unsolicited event
- @param oldTail
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte oldTail);
-
-
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV1VoiceProvider.cpp b/libraries/GSM/src/GSM3ShieldV1VoiceProvider.cpp
deleted file mode 100644
index 1560f33324..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1VoiceProvider.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-static bool enableVoiceCall = false;
-
-GSM3ShieldV1VoiceProvider* theGSM3MobileVoiceProvider;
-
-GSM3ShieldV1VoiceProvider::GSM3ShieldV1VoiceProvider()
-{
- phonelength=0;
- _VoiceCallServiceEnable=false;
- theGSM3MobileVoiceProvider=this;
-}
-
-void GSM3ShieldV1VoiceProvider::initialize()
-{
- theGSM3ShieldV1ModemCore.registerUMProvider(this);
-}
-
-//Voice Call main function.
-int GSM3ShieldV1VoiceProvider::voiceCall(const char* to)
-{
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("ATD"),false);
- theGSM3ShieldV1ModemCore.print(to);
- theGSM3ShieldV1ModemCore.print(";\r");
- setvoiceCallStatus(CALLING);
- return 1;
-}
-
-//Retrieve calling number main function.
-int GSM3ShieldV1VoiceProvider::retrieveCallingNumber (char* buffer, int bufsize)
-{
- theGSM3ShieldV1ModemCore.setPhoneNumber(buffer);
- phonelength = bufsize;
- theGSM3ShieldV1ModemCore.setCommandError(0);
- theGSM3ShieldV1ModemCore.setCommandCounter(1);
- theGSM3ShieldV1ModemCore.openCommand(this,RETRIEVECALLINGNUMBER);
- retrieveCallingNumberContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Retrieve calling number Continue function.
-void GSM3ShieldV1VoiceProvider::retrieveCallingNumberContinue()
-{
- // 1: AT+CLCC
- // 2: Receive +CLCC: 1,1,4,0,0,"num",129,""
- // This implementation really does not care much if the modem aswers trash to CMGL
- //bool resp;
- //int msglength_aux;
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("AT+CLCC"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(parseCLCC(theGSM3ShieldV1ModemCore.getPhoneNumber(), phonelength))
- {
- theGSM3ShieldV1ModemCore.closeCommand(1);
- }
- break;
- }
-}
-
-//CLCC parse.
-bool GSM3ShieldV1VoiceProvider::parseCLCC(char* number, int nlength)
-{
- theGSM3ShieldV1ModemCore.theBuffer().extractSubstring("+CLCC: 1,1,4,0,0,\"","\"", number, nlength);
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- return true;
-}
-
-//Answer Call main function.
-int GSM3ShieldV1VoiceProvider::answerCall()
-{
- theGSM3ShieldV1ModemCore.setCommandError(0);
- theGSM3ShieldV1ModemCore.setCommandCounter(1);
- theGSM3ShieldV1ModemCore.openCommand(this,ANSWERCALL);
- answerCallContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Answer Call continue function.
-void GSM3ShieldV1VoiceProvider::answerCallContinue()
-{
- // 1: ATA
- // 2: Waiting for OK
-
- // This implementation really does not care much if the modem aswers trash to CMGL
- bool resp;
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- // ATA ;
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("ATA"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- setvoiceCallStatus(TALKING);
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Hang Call main function.
-int GSM3ShieldV1VoiceProvider::hangCall()
-{
- theGSM3ShieldV1ModemCore.setCommandError(0);
- theGSM3ShieldV1ModemCore.setCommandCounter(1);
- theGSM3ShieldV1ModemCore.openCommand(this,HANGCALL);
- hangCallContinue();
- return theGSM3ShieldV1ModemCore.getCommandError();
-}
-
-//Hang Call continue function.
-void GSM3ShieldV1VoiceProvider::hangCallContinue()
-{
- // 1: ATH
- // 2: Waiting for OK
-
- bool resp;
- switch (theGSM3ShieldV1ModemCore.getCommandCounter()) {
- case 1:
- //ATH
- theGSM3ShieldV1ModemCore.genericCommand_rq(PSTR("ATH"));
- theGSM3ShieldV1ModemCore.setCommandCounter(2);
- break;
- case 2:
- if(theGSM3ShieldV1ModemCore.genericParse_rsp(resp))
- {
- setvoiceCallStatus(IDLE_CALL);
- if (resp) theGSM3ShieldV1ModemCore.closeCommand(1);
- else theGSM3ShieldV1ModemCore.closeCommand(3);
- }
- break;
- }
-}
-
-//Response management.
-void GSM3ShieldV1VoiceProvider::manageResponse(byte from, byte to)
-{
- switch(theGSM3ShieldV1ModemCore.getOngoingCommand())
- {
- case ANSWERCALL:
- answerCallContinue();
- break;
- case HANGCALL:
- hangCallContinue();
- break;
- case RETRIEVECALLINGNUMBER:
- retrieveCallingNumberContinue();
- break;
-
- default:
- break;
- }
-}
-
-//URC recognize.
-bool GSM3ShieldV1VoiceProvider::recognizeUnsolicitedEvent(byte oldTail)
-{
-
- //int nlength;
- char auxLocate [15];
- //RING.
- prepareAuxLocate(PSTR("RING"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- // RING
- setvoiceCallStatus(RECEIVINGCALL);
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- return true;
- }
-
- //CALL ACEPTED.
- prepareAuxLocate(PSTR("+COLP:"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- //DEBUG
- //Serial.println("Call Accepted.");
- setvoiceCallStatus(TALKING);
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- return true;
- }
-
- //NO CARRIER.
- prepareAuxLocate(PSTR("NO CARRIER"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- //DEBUG
- //Serial.println("NO CARRIER received.");
- setvoiceCallStatus(IDLE_CALL);
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- return true;
- }
-
- //BUSY.
- prepareAuxLocate(PSTR("BUSY"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- //DEBUG
- //Serial.println("BUSY received.");
- setvoiceCallStatus(IDLE_CALL);
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- return true;
- }
-
- //CALL RECEPTION.
- prepareAuxLocate(PSTR("+CLIP:"), auxLocate);
- if(theGSM3ShieldV1ModemCore.theBuffer().locate(auxLocate))
- {
- theGSM3ShieldV1ModemCore.theBuffer().flush();
- setvoiceCallStatus(RECEIVINGCALL);
- return true;
- }
-
- return false;
-}
-
-void GSM3ShieldV1VoiceProvider::setVoiceCallService(bool status)
-{
- //_VoiceCallServiceEnable = status;
-
- enableVoiceCall = status;
-}
-
-void GSM3ShieldV1VoiceProvider::linkToModemProvider()
-{
- //if(_VoiceCallServiceEnable == true)
- if(enableVoiceCall == true)
- initialize();
-}
-
-
diff --git a/libraries/GSM/src/GSM3ShieldV1VoiceProvider.h b/libraries/GSM/src/GSM3ShieldV1VoiceProvider.h
deleted file mode 100644
index d5d4ff11e4..0000000000
--- a/libraries/GSM/src/GSM3ShieldV1VoiceProvider.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-
-#ifndef _GSM3SHIELDV1VOICEPROVIDER_
-#define _GSM3SHIELDV1VOICEPROVIDER_
-
-#include
-#include
-#include
-
-class GSM3ShieldV1VoiceProvider : public GSM3MobileVoiceProvider, public GSM3ShieldV1BaseProvider
-{
- public:
-
- /** Constructor */
- GSM3ShieldV1VoiceProvider();
-
- /** initilizer, links with modem provider */
- virtual void initialize();
-
-
- /** Manages modem response
- @param from Initial byte of buffer
- @param to Final byte of buffer
- */
- void manageResponse(byte from, byte to);
-
- //Call functions.
-
- /** Launch a voice call
- @param number Phone number to be called
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- int voiceCall(const char* number);
-
- /** Answer a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- int answerCall();
-
- /** Hang a voice call
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- int hangCall();
-
- /** Retrieve phone number of caller
- @param buffer Buffer for copy phone number
- @param bufsize Buffer size
- @return If asynchronous, returns 0. If synchronous, 1 if success, other if error
- */
- int retrieveCallingNumber(char* buffer, int bufsize);
-
- /** Get last command status
- @return Returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready(){return GSM3ShieldV1BaseProvider::ready();};
-
- /** Recognize URC
- @param oldTail
- @return true if successful
- */
- bool recognizeUnsolicitedEvent(byte oldTail);
-
- /** Returns voice call status
- @return voice call status
- */
- GSM3_voiceCall_st getvoiceCallStatus(){ready(); return _voiceCallstatus;};
-
- /** Set voice call status
- @param status New status for voice call
- */
- void setvoiceCallStatus(GSM3_voiceCall_st status) { _voiceCallstatus = status; };
-
- /** Set voice call service status
- @param status New status for voice call
- */
- void setVoiceCallService(bool status);
-
- /** Get voice call service status
- @return Status of voice call
- */
- bool getVoiceCallService() { return _VoiceCallServiceEnable;};
-
- /** If voice call service enable, link to modem provider
- */
- void linkToModemProvider();
-
- private:
-
- int phonelength; // Phone number length
-
- GSM3_voiceCall_st _voiceCallstatus; // The voiceCall status
-
- /** Continue to voice call function
- */
- void voiceCallContinue();
-
- /** Continue to answer call function
- */
- void answerCallContinue();
-
- /** Continue to hang call function
- */
- void hangCallContinue();
-
- /** Continue to retrieve calling number function
- */
- void retrieveCallingNumberContinue();
-
- /** Parse CLCC response from buffer
- @param number Number initial for extract substring of response
- @param nlength Substring length
- @return true if successful
- */
- bool parseCLCC(char* number, int nlength);
-
- bool _VoiceCallServiceEnable;
-};
-
-extern GSM3ShieldV1VoiceProvider* theGSM3MobileVoiceProvider;
-
-#endif
diff --git a/libraries/GSM/src/GSM3ShieldV2.cpp b/libraries/GSM/src/GSM3ShieldV2.cpp
deleted file mode 100644
index 25e2790334..0000000000
--- a/libraries/GSM/src/GSM3ShieldV2.cpp
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
-This file is part of GSM3ShieldV2 library developed by Arduino.org (http://arduino.org).
-
- GSM3ShieldV2 library is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- GSM3ShieldV2 library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GSM3ShieldV2 library. If not, see .
-*/
-
-#include
-#include
-
-
-// constructor
-GSM3ShieldV2::GSM3ShieldV2(bool db)
-{
- debug=db;
-}
-
-GSM3ShieldV2::GSM3ShieldV2()
-{
-}
-
-// get position (longitude and latitude)
-String GSM3ShieldV2::getPosition()
-{
- String Result = "";
- String number;
- // AT command for obtain the current Location
- String modemResponse = modemAccess.writeModemCommand("AT+QCELLLOC=1", 1000);
- // Parse and check response
- char res_to_compare[modemResponse.length()];
- modemResponse.toCharArray(res_to_compare, modemResponse.length());
- if(strstr(res_to_compare,"OK") == NULL)
- {
- if(debug==true) Serial.println(modemResponse);
- Result =" Position not lock ";
- }
- else
- {
- if(debug==true) Serial.println(modemResponse);
- Result = modemResponse.substring(12, 33);
-
- }
- return Result;
-}
-// set speaker loudness (this command have not effect. Refer to Quectel M10 datasheet for further informaions )
-String GSM3ShieldV2::speakerLoudness(int level) // set the speaker Volume
- // 0: Low speaker volume
- // 1: Low speaker volume
- // 2: Medium speaker volume
- // 3: High speaker volume
-{
- String Result ="", modemResponse;
- // Send the AT command for set the speaker volume
- switch(level)
- {
- case 0:
- modemResponse = modemAccess.writeModemCommand("ATL0",300); // set low volume
- break;
-
- case 1:
- modemResponse = modemAccess.writeModemCommand("ATL1",300); // set low volume
- break;
-
- case 2:
- modemResponse = modemAccess.writeModemCommand("ATL2",300); // set medium volume
- break;
-
- case 3:
- modemResponse = modemAccess.writeModemCommand("ATL3",300); // set High volume
- break;
- }
-
- char res_to_compare[modemResponse.length()];
- modemResponse.toCharArray(res_to_compare, modemResponse.length());
- if(strstr(res_to_compare,"OK") == NULL)
- {
- Result =" Error !";
- if(debug==true) Serial.println(Result);
- }
- else
- {
- Result = modemResponse.substring(1, 45);
- if(debug==true) Serial.println(Result);
- }
-
- return Result;
-}
-// set speaker mode
-String GSM3ShieldV2::speakerMode(int mode) // Set the speaker on mode
- // 0: Speaker is always off
- // 1: Speaker is on until TA inform TE that carrier has been detected
- // 2: Speaker is always on when TA is off-hook
-{
- int spkMode=0;
- char Mode[2],command[5];
-
- Mode[1]='\0';
- command[4]='\0';
-
- spkMode=mode;
- if((spkMode < 0) || (spkMode > 2)) spkMode=DEFAULT_speakerMode;
- strcpy(command,"ATM");
- itoa(spkMode,Mode,10);
- strcat(command,Mode);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
-
- return modemResponse;
-
-}
-// set alert sound mode
-String GSM3ShieldV2::alertSoundMode(int mode) // silent the alert sound
- // 0: Normal mode
- // 1: Silent mode
-{
- int soundMode=0;
- char Mode[2],command[10];
-
- Mode[1]='\0';
- command[9]='\0';
-
- soundMode=mode;
- if((soundMode < 0) || (soundMode > 1)) soundMode=DEFAULT_AlertSoundMode;
- strcpy(command,"AT+CALM=");
- itoa(soundMode,Mode,10);
- strcat(command,Mode);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
-
- return modemResponse;
-}
-// set ringer sound level
-String GSM3ShieldV2::ringerSoundLevel(int level) // Set the ringer volume (0-100)
-{
- char command[12], lev[4];
- int ringLevel=level;
- if((ringLevel < 0) || (ringLevel > 100)) ringLevel=DEFAULT_RingerSoundLevel;
-
- command[11]='\0';
- lev[3]='\0';
- strcpy(command,"AT+CRSL=");
- itoa(ringLevel,lev,10);
- strcat(command,lev);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
- return modemResponse;
-
-
-}
-// set lodspeaker volume level
-String GSM3ShieldV2::loudSpeakerVolumeLevel(int level) // Set the Speaker volume (0-100)
-{
- char command[12], lev[4];
- int speakerLevel=level;
- if((speakerLevel < 0) || (speakerLevel > 100)) speakerLevel=DEFAULT_LoudSpeakerVolumeLevel;
-
- command[11]='\0';
- lev[3]='\0';
- strcpy(command,"AT+CLVL=");
- itoa(speakerLevel,lev,10);
- strcat(command,lev);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
- return modemResponse;
-}
-// set mute control
-String GSM3ShieldV2::muteControl(int mode) // switch on or off mute
- // 0: Mute off
- // 1: Mute on
-{
- char command[10], mod[2];
- int muteCtrl=mode;
- if((muteCtrl < 0) || (muteCtrl > 1)) muteCtrl=DEFAULT_muteControl; //operazione non permessa
-
- command[9]='\0';
- mod[1]='\0';
- strcpy(command,"AT+CMUT=");
- itoa(muteCtrl,mod,10);
- strcat(command,mod);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
- return modemResponse;
-}
-// set microphone gain
-String GSM3ShieldV2::microphoneGainLevel(int channel, int gain) // Set the microphone channel and level
- // Channel:
- // 0: Normal Microphone
- // 1: Headset Microphone
- // 2: Loudspeaker Microphone
- // Gain: (0-15)
-{
- char chn[2], gn[3],command[13];
-
- chn[1]='\0';
- gn[2]='\0';
- command[12]='\0';
-
- if((channel < 0) || (channel > 2)) itoa(DEFAULT_Channel,chn,10);
- else itoa(channel,chn,10);
-
- if((gain < 0) || (gain > 15)) itoa(DEFAULT_MicrophoneGainLevel,gn,10);
- else itoa(gain,gn,10);
-
- strcpy(command,"AT+QMIC=");
- strcat(command,chn);
- strcat(command,",");
- strcat(command,gn);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
- return modemResponse;
-
-}
-// set audio channel
-String GSM3ShieldV2::swapAudioChannel(int channel) // Set the audio channel
- // 0: Normal audio channel
- // 1: headset audio channel
- // 2: Loudspeaker audio chanel
-{
- char chn[2], command[12];
-
- chn[1]='\0';
- command[11]='\0';
-
- if((channel < 0) || (channel > 2)) itoa(DEFAULT_Channel,chn,10);
- else itoa(channel,chn,10);
- strcpy(command,"AT+QAUDCH=");
- strcat(command,chn);
- String modemResponse=modemAccess.writeModemCommand(command,300);
- if(debug==true) Serial.println(modemResponse);
- return modemResponse;
-}
-// set the module echo mode (Refer Quectel M10 datasheet for further informaions)
-void GSM3ShieldV2::CommandEcho(int value)
-{
- switch(value)
- {
- case 0: modemAccess.writeModemCommand("ATE0",300);
- break;
-
- case 1: modemAccess.writeModemCommand("ATE1",300);
- break;
-
- default:
- break;
- }
-}
diff --git a/libraries/GSM/src/GSM3ShieldV2.h b/libraries/GSM/src/GSM3ShieldV2.h
deleted file mode 100644
index 56f6fa2c51..0000000000
--- a/libraries/GSM/src/GSM3ShieldV2.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-This file is part of GSM3ShieldV2 library developed by Arduino.org (http://arduino.org).
-
- GSM3ShieldV2 library is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- GSM3ShieldV2 library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GSM3ShieldV2 library. If not, see .
-*/
-
-#ifndef _GSM3SHIELDV2_
-#define _GSM3SHIELDV2_
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-class GSM3ShieldV2
-{
-
- private:
-
- GSM3ShieldV1DirectModemProvider modemAccess;
- GSM3ShieldV1AccessProvider gsm; // Access provider to GSM/GPRS network
-
- public:
-
- /** Constructor */
- GSM3ShieldV2();
- GSM3ShieldV2(bool db);
-
- bool debug=false;
-
- String getPosition(); // Get Current Location
-
- // Aded for voice call debug
- String speakerLoudness(int level); // set the speaker Volume
- // 0: Low speaker volume
- // 1: Low speaker volume
- // 2: Medium speaker volume
- // 3: High speaker volume
-
- String speakerMode(int mode); // Set the speaker on mode
- // 0: Speaker is always off
- // 1: Speaker is on until TA inform TE that carrier has been detected
- // 2: Speaker is always on when TA is off-hook
-
- String alertSoundMode(int mode); // silent the alert sound
- // 0: Normal mode
- // 1: Silent mode
-
- String ringerSoundLevel(int level); // Set the ringer volume (0-100)
-
- String loudSpeakerVolumeLevel(int level); // Set the Speaker volume (0-100)
-
- String muteControl(int mode); // switch on or off mute
- // 0: Mute off
- // 1: Mute on
-
- String microphoneGainLevel(int channel, int gain); // Set the microphone channel and level
- // Channel:
- // 0: Normal Microphone
- // 1: Headset Microphone
- // 2: Loudspeaker Microphone
- // Gain: (0-15)
-
- String swapAudioChannel(int channel); // Set the audio channel
- // 0: Normal audio channel
- // 1: headset audio channel
- // 2: Loudspeaker audio chanel
-
- void CommandEcho(int value); // 0: command echo OFF
- // 1: command echo ON
-
-};
-
-#endif
-
diff --git a/libraries/GSM/src/GSM3SoftSerial.cpp b/libraries/GSM/src/GSM3SoftSerial.cpp
deleted file mode 100644
index 5393871d7d..0000000000
--- a/libraries/GSM/src/GSM3SoftSerial.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telef�nica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include "GSM3SoftSerial.h"
-#include "GSM3IO.h"
-#include
-#include "pins_arduino.h"
-//#include
-
-#define __XON__ 0x11
-#define __XOFF__ 0x13
-
-#define _GSMSOFTSERIALFLAGS_ESCAPED_ 0x01
-#define _GSMSOFTSERIALFLAGS_SENTXOFF_ 0x02
-
-GSM3SoftSerial* GSM3SoftSerial::_activeObject=0;
-
-GSM3SoftSerial::GSM3SoftSerial(): cb(this){}
-
-void GSM3SoftSerial::begin(long speed)
-{
- _activeObject=this;
- _flags=0;
-
- uart_emul_init(UART1_EMUL_E,speed);
- uart_emul_attached_handler(&_timer, this->handle_interrupt);
-}
-
-void GSM3SoftSerial::close()
-{
- _activeObject=0;
- uart_emul_deinit(UART1_EMUL_E);
-}
-
-size_t GSM3SoftSerial::write(uint8_t c)
-{
- // Characters to be escaped under XON/XOFF control with Quectel
- if(c==0x11)
- {
- this->finalWrite(0x77);
- return this->finalWrite(0xEE);
- }
-
- if(c==0x13)
- {
- this->finalWrite(0x77);
- return this->finalWrite(0xEC);
- }
-
- if(c==0x77)
- {
- this->finalWrite(0x77);
- return this->finalWrite(0x88);
- }
-
- return this->finalWrite(c);
-}
-
-size_t GSM3SoftSerial::finalWrite(uint8_t c)
-{
- return uart_emul_write(UART1_EMUL_E, c);
-}
-
-void GSM3SoftSerial::tunedDelay(uint16_t delay)
-{
- delayInsideIT(delay);
-}
-
-void GSM3SoftSerial::handle_interrupt()
-{
- if(_activeObject)
- _activeObject->recv();
-}
-
-void GSM3SoftSerial::recv()
-{
- bool firstByte=true;
- byte thisHead;
-
- uint8_t d = 0;
- bool morebytes=false;
- bool fullbuffer=false;
-
- if( ((_flags & _GSMSOFTSERIALFLAGS_SENTXOFF_) == _GSMSOFTSERIALFLAGS_SENTXOFF_)
- && (uart_emul_available(UART1_EMUL_E) < UART_RCV_SIZE)
- && (cb.availableBytes() > 6) )
- {
- finalWrite(__XON__);
- _flags &= ~_GSMSOFTSERIALFLAGS_SENTXOFF_;
- } else {
- if(uart_emul_available(UART1_EMUL_E) >= UART_RCV_SIZE) {
- finalWrite(__XOFF__);
- _flags |= _GSMSOFTSERIALFLAGS_SENTXOFF_;
- }
-
- if(uart_emul_available(UART1_EMUL_E) > 0)
- {
- do
- {
- if(cb.availableBytes() < 6) {
- fullbuffer=1;
- if((_flags & _GSMSOFTSERIALFLAGS_SENTXOFF_) != _GSMSOFTSERIALFLAGS_SENTXOFF_) {
- finalWrite(__XOFF__);
- _flags |= _GSMSOFTSERIALFLAGS_SENTXOFF_;
- }
- }
-
- d = uart_emul_read(UART1_EMUL_E);
-
- if(keepThisChar(&d))
- {
- cb.write(d);
- if(firstByte)
- {
- firstByte=false;
- thisHead=cb.getTail();
- }
- }
-
- morebytes=false;
-
- if((uart_emul_available(UART1_EMUL_E) > 0) && (fullbuffer == 0))
- morebytes=true;
-
- }while(morebytes);
-
- //Just to be sure that thisHead is initialized!
- if(firstByte)
- thisHead=cb.getTail();
-
- // If we find a line feed, we are at the end of a paragraph
- // check!
- if (fullbuffer)
- {
- // And... go handle it!
- if(mgr)
- mgr->manageMsg(thisHead, cb.getTail());
- }
- else if(d==10)
- {
- // And... go handle it!
- if(mgr)
- mgr->manageMsg(thisHead, cb.getTail());
- }
- else if (d==32)
- {
- // And... go handle it!
- if(mgr)
- mgr->manageMsg(thisHead, cb.getTail());
- }
- }
- }
-}
-
-bool GSM3SoftSerial::keepThisChar(uint8_t* c)
-{
- // Horrible things for Quectel XON/XOFF
- // 255 is the answer to a XOFF
- // It comes just once
- if((*c==255)&&(_flags & _GSMSOFTSERIALFLAGS_SENTXOFF_))
- {
- //_flags ^= _GSMSOFTSERIALFLAGS_SENTXOFF_;
- return false;
- }
-
- // 0x77, w, is the escape character
- if(*c==0x77)
- {
- _flags |= _GSMSOFTSERIALFLAGS_ESCAPED_;
- return false;
- }
-
- // and these are the escaped codes
- if(_flags & _GSMSOFTSERIALFLAGS_ESCAPED_)
- {
- if(*c==0xEE)
- *c=0x11;
- else if(*c==0xEC)
- *c=0x13;
- else if(*c==0x88)
- *c=0x77;
-
- _flags ^= _GSMSOFTSERIALFLAGS_ESCAPED_;
- return true;
- }
-
- return true;
-}
-
-void GSM3SoftSerial::spaceAvailable()
-{
- // If there is spaceAvailable in the buffer, lets send a XON
- //finalWrite((byte)__XON__);
-}
-
-
-// This is here to avoid problems with Arduino compiler
-void GSM3SoftSerialMgr::manageMsg(byte from, byte to){};
diff --git a/libraries/GSM/src/GSM3SoftSerial.h b/libraries/GSM/src/GSM3SoftSerial.h
deleted file mode 100644
index f2a445a67d..0000000000
--- a/libraries/GSM/src/GSM3SoftSerial.h
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telef�nica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef __GSM3_SOFTSERIAL__
-#define __GSM3_SOFTSERIAL__
-
-// An adaptation of NewSoftSerial for Modem Shields
-// Assumes directly that Serial is attached to Pins 2 and 3, not inverse
-// We are implementing it because NewSoftSerial does not deal correctly with floods
-// of data
-#include "GSM3CircularBuffer.h"
-#include
-#include
-
-class GSM3SoftSerialMgr
-{
- public:
-
- /** Manages soft serial message
- @param from Initial byte
- @param to Final byte
- */
- virtual void manageMsg(byte from, byte to);
-};
-
-// This class manages software serial communications
-// Changing it so it doesn't know about modems or whatever
-
-class GSM3SoftSerial : public GSM3CircularBufferManager
-{
- private:
-
- uint8_t _receiveBitMask;
- volatile uint8_t *_receivePortRegister;
- uint8_t _transmitBitMask;
- volatile uint8_t *_transmitPortRegister;
-
- static GSM3SoftSerial* _activeObject;
- GSM3SoftSerialMgr* mgr;
-
- uint8_t _flags;
-
- stimer_t _timer;
-
- /** Receive
- */
- void recv();
-
- void setComsReceived();
-
- /** Write a character in serial connection, final action after escaping
- @param c Character
- @return 1 if succesful, 0 if transmission delay = 0
- */
- virtual size_t finalWrite(uint8_t);
-
- /** Decide, attending to escapes, if the received character should we
- kept, forgotten, or changed
- @param c Character, may be changed
- @return 1 if shall be kept, 0 if forgotten
- */
- bool keepThisChar(uint8_t* c);
-
- // Checks the buffer for well-known events.
- //bool recognizeUnsolicitedEvent(byte oldTail);
-
- public:
-
- /** Tuned delay in microcontroller
- @param delay Time to delay
- */
- static /*inline */void tunedDelay(uint16_t delay);
-
- GSM3CircularBuffer cb; // Circular buffer
-
- /** Register serial manager
- @param manager Serial manager
- */
- inline void registerMgr(GSM3SoftSerialMgr* manager){mgr=manager;};
-
- /** If there is spaceAvailable in the buffer, lets send a XON
- */
- void spaceAvailable();
-
- /** Write a character in serial connection
- @param c Character
- @return 1 if succesful, 0 if transmission delay = 0
- */
- virtual size_t write(uint8_t);
-
- /** Constructor */
- GSM3SoftSerial();
-
- /** Establish serial connection
- @param speed Baudrate
- @return none
- */
- void begin(long speed);
-
- /** Manage interruptions
- */
- static inline void handle_interrupt();
-
- /** Close serial connection
- */
- void close();
-};
-
-#endif
diff --git a/libraries/GSM/src/GSM3VoiceCallService.cpp b/libraries/GSM/src/GSM3VoiceCallService.cpp
deleted file mode 100644
index 84cacd8988..0000000000
--- a/libraries/GSM/src/GSM3VoiceCallService.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#include
-#include
-
-#include
-
-// While there is only a shield (ShieldV1) we will include it by default
-GSM3ShieldV1VoiceProvider theShieldV1VoiceProvider;
-
-#define GSM3VOICECALLSERVICE_SYNCH 0x01 // 1: synchronous 0: asynchronous
-#define __TOUT__ 10000
-
-GSM3VoiceCallService::GSM3VoiceCallService(bool synch)
-{
- if(synch)
- flags |= GSM3VOICECALLSERVICE_SYNCH;
-
- if(NULL == theGSM3MobileVoiceProvider)
- theGSM3MobileVoiceProvider = &theShieldV1VoiceProvider;
-
- theGSM3MobileVoiceProvider->setVoiceCallService(true);
-}
-
-GSM3_voiceCall_st GSM3VoiceCallService::getvoiceCallStatus()
-{
- if(&theGSM3MobileVoiceProvider==0)
- return IDLE_CALL;
-
- return theGSM3MobileVoiceProvider->getvoiceCallStatus();
-}
-
-int GSM3VoiceCallService::ready()
-{
- if(&theGSM3MobileVoiceProvider==0)
- return 0;
-
- return theGSM3MobileVoiceProvider->ready();
-}
-
-int GSM3VoiceCallService::voiceCall(const char* to, unsigned long timeout)
-{
- if(&theGSM3MobileVoiceProvider==0)
- return 0;
-
- if(flags & GSM3VOICECALLSERVICE_SYNCH )
- {
- theGSM3MobileVoiceProvider->voiceCall(to);
- unsigned long m;
- m=millis();
- // Wait an answer for timeout
- while(((millis()-m)< timeout )&&(getvoiceCallStatus()==CALLING))
- delay(100);
-
- if(getvoiceCallStatus()==TALKING)
- return 1;
- else
- return 0;
- }
- else
- {
- return theGSM3MobileVoiceProvider->voiceCall(to);
- }
-
-}
-
-int GSM3VoiceCallService::answerCall()
-{
- if(&theGSM3MobileVoiceProvider==0)
- return 0;
-
- return waitForAnswerIfNeeded(theGSM3MobileVoiceProvider->answerCall());
-}
-
-int GSM3VoiceCallService::hangCall()
-{
- if(&theGSM3MobileVoiceProvider==0)
- return 0;
-
- return waitForAnswerIfNeeded(theGSM3MobileVoiceProvider->hangCall());;
-}
-
-int GSM3VoiceCallService::retrieveCallingNumber(char* buffer, int bufsize)
-{
- if(&theGSM3MobileVoiceProvider==0)
- return 0;
-
- return waitForAnswerIfNeeded(theGSM3MobileVoiceProvider->retrieveCallingNumber(buffer, bufsize));
-}
-
-int GSM3VoiceCallService::waitForAnswerIfNeeded(int returnvalue)
-{
- // If synchronous
- if(flags & GSM3VOICECALLSERVICE_SYNCH )
- {
- unsigned long m;
- m=millis();
- // Wait for __TOUT__
- while(((millis()-m)< __TOUT__ )&&(ready()==0))
- delay(100);
- // If everything was OK, return 1
- // else (timeout or error codes) return 0;
- if(ready()==1)
- return 1;
- else
- return 0;
- }
- // If not synchronous just kick ahead the coming result
- return ready();
-}
-
-
-
-
diff --git a/libraries/GSM/src/GSM3VoiceCallService.h b/libraries/GSM/src/GSM3VoiceCallService.h
deleted file mode 100644
index f9e2e0ee00..0000000000
--- a/libraries/GSM/src/GSM3VoiceCallService.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-This file is part of the GSM3 communications library for Arduino
--- Multi-transport communications platform
--- Fully asynchronous
--- Includes code for the Arduino-Telefonica GSM/GPRS Shield V1
--- Voice calls
--- SMS
--- TCP/IP connections
--- HTTP basic clients
-
-This library has been developed by Telefónica Digital - PDI -
-- Physical Internet Lab, as part as its collaboration with
-Arduino and the Open Hardware Community.
-
-September-December 2012
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-The latest version of this library can always be found at
-https://github.com/BlueVia/Official-Arduino
-*/
-#ifndef _GSM3VOICECALLSERVICE_
-#define _GSM3VOICECALLSERVICE_
-
-#include
-#include
-
-class GSM3VoiceCallService
-{
- private:
- uint8_t flags;
-
- /** Make synchronous the functions, if needed
- @param returnvalue Return value
- @return returns 0 if last command is still executing, 1 success, >1 error
- */
- int waitForAnswerIfNeeded(int returnvalue);
-
- public:
- /** Service creation
- @param synch If true, the service calls are synchronois
- */
- GSM3VoiceCallService(bool synch=true);
-
- /** Voice call status
- @return Status of the voice call, as described in GSM3MobileVoiceProvider.h
- { IDLE_CALL, CALLING, RECEIVINGCALL, TALKING};
- */
- GSM3_voiceCall_st getvoiceCallStatus();
-
- /** Get last command status
- @return Returns 0 if last command is still executing, 1 success, >1 error
- */
- int ready();
-
- /** Place a voice call. If asynchronous, returns while ringing. If synchronous
- returns if the call is stablished or cancelled.
- @param to Receiver number. Country extension can be used or not.
- Char buffer should not be released or used until command is over
- @param timeout In millisecods. Time ringing before closing the call.
- Only used in synchronous mode.
- If zero, ring undefinitely
- @return In asynchronous mode returns 0 if last command is still executing, 1 success, >1 error
- In synchronous mode returns 1 if the call is placed, 0 if not.
- */
- int voiceCall(const char* to, unsigned long timeout=30000);
-
- /** Accept an incoming voice call
- @return In asynchronous mode returns 0 if last command is still executing, 1 success, >1 error
- In synchronous mode returns 1 if the call is answered, 0 if not.
- */
- int answerCall();
-
- /** Hang a stablished call or an incoming ring
- @return In asynchronous mode returns 0 if last command is still executing, 1 success, >1 error
- In synchronous mode returns 1 if the call is answered, 0 if not.
- */
- int hangCall();
-
- /** Retrieve the calling number, put it in buffer
- @param buffer pointer to the buffer memory
- @param bufsize size of available memory area, at least should be 10 characters
- @return In asynchronous mode returns 0 if last command is still executing, 1 success, >1 error
- In synchronous mode returns 1 if the number is correcty taken 0 if not
- */
- int retrieveCallingNumber(char* buffer, int bufsize);
-};
-
-
-
-#endif
diff --git a/variants/NUCLEO_F302R8/PeripheralPins.c b/variants/NUCLEO_F302R8/PeripheralPins.c
index 6925350c5f..db2bc4f6df 100644
--- a/variants/NUCLEO_F302R8/PeripheralPins.c
+++ b/variants/NUCLEO_F302R8/PeripheralPins.c
@@ -99,7 +99,6 @@ const PinMap PinMap_I2C_SCL[] = {
#ifdef HAL_TIM_MODULE_ENABLED
// TIM2 is commented out, because it is used by us_ticker.
-// TIM17 is used for TIMER_UART_EMULATED
const PinMap PinMap_PWM[] = {
// {PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
{PA_1, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM15, 1, 1)}, // TIM15_CH1N
diff --git a/variants/board_template/variant.h b/variants/board_template/variant.h
index 018f98077d..6a6e5e7d17 100644
--- a/variants/board_template/variant.h
+++ b/variants/board_template/variant.h
@@ -111,7 +111,6 @@ enum {
// Timer Definitions
//Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
#define TIMER_TONE TIMx
-//#define TIMER_UART_EMULATED TIMx
// Do not use basic timer: OC is required
#define TIMER_SERVO TIMx //TODO: advanced-control timers don't work
@@ -126,10 +125,6 @@ enum {
// DEBUG_UART Tx pin name, default: the first one found in PinMap_UART_TX for DEBUG_UART
//#define DEBUG_PINNAME_TX PX_n // PinName used for TX
-// UART Emulation (uncomment if needed, required TIM1)
-//#define UART_EMUL_RX PX_n // PinName used for RX
-//#define UART_EMUL_TX PX_n // PinName used for TX
-
// Default pin used for 'Serial' instance (ex: ST-Link)
// Mandatory for Firmata
#define PIN_SERIAL_RX x