diff --git a/.gitignore b/.gitignore index 7e778bb..2edd53a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,7 @@ CMakeUserPresets.json # build folder build/ # End of https://www.toptal.com/developers/gitignore/api/cmake + +# Credentials +include/credentials.h +replacements.txt diff --git a/src/main.c b/src/main.c index 3eac4e3..f9abc99 100644 --- a/src/main.c +++ b/src/main.c @@ -18,12 +18,13 @@ * the readings to Adafruit IO over MQTT using the Pico W. ******************************************************************************/ +#include "credentials.h" #include "aht.h" #include "bmp.h" #include "ens.h" -#include "mqtt.h" #include "hardware/gpio.h" #include "hardware/i2c.h" +#include "mqtt.h" #include "pico/cyw43_arch.h" #include "pico/stdlib.h" // IWYU pragma: keep #include @@ -38,10 +39,7 @@ #define I2C1_SDA_PIN 18 // MQTT and WiFi defines #define ADAFRUIT_IO_HOST "io.adafruit.com" -#define ADAFRUIT_IO_USERNAME "ADAFRUIT_IO_USERNAME" -#define ADAFRUIT_IO_PASSWORD "ADAFRUIT_IO_KEY" -#define WIFI_SSID "Meosjin" -#define WIFI_PASSWORD "WIFI_PASSWORD" +#define ADAFRUIT_IO_PASSWORD ADAFRUIT_IO_KEY #define MQTT_KEEP_ALIVE_SECONDS 60 static void mqtt_connection_cb(mqtt_client_t *client, void *arg, @@ -78,13 +76,14 @@ static uint16_t average_uint16(const uint16_t *samples, uint8_t count) { int main(void) { // MQTT Topics - static const char temp_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.temperature"; - static const char humi_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.humidity"; - static const char aqi_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.aqi"; - static const char tvoc_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.tvoc"; - static const char etoh_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.etoh"; - static const char eco2_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.eco2"; - static const char prs_topic[] = "ADAFRUIT_IO_USERNAME/feeds/ensaht.pressure"; + static const char temp_topic[] = + ADAFRUIT_IO_USERNAME "/feeds/ensaht.temperature"; + static const char humi_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.humidity"; + static const char aqi_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.aqi"; + static const char tvoc_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.tvoc"; + static const char etoh_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.etoh"; + static const char eco2_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.eco2"; + static const char prs_topic[] = ADAFRUIT_IO_USERNAME "/feeds/ensaht.pressure"; uint16_t tvoc, eco2, etoh, avg_tvoc, avg_eco2, avg_etoh; uint8_t aqi, validData; double t, h, avg_t, avg_h, avg_bmp_t, avg_bmp_p;