Skip to content

Commit cf57b1c

Browse files
authored
Merge pull request #146 from hackerspace-silesia/dev
2.8.1
2 parents 44d19be + 003ada4 commit cf57b1c

File tree

136 files changed

+13421
-6802
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+13421
-6802
lines changed

.gitignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,12 @@ ENV/
102102

103103
# mypy
104104
.mypy_cache/
105+
.DS_Store
106+
.vscode/arduino.json
107+
.vscode/c_cpp_properties.json
108+
.pio/
109+
.vscode/
110+
.pio/libdeps/esp32/Adafruit Unified Sensor/.github/workflows/githubci.yml
111+
.pio/libdeps/esp32/Adafruit Unified Sensor/.piopm
112+
.pio/libdeps/esp32/Adafruit_Sensor/.github/workflows/githubci.yml
113+
.pio/libdeps/esp32/Adafruit_Sensor/.piopm

README.md

Lines changed: 1 addition & 6 deletions

Smogly_Logo/SmoglyLogoTopMenu.png

10.6 KB

Smogomierz.ino

Lines changed: 1451 additions & 236 deletions
Large diffs are not rendered by default.

config.h

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
#pragma once
2+
3+
extern bool DEVICENAME_AUTO;
4+
extern char DEVICENAME[32];
5+
extern bool DISPLAY_PM1;
6+
extern char LANGUAGE[12];
7+
extern unsigned char SELECTED_LANGUAGE;
8+
9+
extern char THP_MODEL[12];
10+
extern char DUST_MODEL[12];
11+
extern bool FREQUENTMEASUREMENT;
12+
13+
extern bool SECOND_THP;
14+
extern char SECOND_THP_MODEL[12];
15+
16+
extern char CONFIG_FIRST_THP_SDA[4];
17+
extern char CONFIG_FIRST_THP_SCL[4];
18+
extern unsigned char FIRST_THP_SDA;
19+
extern unsigned char FIRST_THP_SCL;
20+
21+
extern char CONFIG_SECOND_THP_SDA[4];
22+
extern char CONFIG_SECOND_THP_SCL[4];
23+
extern unsigned char SECOND_THP_SDA;
24+
extern unsigned char SECOND_THP_SCL;
25+
26+
extern char CONFIG_DUST_TX[4];
27+
extern char CONFIG_DUST_RX[4];
28+
extern unsigned char DUST_TX;
29+
extern unsigned char DUST_RX;
30+
31+
extern unsigned char DUST_TIME;
32+
extern unsigned char NUMBEROFMEASUREMENTS;
33+
34+
extern bool LUFTDATEN_ON;
35+
extern bool SMOGLIST_ON;
36+
37+
extern bool AIRMONITOR_ON;
38+
extern bool AIRMONITOR_GRAPH_ON;
39+
extern char AIRMONITOR_API_KEY[48];
40+
extern char LATITUDE[16];
41+
extern char LONGITUDE[16];
42+
extern char EMAIL[64];
43+
extern short MYALTITUDE;
44+
45+
extern bool THINGSPEAK_ON;
46+
extern bool THINGSPEAK_GRAPH_ON;
47+
extern char THINGSPEAK_API_KEY[32];
48+
extern unsigned short THINGSPEAK_CHANNEL_ID;
49+
extern char THINGSPEAK_READ_API_KEY[32];
50+
51+
extern bool INFLUXDB_ON;
52+
extern char INFLUXDB_VERSION[4];
53+
extern char INFLUXDB_HOST[128];
54+
extern uint16_t INFLUXDB_PORT;
55+
extern char INFLUXDB_DATABASE[32];
56+
extern char INFLUXDB_USER[32];
57+
extern char INFLUXDB_PASSWORD[64];
58+
extern char INFLUXDB_ORG[32];
59+
extern char INFLUXDB_BUCKET[32];
60+
extern char INFLUXDB_TOKEN[128];
61+
62+
extern bool MQTT_ON;
63+
extern char MQTT_HOST[128];
64+
extern uint16_t MQTT_PORT;
65+
extern char MQTT_USER[32];
66+
extern char MQTT_PASSWORD[64];
67+
68+
extern bool MQTT_IP_IN_TOPIC;
69+
extern bool MQTT_DEVICENAME_IN_TOPIC;
70+
extern bool MQTT_SLASH_AT_THE_BEGINNING;
71+
extern bool MQTT_SLASH_AT_THE_END;
72+
73+
extern char MQTT_TOPIC_TEMP[64];
74+
extern char MQTT_TOPIC_HUMI[64];
75+
extern char MQTT_TOPIC_PRESS[64];
76+
extern char MQTT_TOPIC_PM1[64];
77+
extern char MQTT_TOPIC_PM25[64];
78+
extern char MQTT_TOPIC_PM10[64];
79+
extern char MQTT_TOPIC_AIRQUALITY[32];
80+
81+
extern bool AQI_ECO_ON;
82+
extern char AQI_ECO_HOST[64];
83+
extern char AQI_ECO_PATH[64];
84+
85+
extern unsigned char SENDING_FREQUENCY;
86+
extern unsigned char SENDING_DB_FREQUENCY;
87+
extern bool DEEPSLEEP_ON;
88+
89+
extern bool DEBUG;
90+
extern bool AUTOUPDATE_ON;
91+
92+
extern bool CONFIG_AUTH;
93+
extern char CONFIG_USERNAME[64];
94+
extern char CONFIG_PASSWORD[128];
95+
96+
extern char MODEL[12];
97+
98+
99+
extern bool HOMEKIT_SUPPORT;
100+
101+
const char HOMEKIT_PASSWORD[16] PROGMEM = "111-11-111";
102+
103+
104+
#ifdef DUSTSENSOR_PMS5003_7003_BME280_0x76 || DUSTSENSOR_PMS5003_7003_BME280_0x77
105+
const char PMSENSORVERSION[] PROGMEM = "PMS";
106+
#elif defined DUSTSENSOR_SDS011_21
107+
const char PMSENSORVERSION[] PROGMEM = "SDS";
108+
#elif defined DUSTSENSOR_HPMA115S0
109+
const char PMSENSORVERSION[] PROGMEM = "HPMA115S0";
110+
#elif defined DUSTSENSOR_SPS30
111+
const char PMSENSORVERSION[] PROGMEM = "SPS30";
112+
#else // If no dust sensor has been defined - use DUSTSENSOR_PMS5003_7003_BME280_0x76
113+
const char PMSENSORVERSION[] PROGMEM = "PMS";
114+
#endif
115+
116+
extern char SERVERSOFTWAREVERSION[32];
117+
extern char CURRENTSOFTWAREVERSION[32];
118+
#if defined(ARDUINO_ARCH_ESP8266)
119+
const char SOFTWAREVERSION[] PROGMEM = "2.8.1 build " __TIME__ " " __DATE__;
120+
const char HARDWAREVERSION[] PROGMEM = "1.0 - ESP8266";
121+
#elif defined(ARDUINO_ARCH_ESP32)
122+
const char SOFTWAREVERSION[] PROGMEM = "2.8.1 build " __TIME__ " " __DATE__;
123+
const char HARDWAREVERSION[] PROGMEM = "2.0 - ESP32";
124+
125+
#endif
File renamed without changes.

defaultConfig.h

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,110 +3,129 @@
33
bool DEVICENAME_AUTO = true;
44
char DEVICENAME[32] = "Smogly1"; // Bez polskich znakow!! // Without Polish letters!!
55
bool DISPLAY_PM1 = false;
6-
char LANGUAGE[32] = "english"; // english or polish
7-
int SELECTED_LANGUAGE = 1; // en - 1; pl - 2
6+
char LANGUAGE[12] = "english"; // english or polish
7+
unsigned char SELECTED_LANGUAGE = 1; // en - 1; pl - 2
88

9-
char THP_MODEL[32] = "Non";
10-
char DUST_MODEL[32] = "Non";
9+
char THP_MODEL[12] = "Non";
10+
char DUST_MODEL[12] = "Non";
1111
bool FREQUENTMEASUREMENT = false;
1212

1313
bool SECOND_THP = false;
14+
char SECOND_THP_MODEL[12] = "Non";
1415

1516
#ifdef ARDUINO_ARCH_ESP8266
16-
char CONFIG_FIRST_THP_SDA[8] = "D3";
17-
char CONFIG_FIRST_THP_SCL[8] = "D4";
18-
int FIRST_THP_SDA = 0; // D3
19-
int FIRST_THP_SCL = 2; // D4
17+
char CONFIG_FIRST_THP_SDA[4] = "D3";
18+
char CONFIG_FIRST_THP_SCL[4] = "D4";
19+
unsigned char FIRST_THP_SDA = 0; // D3
20+
unsigned char FIRST_THP_SCL = 2; // D4
2021
#elif defined ARDUINO_ARCH_ESP32
21-
char CONFIG_FIRST_THP_SDA[8] = "D16";
22-
char CONFIG_FIRST_THP_SCL[8] = "D17";
23-
int FIRST_THP_SDA = 16; // D16
24-
int FIRST_THP_SCL = 17; // D17
22+
char CONFIG_FIRST_THP_SDA[4] = "D4";
23+
char CONFIG_FIRST_THP_SCL[4] = "D5";
24+
unsigned char FIRST_THP_SDA = 4; // D16
25+
unsigned char FIRST_THP_SCL = 5; // D17
2526
#endif
2627

27-
char CONFIG_SECOND_THP_SDA[8] = "D5";
28-
char CONFIG_SECOND_THP_SCL[8] = "D6";
29-
int SECOND_THP_SDA = 14; // D5
30-
int SECOND_THP_SCL = 12; // D6
28+
#ifdef ARDUINO_ARCH_ESP8266
29+
char CONFIG_SECOND_THP_SDA[4] = "D5";
30+
char CONFIG_SECOND_THP_SCL[4] = "D6";
31+
unsigned char SECOND_THP_SDA = 14; // D5
32+
unsigned char SECOND_THP_SCL = 12; // D6
33+
#elif defined ARDUINO_ARCH_ESP32
34+
char CONFIG_SECOND_THP_SDA[4] = "D22";
35+
char CONFIG_SECOND_THP_SCL[4] = "D23";
36+
unsigned char SECOND_THP_SDA = 22; // D5
37+
unsigned char SECOND_THP_SCL = 23; // D6
38+
#endif
3139

32-
char CONFIG_DUST_TX[8] = "D1";
33-
char CONFIG_DUST_RX[8] = "D2";
34-
int DUST_TX = 5; // D1
35-
int DUST_RX = 4; // D2
40+
#ifdef ARDUINO_ARCH_ESP8266
41+
char CONFIG_DUST_TX[4] = "D1";
42+
char CONFIG_DUST_RX[4] = "D2";
43+
unsigned char DUST_TX = 5; // D1
44+
unsigned char DUST_RX = 4; // D2
45+
#elif defined ARDUINO_ARCH_ESP32
46+
char CONFIG_DUST_TX[4] = "D18";
47+
char CONFIG_DUST_RX[4] = "D19";
48+
unsigned char DUST_TX = 18; // D1
49+
unsigned char DUST_RX = 19; // D2
50+
#endif
3651

3752
/*
3853
ESP8266
3954
13 - D7
4055
15 - D8
4156
*/
4257

43-
int DUST_TIME = 1;
44-
int NUMBEROFMEASUREMENTS = 10;
58+
unsigned char DUST_TIME = 1;
59+
unsigned char NUMBEROFMEASUREMENTS = 10;
4560

4661
bool LUFTDATEN_ON = false;
4762
bool SMOGLIST_ON = true;
4863

4964
bool AIRMONITOR_ON = false;
50-
bool AIRMONITOR_GRAPH_ON = true;
65+
bool AIRMONITOR_GRAPH_ON = false;
66+
char AIRMONITOR_API_KEY[48] = "";
5167
char LATITUDE[16] = "50.263911";
5268
char LONGITUDE[16] = "18.995711";
53-
int MYALTITUDE = 271;
69+
char EMAIL[64] = "email@mail.pl";
70+
short MYALTITUDE = 271;
5471

5572
bool THINGSPEAK_ON = false;
5673
bool THINGSPEAK_GRAPH_ON = false;
5774
char THINGSPEAK_API_KEY[32] = "WRITE_API_KEY";
58-
int THINGSPEAK_CHANNEL_ID = 0;
75+
unsigned short THINGSPEAK_CHANNEL_ID = 0;
5976
char THINGSPEAK_READ_API_KEY[32] = "READ_API_KEY";
6077

6178
bool INFLUXDB_ON = false;
62-
char INFLUXDB_VERSION[16] = "1"; // 1 (for 1.x version) or 2 for 2.0 or later
79+
char INFLUXDB_VERSION[4] = "1"; // 1 (for 1.x version) or 2 for 2.0 or later
6380
char INFLUXDB_HOST[128] = "INFLUXDB_ADRESS";
6481
uint16_t INFLUXDB_PORT = 8086;
65-
char INFLUXDB_DATABASE[64] = "mydb";
66-
char INFLUXDB_USER[64] = "username";
82+
char INFLUXDB_DATABASE[32] = "mydb";
83+
char INFLUXDB_USER[32] = "username";
6784
char INFLUXDB_PASSWORD[64] = "password";
68-
char INFLUXDB_ORG[64] = "myOrg";
69-
char INFLUXDB_BUCKET[64] = "myBucket";
70-
char INFLUXDB_TOKEN[64] = "myToken";
85+
char INFLUXDB_ORG[32] = "myOrg";
86+
char INFLUXDB_BUCKET[32] = "myBucket";
87+
char INFLUXDB_TOKEN[128] = "myToken";
7188

7289
bool MQTT_ON = false;
7390
char MQTT_HOST[128] = "MQTT_ADRESS";
7491
uint16_t MQTT_PORT = 1883;
75-
char MQTT_USER[64] = "username";
92+
char MQTT_USER[32] = "username";
7693
char MQTT_PASSWORD[64] = "password";
7794

7895
bool MQTT_IP_IN_TOPIC = false;
7996
bool MQTT_DEVICENAME_IN_TOPIC = true;
8097
bool MQTT_SLASH_AT_THE_BEGINNING = true;
8198
bool MQTT_SLASH_AT_THE_END = true;
8299

83-
char MQTT_TOPIC_TEMP[128] = "sensor/temperature";
84-
char MQTT_TOPIC_HUMI[128] = "sensor/humidity";
85-
char MQTT_TOPIC_PRESS[128] = "sensor/pressure";
86-
char MQTT_TOPIC_PM1[128] = "sensor/PM1";
87-
char MQTT_TOPIC_PM25[128] = "sensor/PM2.5";
88-
char MQTT_TOPIC_PM10[128] = "sensor/PM10";
89-
char MQTT_TOPIC_AIRQUALITY[128] = "airquality";
100+
char MQTT_TOPIC_TEMP[64] = "sensor/temperature";
101+
char MQTT_TOPIC_HUMI[64] = "sensor/humidity";
102+
char MQTT_TOPIC_PRESS[64] = "sensor/pressure";
103+
char MQTT_TOPIC_PM1[64] = "sensor/PM1";
104+
char MQTT_TOPIC_PM25[64] = "sensor/PM2.5";
105+
char MQTT_TOPIC_PM10[64] = "sensor/PM10";
106+
char MQTT_TOPIC_AIRQUALITY[32] = "airquality";
90107

91108
bool AQI_ECO_ON = false;
92-
char AQI_ECO_HOST[128] = "???.aqi.eco";
109+
char AQI_ECO_HOST[64] = "???.aqi.eco";
93110
char AQI_ECO_PATH[64] = "/u/???";
94111

95-
int SENDING_FREQUENCY = 3;
96-
int SENDING_DB_FREQUENCY = 3;
112+
unsigned char SENDING_FREQUENCY = 3;
113+
unsigned char SENDING_DB_FREQUENCY = 3;
97114
bool DEEPSLEEP_ON = false;
98115

99116
bool DEBUG = false;
100117
#ifdef ARDUINO_ARCH_ESP8266
101-
bool AUTOUPDATE_ON = false;
118+
bool AUTOUPDATE_ON = true;
102119
#elif defined ARDUINO_ARCH_ESP32
103120
bool AUTOUPDATE_ON = true;
104121
#endif
105122

106123
bool CONFIG_AUTH = false;
107124
char CONFIG_USERNAME[64] = "admin";
108-
char CONFIG_PASSWORD[256] = "password";
125+
char CONFIG_PASSWORD[128] = "password";
109126

110-
char MODEL[32] = "white";
127+
char MODEL[12] = "white";
111128
float calib1 = 1.0;
112129
float calib2 = 1.0;
130+
131+
bool HOMEKIT_SUPPORT = false;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)