Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Make MKR NB 1500 suitable for usage with NB-IoT networks #104

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Make MKR NB 1500 suitable for usage with NB-IoT networks #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
814b481
Use IP address for NTP lookup when using MKR NB 1500 since these is u…
aentinger Mar 19, 2020
9b1bd99
Overloading begin function in such way that it also accepts IPAddress…
aentinger Apr 9, 2020
6b03c3b
Enforce version 2.5.0 for ESP8266 CI compilation
aentinger Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/compile-examples.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ jobs:
# Install ESP8266 platform via Boards Manager
- name: esp8266:esp8266
source-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
version: 2.5.0
libraries:
sketch-paths: '"examples/utility/WiFi_Cloud_Blink_with_security_credentials"'

Expand Down
22 changes: 15 additions & 7 deletions src/ArduinoIoTCloudTCP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,21 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP()

int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, String brokerAddress, uint16_t brokerPort)
{
_connection = &connection;
_brokerAddress = brokerAddress;
_brokerPort = brokerPort;
time_service.begin(&connection);
return begin(_brokerAddress, _brokerPort);
_brokerIp = INADDR_NONE;
return begin(connection, brokerPort);
}

int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort)
int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, IPAddress const brokerIp, uint16_t const brokerPort)
{
_brokerAddress = "";
_brokerIp = brokerIp;
return begin(connection, brokerPort);
}

_brokerAddress = brokerAddress;
int ArduinoIoTCloudTCP::begin(ConnectionHandler & connection, uint16_t brokerPort)
{
_connection = &connection;
_brokerPort = brokerPort;

#ifdef BOARD_HAS_ECCX08
Expand Down Expand Up @@ -242,7 +246,11 @@ int ArduinoIoTCloudTCP::reconnect()

int ArduinoIoTCloudTCP::connect()
{
if (!_mqttClient.connect(_brokerAddress.c_str(), _brokerPort)) return CONNECT_FAILURE;
if (_brokerIp == INADDR_NONE) {
if (!_mqttClient.connect(_brokerAddress.c_str(), _brokerPort)) return CONNECT_FAILURE;
} else {
if (!_mqttClient.connect(_brokerIp, _brokerPort)) return CONNECT_FAILURE;
}
if (_mqttClient.subscribe(_stdinTopic) == 0) return CONNECT_FAILURE_SUBSCRIBE;
if (_mqttClient.subscribe(_dataTopicIn) == 0) return CONNECT_FAILURE_SUBSCRIBE;
if (_mqttClient.subscribe(_ota_topic_in) == 0) return CONNECT_FAILURE_SUBSCRIBE;
Expand Down
8 changes: 7 additions & 1 deletion src/ArduinoIoTCloudTCP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ static uint16_t const DEFAULT_BROKER_PORT_SECURE_AUTH = 8883;
static char const DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH[] = "mqtts-up.iot.arduino.cc";
static uint16_t const DEFAULT_BROKER_PORT_USER_PASS_AUTH = 8884;

static IPAddress const DEFAULT_BROKER_SECURE_AUTH_IP_1(34,206,248,111);
static IPAddress const DEFAULT_BROKER_SECURE_AUTH_IP_2(3,209,5,114);

/******************************************************************************
* CLASS DECLARATION
******************************************************************************/
Expand All @@ -70,7 +73,9 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass
#else
int begin(ConnectionHandler & connection, String brokerAddress = DEFAULT_BROKER_ADDRESS_USER_PASS_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_USER_PASS_AUTH);
#endif
int begin(String brokerAddress = DEFAULT_BROKER_ADDRESS_SECURE_AUTH, uint16_t brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
int begin(ConnectionHandler & connection, IPAddress const brokerIp, uint16_t const brokerPort = DEFAULT_BROKER_PORT_SECURE_AUTH);
int begin(ConnectionHandler & connection, uint16_t brokerPort);


#ifdef BOARD_ESP
inline void setBoardId (String const device_id) { setDeviceId(device_id); }
Expand Down Expand Up @@ -101,6 +106,7 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass

int _lastSyncRequestTickTime;
String _brokerAddress;
IPAddress _brokerIp;
uint16_t _brokerPort;
uint8_t _mqtt_data_buf[MQTT_TRANSMIT_BUFFER_SIZE];
int _mqtt_data_len;
Expand Down
6 changes: 5 additions & 1 deletion src/utility/time/NTPUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,12 @@ void NTPUtils::sendNTPpacket(UDP & udp)
ntp_packet_buf[13] = 0x4E;
ntp_packet_buf[14] = 49;
ntp_packet_buf[15] = 52;


#ifdef ARDUINO_SAMD_MKRNB1500
udp.beginPacket(NTP_TIME_SERVER_IP_1, NTP_TIME_SERVER_PORT);
#else
udp.beginPacket(NTP_TIME_SERVER, NTP_TIME_SERVER_PORT);
#endif
udp.write(ntp_packet_buf, NTP_PACKET_SIZE);
udp.endPacket();
}
Expand Down
7 changes: 7 additions & 0 deletions src/utility/time/NTPUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@

#include <Udp.h>

/**************************************************************************************
* CONSTANTS
**************************************************************************************/

static IPAddress const NTP_TIME_SERVER_IP_1(35,204,74,237);
static IPAddress const NTP_TIME_SERVER_IP_2(34,73,181,129);

/**************************************************************************************
* CLASS DECLARATION
**************************************************************************************/
Expand Down