dani/bite
1
0
Fork 0
mirror of https://github.com/daniviga/bite.git synced 2024-11-22 21:16:12 +01:00
Code Releases Activity

Allow to use a customer NTP server IP (#27)

Browse Source 
* Add support for custom IP/Port for NTP on ESP32

* Backport changes from esp32

* NTP port is not currently used

* Make pytz dep explicit and update alpine
This commit is contained in:
Daniele Viganò 2021-12-08 22:27:42 +01:00 committed by GitHub
parent 37c7c49614
commit 681f99d2f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arduino/eeprom_prog/eeprom_prog.ino
View File

@ -30,8 +30,10 @@ const byte mac[] = {
const char serial[] = SERIAL; const char serial[] = SERIAL;
struct netConfig { struct netConfig {
IPAddress address = REMOTE_IP; IPAddress iot_address = IOT_IP;
unsigned int port = REMOTE_PORT; unsigned int iot_port = IOT_PORT;
IPAddress ntp_address = NTP_IP;
unsigned int ntp_port = NTP_PORT;
} config; } config;
void setup() { void setup() {

6
arduino/eeprom_prog/settings.h.tmpl
View File

@ -19,5 +19,7 @@
*/ */
#define SERIAL "uno_1" #define SERIAL "uno_1"
#define REMOTE_IP {192, 168, 0, 1} #define IOT_IP {192, 168, 10, 1}
#define REMOTE_PORT 80 #define IOT_PORT 80
#define NTP_IP {192, 168, 10, 1}
#define NTP_PORT 123

28
arduino/tempLightSensor/tempLightSensor.ino
View File

@ -31,8 +31,6 @@
#define TELEMETRY_DELAY 10 // second between telemetry samples #define TELEMETRY_DELAY 10 // second between telemetry samples
#define AREF_VOLTAGE 3.3 // set aref voltage to 3.3v instead of default 5v #define AREF_VOLTAGE 3.3 // set aref voltage to 3.3v instead of default 5v
char serial[9];
// const String serverName = "sensor.server.domain"; // const String serverName = "sensor.server.domain";
const size_t capacity = 2 * JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(2) + 20; const size_t capacity = 2 * JSON_OBJECT_SIZE(3) + JSON_OBJECT_SIZE(2) + 20;
@ -50,11 +48,13 @@ EthernetClient ethClient;
PubSubClient clientMQTT(ethClient); PubSubClient clientMQTT(ethClient);
struct netConfig { struct netConfig {
IPAddress address; IPAddress iot_address;
unsigned int port; unsigned int iot_port;
}; IPAddress ntp_address;
netConfig config; unsigned int ntp_port; // not used
} config;
char serial[9];
const String apiURL = "/api/device/subscribe/"; const String apiURL = "/api/device/subscribe/";
const String telemetryURL = "/telemetry/"; const String telemetryURL = "/telemetry/";
@ -89,15 +89,17 @@ void setup(void) {
Serial.println(Ethernet.localIP()); Serial.println(Ethernet.localIP());
Serial.println(); Serial.println();
Serial.print("Connecting to: "); Serial.print("Connecting to: ");
Serial.print(config.address); Serial.print(config.iot_address);
Serial.print(":"); Serial.print(":");
Serial.print(config.port); Serial.print(config.iot_port);
Serial.print(" every "); Serial.print(" every ");
Serial.print(TELEMETRY_DELAY); Serial.print(TELEMETRY_DELAY);
Serial.println("s"); Serial.println("s");
#if USE_INTERNAL_NTP #if USE_INTERNAL_NTP
timeClient.setPoolServerIP(config.address); Serial.print("Using NTP: ");
Serial.println(config.ntp_address);
timeClient.setPoolServerIP(config.ntp_address);
#endif #endif
timeClient.begin(); timeClient.begin();
if (timeClient.update()) { if (timeClient.update()) {
@ -115,7 +117,7 @@ void setup(void) {
// payload["id"] = serverName; // payload["id"] = serverName;
#if USE_MQTT #if USE_MQTT
clientMQTT.setServer(config.address, 1883); clientMQTT.setServer(config.iot_address, 1883);
#endif #endif
} }
@ -175,14 +177,14 @@ void publishData(const netConfig &mqtt, const DynamicJsonDocument &json) {
#endif #endif
void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) { void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) {
if (ethClient.connect(postAPI.address, postAPI.port)) { if (ethClient.connect(postAPI.iot_address, postAPI.iot_port)) {
ethClient.print("POST "); ethClient.print("POST ");
ethClient.print(URL); ethClient.print(URL);
ethClient.println(" HTTP/1.1"); ethClient.println(" HTTP/1.1");
ethClient.print("Host: "); ethClient.print("Host: ");
ethClient.print(postAPI.address); ethClient.print(postAPI.iot_address);
ethClient.print(":"); ethClient.print(":");
ethClient.println(postAPI.port); ethClient.println(postAPI.iot_port);
ethClient.println("Content-Type: application/json"); ethClient.println("Content-Type: application/json");
ethClient.print("Content-Length: "); ethClient.print("Content-Length: ");
ethClient.println(measureJson(json)); ethClient.println(measureJson(json));

2
docker/ntpd/Dockerfile
View File

@ -17,7 +17,7 @@
# You should have received a copy of the GNU Affero General Public License # You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
FROM alpine:3.12 FROM alpine:3.15
RUN apk update && apk add chrony && \ RUN apk update && apk add chrony && \
chown -R chrony:chrony /var/lib/chrony chown -R chrony:chrony /var/lib/chrony

6
esp32/nvs_prog/nvs_prog.ino
View File

@ -31,8 +31,10 @@ const char* ssid = SECRET_SSID;
const char* password = SECRET_PASSWORD; const char* password = SECRET_PASSWORD;
struct netConfig { struct netConfig {
IPAddress address = REMOTE_IP; IPAddress iot_address = IOT_IP;
unsigned int port = REMOTE_PORT; unsigned int iot_port = IOT_PORT;
IPAddress ntp_address = NTP_IP;
unsigned int ntp_port = NTP_PORT;
} config; } config;
void setup() { void setup() {

6
esp32/nvs_prog/settings.h.tmpl
View File

@ -19,7 +19,9 @@
*/ */
#define SERIAL "<fillme>" #define SERIAL "<fillme>"
#define REMOTE_IP {192, 168, 0, 1} #define IOT_IP {192, 168, 10, 1}
#define REMOTE_PORT 80 #define IOT_PORT 80
#define NTP_IP {192, 168, 10, 1}
#define NTP_PORT 123
#define SECRET_SSID "<fillme>" #define SECRET_SSID "<fillme>"
#define SECRET_PASSWORD "<fillme>" #define SECRET_PASSWORD "<fillme>"

22
esp32/rssiHall/rssiHall.ino
View File

@ -48,8 +48,10 @@ WiFiClient ethClient;
PubSubClient clientMQTT(ethClient); PubSubClient clientMQTT(ethClient);
struct netConfig { struct netConfig {
IPAddress address; IPAddress iot_address;
unsigned int port; unsigned int iot_port;
IPAddress ntp_address;
unsigned int ntp_port; // not used
} config; } config;
char* serial; char* serial;
@ -94,15 +96,17 @@ void setup(void) {
Serial.println(WiFi.localIP()); Serial.println(WiFi.localIP());
Serial.println(); Serial.println();
Serial.print("Connecting to: "); Serial.print("Connecting to: ");
Serial.print(config.address.toString()); Serial.print(config.iot_address.toString());
Serial.print(":"); Serial.print(":");
Serial.print(config.port); Serial.print(config.iot_port);
Serial.print(" every "); Serial.print(" every ");
Serial.print(TELEMETRY_DELAY); Serial.print(TELEMETRY_DELAY);
Serial.println("s"); Serial.println("s");
#if USE_INTERNAL_NTP #if USE_INTERNAL_NTP
timeClient.setPoolServerIP(config.address); Serial.print("Using NTP: ");
Serial.println(config.ntp_address.toString());
timeClient.setPoolServerIP(config.ntp_address);
#endif #endif
timeClient.begin(); timeClient.begin();
if (timeClient.update()) { if (timeClient.update()) {
@ -120,7 +124,7 @@ void setup(void) {
// payload["id"] = serverName; // payload["id"] = serverName;
#if USE_MQTT #if USE_MQTT
clientMQTT.setServer(config.address, 1883); clientMQTT.setServer(config.iot_address, 1883);
#endif #endif
} }
@ -172,14 +176,14 @@ void publishData(const netConfig &mqtt, const DynamicJsonDocument &json) {
#endif #endif
void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) { void postData(const netConfig &postAPI, const String &URL, const DynamicJsonDocument &json) {
if (ethClient.connect(postAPI.address, postAPI.port)) { if (ethClient.connect(postAPI.iot_address, postAPI.iot_port)) {
ethClient.print("POST "); ethClient.print("POST ");
ethClient.print(URL); ethClient.print(URL);
ethClient.println(" HTTP/1.1"); ethClient.println(" HTTP/1.1");
ethClient.print("Host: "); ethClient.print("Host: ");
ethClient.print(postAPI.address.toString()); ethClient.print(postAPI.iot_address.toString());
ethClient.print(":"); ethClient.print(":");
ethClient.println(postAPI.port); ethClient.println(postAPI.iot_port);
ethClient.println("Content-Type: application/json"); ethClient.println("Content-Type: application/json");
ethClient.print("Content-Length: "); ethClient.print("Content-Length: ");
ethClient.println(measureJson(json)); ethClient.println(measureJson(json));

1
requirements.txt
View File

@ -1,3 +1,4 @@
pytz
Django Django
djangorestframework djangorestframework
django-health-check django-health-check