1
0
mirror of https://github.com/daniviga/bite.git synced 2024-12-23 16:51:25 +01:00

Merge pull request #1 from daniviga/eeprom

Move Arduino settings to EEPROM
This commit is contained in:
Daniele Viganò 2020-06-02 22:41:19 +02:00 committed by GitHub
commit d993da8d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3376 additions and 30 deletions

View File

@ -0,0 +1,53 @@
#include <EEPROM.h>
#include <Ethernet.h>
#define ERASE_FIRST 0
const byte mac[] = {
0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
const char serial[] = "abcd1234";
struct netConfig {
IPAddress address;
int port;
};
netConfig config = {
{192, 168, 10, 123},
8000
};
void setup() {
Serial.begin(9600);
while (!Serial) {
; // wait for serial port to connect. Needed for native USB port only
}
#if ERASE_FIRST
// initialize the LED pin as an output.
pinMode(13, OUTPUT);
// turn the LED on while erasing
digitalWrite(13, HIGH);
for (int i = 0 ; i < EEPROM.length() ; i++) {
EEPROM.write(i, 0);
}
// turn the LED on when we're done
digitalWrite(13, LOW);
#endif
int eeAddress = 0; //Location we want the data to be put.
//One simple call, with the address first and the object second.
EEPROM.put(eeAddress, mac);
eeAddress += sizeof(mac);
EEPROM.put(eeAddress, serial);
eeAddress += sizeof(serial);
EEPROM.put(eeAddress, config);
Serial.println("Data written!");
}
void loop() {
/* Empty loop */
}

View File

@ -1,3 +1,4 @@
#include <EEPROM.h>
#include <Ethernet.h>
#include <ArduinoJson.h>
@ -12,53 +13,65 @@ JsonObject payload = doc.createNestedObject("payload");
JsonObject temp = payload.createNestedObject("temperature");
int tempPin = A0;
int tempReading;
int photocellPin = A1;
int photocellReading;
const byte mac[] = {
0xDE, 0xAD, 0xBE, 0xEF, 0xFE, 0xED };
const byte remoteAddr[] = {
192, 168, 10, 123 };
const int remotePort = 8000;
const int postDelay = 10*1000;
struct netConfig {
IPAddress address;
int port;
};
netConfig config;
const String serialNum = "abcde12345";
const String URL = "/telemetry/";
void printAddr(byte addr[], Stream *stream) {
for (byte thisByte = 0; thisByte < 4; thisByte++) {
// print the value of each byte of the IP address:
stream->print(addr[thisByte], DEC);
if (thisByte < 3) {
stream->print(".");
}
}
}
const int postDelay = 10 * 1000;
void setup(void) {
Serial.begin(9600);
analogReference(EXTERNAL);
byte mac[6];
char serial[9];
int eeAddress = 0;
EEPROM.get(eeAddress, mac);
eeAddress += sizeof(mac);
EEPROM.get(eeAddress, serial);
eeAddress += sizeof(serial);
Serial.println("Initialize Ethernet with DHCP:");
if (Ethernet.begin(mac) == 0) {
Serial.println("Failed to configure Ethernet using DHCP");
if (Ethernet.hardwareStatus() == EthernetNoHardware) {
Serial.println("Ethernet shield was not found. Sorry, can't run without hardware. :(");
} else if (Ethernet.linkStatus() == LinkOFF) {
Serial.println("Ethernet cable is not connected.");
}
// no point in carrying on, so do nothing forevermore:
for(;;)
;
}
while (true) {
delay(1);
}
}
EEPROM.get(eeAddress, config);
Serial.print("IoT started at address: ");
printAddr(Ethernet.localIP(), &Serial);
Serial.print("IoT #");
Serial.print(serial);
Serial.println(" started at address:");
Serial.println(Ethernet.localIP());
Serial.println();
Serial.println("Connecting to:");
Serial.print(config.address);
Serial.print(":");
Serial.println(config.port);
doc["device"] = 1; // FIXME
doc["device"] = serial; // FIXME
payload["id"] = serverName;
}
void loop(void) {
photocellReading = analogRead(photocellPin);
tempReading = analogRead(tempPin);
int photocellReading = analogRead(photocellPin);
int tempReading = analogRead(tempPin);
float tempVoltage = tempReading * AREF_VOLTAGE / 1024.0;
float tempC = (tempVoltage - 0.5) * 100 ;
@ -69,14 +82,14 @@ void loop(void) {
temp["raw"] = tempReading;
temp["volts"] = tempVoltage;
if (EthernetClient client = client.connect(remoteAddr, remotePort)) {
if (EthernetClient client = client.connect(config.address, config.port)) {
client.print("POST ");
client.print(URL);
client.println(" HTTP/1.1");
client.print("Host: ");
printAddr(remoteAddr, &client);
printAddr(config.address, &client);
client.print(":");
client.println(remotePort);
client.println(config.port);
client.println("Content-Type: application/json");
client.print("Content-Length: ");
client.println(measureJsonPretty(doc));

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 292 KiB