diff --git a/README.md b/README.md index 2bb8622..ae02052 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # RF climate sensor (BMP280) -Climate sensor on ATmega328 + RF24 + BMP280. +Climate sensor on ATmega328 + nRF24 + BMP280. ## Features @@ -10,35 +10,6 @@ Climate sensor on ATmega328 + RF24 + BMP280. ## Note -A gateway is required. For details see "RF Gateway". +A gateway is required. For details see [RF Gateway](https://github.com/aZholtikov/RF-Gateway). -## Full config example for Home Assistant - -```yml -mqtt: - sensor: - - name: "NAME" - device_class: "voltage" - unit_of_measurement: "V" - state_topic: "homeassistant/rf_sensor/ID/bmp280" - value_template: "{{ value_json.battery }}" - expire_after: 375 - force_update: true - qos: 2 - - name: "NAME" - device_class: "temperature" - unit_of_measurement: "°C" - state_topic: "homeassistant/rf_sensor/ID/bmp280" - value_template: "{{ value_json.temperature }}" - expire_after: 375 - force_update: true - qos: 2 - - name: "NAME" - evice_class: "pressure" - unit_of_measurement: "мм" - state_topic: "homeassistant/rf_sensor/ID/bmp280" - value_template: "{{ value_json.pressure }}" - expire_after: 375 - force_update: true - qos: 2 -``` +Any feedback via [e-mail](mailto:github@zh.com.ru) would be appreciated. Or... [Buy me a coffee](https://paypal.me/aZholtikov). diff --git a/platformio.ini b/platformio.ini index d10d44b..39b33f3 100644 --- a/platformio.ini +++ b/platformio.ini @@ -7,7 +7,6 @@ framework = arduino upload_protocol = usbasp build_flags = -D portUSE_WDTO=WDTO_1S - -D BMP280=2 -D ID=$UNIX_TIME board_fuses.hfuse = 0xDE board_fuses.lfuse = 0xE2 @@ -16,9 +15,10 @@ upload_flags = -Pusb -e lib_deps = - adafruit/Adafruit BMP280 Library@^2.6.6 - feilipu/FreeRTOS@^10.5.0-0 - nrf24/RF24@^1.4.5 + https://github.com/adafruit/Adafruit_BMP280_Library + https://github.com/aZholtikov/ZHConfig + https://github.com/feilipu/Arduino_FreeRTOS_Library + https://github.com/nRF24/RF24 [env:ATmega328P] platform = atmelavr @@ -29,7 +29,6 @@ framework = arduino upload_protocol = usbasp build_flags = -D portUSE_WDTO=WDTO_1S - -D BMP280=2 -D ID=$UNIX_TIME board_fuses.hfuse = 0xDE board_fuses.lfuse = 0xE2 @@ -38,9 +37,10 @@ upload_flags = -Pusb -e lib_deps = - adafruit/Adafruit BMP280 Library@^2.6.6 - feilipu/FreeRTOS@^10.5.0-0 - nrf24/RF24@^1.4.5 + https://github.com/adafruit/Adafruit_BMP280_Library + https://github.com/aZholtikov/ZHConfig + https://github.com/feilipu/Arduino_FreeRTOS_Library + https://github.com/nRF24/RF24 [env:ATmega328PB] platform = atmelavr @@ -51,7 +51,6 @@ framework = arduino upload_protocol = usbasp build_flags = -D portUSE_WDTO=WDTO_1S - -D BMP280=2 -D ID=$UNIX_TIME board_fuses.hfuse = 0xDE board_fuses.lfuse = 0xE2 @@ -60,6 +59,7 @@ upload_flags = -Pusb -e lib_deps = - adafruit/Adafruit BMP280 Library@^2.6.6 - feilipu/FreeRTOS@^10.5.0-0 - nrf24/RF24@^1.4.5 + https://github.com/adafruit/Adafruit_BMP280_Library + https://github.com/aZholtikov/ZHConfig + https://github.com/feilipu/Arduino_FreeRTOS_Library + https://github.com/nRF24/RF24 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 2ef0df4..c6e9e72 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,26 +2,22 @@ #include "Arduino_FreeRTOS.h" #include "Adafruit_BMP280.h" #include "RF24.h" - -typedef struct -{ - int16_t sensor_id{0}; - int16_t sensor_type{0}; - int16_t value_1{0}; - int16_t value_2{0}; - int16_t value_3{0}; - int16_t value_4{0}; - int16_t value_5{0}; -} transmitted_data_t; +#include "EEPROM.h" +#include "ZHConfig.h" void sendSensorsValue(void *pvParameters); float getBatteryLevelCharge(void); +void loadId(void); + +int16_t id{abs((int16_t)ID)}; RF24 radio(9, 10); Adafruit_BMP280 bmp; void setup() { + loadId(); + ADCSRA &= ~(1 << ADEN); radio.begin(); radio.setChannel(120); @@ -56,14 +52,14 @@ void sendSensorsValue(void *pvParameters) (void)pvParameters; for (;;) { - transmitted_data_t sensor{abs((int16_t)ID), BMP280}; + rf_transmitted_data_t sensor{id, RFST_BMP280}; bmp.takeForcedMeasurement(); sensor.value_1 = getBatteryLevelCharge() * 100; sensor.value_2 = bmp.readTemperature(); sensor.value_3 = bmp.readPressure() * 0.00750062; radio.powerUp(); radio.flush_tx(); - radio.write(&sensor, sizeof(transmitted_data_t)); + radio.write(&sensor, sizeof(rf_transmitted_data_t)); radio.powerDown(); vTaskDelay(300); } @@ -79,6 +75,19 @@ float getBatteryLevelCharge() while (bit_is_set(ADCSRA, ADSC)) ; ADCSRA &= ~(1 << ADEN); - float value = ((1024 * 1.1) / (ADCL + ADCH * 256)); - return value; + return (1024 * 1.1) / (ADCL + ADCH * 256); +} + +void loadId() +{ + cli(); + if (EEPROM.read(511) == 254) + EEPROM.get(0, id); + else + { + EEPROM.write(511, 254); + EEPROM.put(0, id); + } + delay(50); + sei(); } \ No newline at end of file