diff --git a/README.md b/README.md index bf5ae8f..b16f191 100644 --- a/README.md +++ b/README.md @@ -68,13 +68,13 @@ is published in **watermeter/0/total** Connect your ESP8266/ESP32 to the CC1101 868Mhz module: | CC1101 | ESP8266 | ESP32 | |--------|:-------:|:-----:| -| VCC | 3V3 | 3V3 | -| GND | GND | GND | -| CSN | D8 | 4 | -| MOSI | D7 | 23 | -| MISO | D6 | 19 | -| SCK | D5 | 18 | -| GD0 | D2 | 32 | -| GD2 | not connected| not connected| +| VCC | 3V3 | 3V3 | +| GND | GND | GND | +| CSN | D8 | 4 | +| MOSI | D7 | 23 | +| MISO | D6 | 19 | +| SCK | D5 | 18 | +| GDO0 | D2 | 32 | +| GDO2 | not connected| not connected| Thanks to [weetmuts](https://github.com/weetmuts) for his great job on the wmbusmeters. diff --git a/include/credentials_template.h b/include/credentials_template.h deleted file mode 100644 index 08f1eeb..0000000 --- a/include/credentials_template.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef __CREDENTIALS_H__ -#define __CREDENTIALS_H__ - -#include - -// ask your supplier for your personal encryption key (16 bytes) -#define ENCRYPTION_KEY 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF -// serial number is printed on your multical21 -#define SERIAL_NUMBER 0x12, 0x34, 0x56, 0x78 - -// WIFI configuration, supports more than one WIFI, first found first served -// if you dont use MQTT, leave it empty ("") -// if you dont need user/pass for MQTT, leave it empty ("") -struct CREDENTIAL { - char const* ssid; - char const* password; - char const* mqtt_broker; // MQTT broker - char const* mqtt_username; // MQTT username - char const* mqtt_password; // MQTT password -}; - -CREDENTIAL currentWifi; // global to store found wifi - -// "ssid", "wifi_passphrase", "mqtt_broker", "mqtt_username", "mqtt_password" -std::vector const credentials = { - { "ssid1", "********", "", "", ""} // no MQTT - just serial output - , { "ssid3", "********", "10.0.0.11", "", ""} // MQTT without authentication - , { "ssid2", "********", "10.0.0.10", "loxone", "loxy1234"} // MQTT with user/pass -}; - -#endif // __CREDENTIALS_H__ \ No newline at end of file