From e73944fba89fb73e3ac39ca7cd2a8a85294e4c81 Mon Sep 17 00:00:00 2001 From: Stefan Ostermann Date: Sat, 10 Apr 2021 18:44:09 +0200 Subject: [PATCH] Baud Rate, Removed arduino projects --- esp-receiver/.gitignore | 5 + esp-receiver/.vscode/extensions.json | 7 + esp-receiver/.vscode/settings.json | 5 + esp-receiver/include/README | 39 +++ esp-receiver/lib/README | 46 ++++ esp-receiver/platformio.ini | 25 ++ .../src/main.cpp | 6 +- esp-receiver/test/README | 11 + sensor433-arduino/dht22.cpp | 149 ------------ sensor433-arduino/dht22.h | 76 ------ sensor433-arduino/sensor433-arduino.ino | 226 ------------------ 11 files changed, 142 insertions(+), 453 deletions(-) create mode 100644 esp-receiver/.gitignore create mode 100644 esp-receiver/.vscode/extensions.json create mode 100644 esp-receiver/.vscode/settings.json create mode 100644 esp-receiver/include/README create mode 100644 esp-receiver/lib/README create mode 100644 esp-receiver/platformio.ini rename receiver-arduino/receiver-arduino.ino => esp-receiver/src/main.cpp (97%) create mode 100644 esp-receiver/test/README delete mode 100644 sensor433-arduino/dht22.cpp delete mode 100644 sensor433-arduino/dht22.h delete mode 100644 sensor433-arduino/sensor433-arduino.ino diff --git a/esp-receiver/.gitignore b/esp-receiver/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/esp-receiver/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/esp-receiver/.vscode/extensions.json b/esp-receiver/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/esp-receiver/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/esp-receiver/.vscode/settings.json b/esp-receiver/.vscode/settings.json new file mode 100644 index 0000000..52829ca --- /dev/null +++ b/esp-receiver/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "*.tcc": "cpp" + } +} \ No newline at end of file diff --git a/esp-receiver/include/README b/esp-receiver/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/esp-receiver/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/esp-receiver/lib/README b/esp-receiver/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/esp-receiver/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/esp-receiver/platformio.ini b/esp-receiver/platformio.ini new file mode 100644 index 0000000..6cd03e0 --- /dev/null +++ b/esp-receiver/platformio.ini @@ -0,0 +1,25 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:d1_mini] +platform = espressif8266 +board = d1_mini +framework = arduino +monitor_speed = 9600 +lib_deps = + mikem/RadioHead@^1.113 + ;tzapu/WiFiManager@^0.16.0 + +[env:nanoatmega328] +platform = atmelavr +board = nanoatmega328 +framework = arduino +monitor_speed = 9600 +lib_deps = mikem/RadioHead@^1.113 \ No newline at end of file diff --git a/receiver-arduino/receiver-arduino.ino b/esp-receiver/src/main.cpp similarity index 97% rename from receiver-arduino/receiver-arduino.ino rename to esp-receiver/src/main.cpp index e203879..96bff75 100644 --- a/receiver-arduino/receiver-arduino.ino +++ b/esp-receiver/src/main.cpp @@ -1,5 +1,7 @@ +#include + #define SERVER_ADDRESS 0x01 -#define RH_SPEED 1200 +#define RH_SPEED 1000 #define RH_RX_PIN 11 #define RH_BUF_LEN 5 @@ -72,4 +74,4 @@ void loop() { } } -} +} \ No newline at end of file diff --git a/esp-receiver/test/README b/esp-receiver/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/esp-receiver/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PlatformIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PlatformIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html diff --git a/sensor433-arduino/dht22.cpp b/sensor433-arduino/dht22.cpp deleted file mode 100644 index db16b3a..0000000 --- a/sensor433-arduino/dht22.cpp +++ /dev/null @@ -1,149 +0,0 @@ -/* Fast DHT Lirary - * - * Copyright (C) 2015 Sergey Denisov. - * Written by Sergey Denisov aka LittleBuster (DenisovS21@gmail.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version 3 - * of the Licence, or (at your option) any later version. - * - * Original library written by Adafruit Industries. MIT license. - * - * https://github.com/LittleBuster/avr-dht22 - */ - -#include "dht22.h" -#include -#include -#include - - -#define DHT_COUNT 6 -#define DHT_MAXTIMINGS 85 - - -void dht_init(struct dht22 *dht, uint8_t pin) -{ - dht->pin = pin; - /* Setup the pins! */ - DDR_DHT &= ~(1 << dht->pin); - PORT_DHT |= (1 << dht->pin); -} - -static uint8_t dht_read(struct dht22 *dht) -{ - uint8_t tmp; - uint8_t sum = 0; - uint8_t j = 0, i; - uint8_t last_state = 1; - uint16_t counter = 0; - /* - * Pull the pin 1 and wait 250 milliseconds - */ - PORT_DHT |= (1 << dht->pin); - _delay_ms(250); - - dht->data[0] = dht->data[1] = dht->data[2] = dht->data[3] = dht->data[4] = 0; - - /* Now pull it low for ~20 milliseconds */ - DDR_DHT |= (1 << dht->pin); - PORT_DHT &= ~(1 << dht->pin); - _delay_ms(20); - cli(); - PORT_DHT |= (1 << dht->pin); - _delay_us(40); - DDR_DHT &= ~(1 << dht->pin); - - /* Read the timings */ - for (i = 0; i < DHT_MAXTIMINGS; i++) { - counter = 0; - while (1) { - tmp = ((PIN_DHT & (1 << dht->pin)) >> 1); - _delay_us(3); - - if (tmp != last_state) - break; - - counter++; - _delay_us(1); - - if (counter == 255) - break; - } - - last_state = ((PIN_DHT & (1 << dht->pin)) >> 1); - - if (counter == 255) - break; - - /* Ignore first 3 transitions */ - if ((i >= 4) && (i % 2 == 0)) { - /* Shove each bit into the storage bytes */ - dht->data[j/8] <<= 1; - if (counter > DHT_COUNT) - dht->data[j/8] |= 1; - j++; - } - } - - sei(); - sum = dht->data[0] + dht->data[1] + dht->data[2] + dht->data[3]; - - if ((j >= 40) && (dht->data[4] == (sum & 0xFF))) - return 1; - return 0; -} - -uint8_t dht_read_temp(struct dht22 *dht, float *temp) -{ - if (dht_read(dht)) { - *temp = dht->data[2] & 0x7F; - *temp *= 256; - *temp += dht->data[3]; - *temp /= 10; - - if (dht->data[2] & 0x80) - *temp *= -1; - return 1; - } - return 0; -} - -uint8_t dht_read_hum(struct dht22 *dht, float *hum) -{ - if (dht_read(dht)) { - *hum = dht->data[0]; - *hum *= 256; - *hum += dht->data[1]; - *hum /= 10; - if (*hum == 0.0f) - return 0; - return 1; - } - return 0; -} - -uint8_t dht_read_data(struct dht22 *dht, float *temp, float *hum) -{ - if (dht_read(dht)) { - /* Reading temperature */ - *temp = dht->data[2] & 0x7F; - *temp *= 256; - *temp += dht->data[3]; - *temp /= 10; - - if (dht->data[2] & 0x80) - *temp *= -1; - - /* Reading humidity */ - *hum = dht->data[0]; - *hum *= 256; - *hum += dht->data[1]; - *hum /= 10; - if (*hum == 0.0f) - return 0; - return 1; - } - return 0; -} diff --git a/sensor433-arduino/dht22.h b/sensor433-arduino/dht22.h deleted file mode 100644 index 50d7fef..0000000 --- a/sensor433-arduino/dht22.h +++ /dev/null @@ -1,76 +0,0 @@ -/* struct dht22 AVR Lirary - * - * Copyright (C) 2015 Sergey Denisov. - * Written by Sergey Denisov aka LittleBuster (DenisovS21@gmail.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public Licence - * as published by the Free Software Foundation; either version 3 - * of the Licence, or (at your option) any later version. - * - * Original library written by Adafruit Industries. MIT license. - * - * https://github.com/LittleBuster/avr-dht22 - */ - -#ifndef __DHT22_H__ -#define __DHT22_H__ - -#include - -/* - * Sensor's port - */ -#define DDR_DHT DDRB -#define PORT_DHT PORTB -#define PIN_DHT PINB - - -struct dht22 { - uint8_t data[6]; /* data from sensor store here */ - uint8_t pin; /* DDR & PORT pin */ -}; - -/** - * Init dht sensor - * @dht: sensor struct - * @pin: PORT & DDR pin - */ -void dht_init(struct dht22 *dht, uint8_t pin); - -/** - * Reading temperature from sensor - * @dht: sensor struct - * @temp: out temperature pointer - * - * Returns 1 if succeful reading - * Returns 0 if fail reading - */ -uint8_t dht_read_temp(struct dht22 *dht, float *temp); - -/** - * Reading humidity from sensor - * @dht: sensor struct - * @hum: out humidity pointer - * - * Returns 1 if succeful reading - * Returns 0 if fail reading - */ -uint8_t dht_read_hum(struct dht22 *dht, float *hum); - -/** - * Reading temperature and humidity from sensor - * @dht: sensor struct - * @temp: out temperature pointer - * @hum: out humidity pointer - * - * Returns 1 if succeful reading - * Returns 0 if fail reading - * - * The fastest function for getting temperature + humidity. - */ -uint8_t dht_read_data(struct dht22 *dht, float *temp, float *hum); - - -#endif - diff --git a/sensor433-arduino/sensor433-arduino.ino b/sensor433-arduino/sensor433-arduino.ino deleted file mode 100644 index 5d88f93..0000000 --- a/sensor433-arduino/sensor433-arduino.ino +++ /dev/null @@ -1,226 +0,0 @@ -/* - RadioHead attiny85 DHT22 Weather Station - - 2021 Stefan Ostermann based on several source from the internetz. - - Sources: - https://git.cryhost.de/crycode/attiny85-radiohead-dht22-weather-sensor/-/tree/master -*/ - - -// pin with the LED connected -#define LED_PIN 4 - -// blink time for the LED -#define LED_TIME 200 - -// pin of the DHT22 sensor -#define DHT_PIN 1 - -// the own RadioHead address -#define RH_OWN_ADDR 0xca // 202 - -// the server RadioHead address -#define RH_SERVER_ADDR 0x01 - -// RadioHead bitrate in bit/s -#define RH_SPEED 1200 - -// pins for the radio hardware -#define RH_RX_PIN 5 // not used, set to a non-existent pin -#define RH_TX_PIN 3 -#define RH_PTT_PIN 5 // not used, set to a non-existent pin - -#include -#include -#include -#include - -// for watchdog wakeup -// https://gist.github.com/dwhacks/8055287 -#ifndef cbi -#define cbi(sfr, bit) (_SFR_BYTE(sfr) &= ~_BV(bit)) -#endif -#ifndef sbi -#define sbi(sfr, bit) (_SFR_BYTE(sfr) |= _BV(bit)) -#endif - - -// DHT22 lib -// not using the current adafruit dht library, because it eats too many memory -#include "dht22.h" -dht22 dht; - -#define RH_BUF_LEN 5 -uint8_t rh_buf[RH_BUF_LEN] = { 0x00, 0x00, 0x00, 0x00, 0x00 }; - -// reduce the RadioHead max message length to save memory -#define RH_ASK_MAX_MESSAGE_LEN RH_BUF_LEN - -// RadioHead -#include - -#define MSG_START 0x00 -#define MSG_TEMP 0x01 -#define MSG_HUMID 0x02 -#define MSG_BAT 0x03 -#define MSG_ERR 0xee - - -RH_ASK rh_driver(RH_SPEED, RH_RX_PIN, RH_TX_PIN, RH_PTT_PIN); - -// watchdog flag -volatile boolean f_wdt = 1; - -// temp / humid toggle -volatile uint8_t counter = 0; - - -void gotoSleep(void); - -int getVcc(); - -void setup() { - // setup the LED pin - pinMode(LED_PIN, OUTPUT); - - // init the DHT22 - dht_init(&dht, DHT_PIN); - - - uint8_t num_blink = 3; - - if (!rh_driver.init()) { - num_blink = 5; - } - - // blink 3 times - for (uint8_t i = 0; i < num_blink; i++) { - digitalWrite(LED_PIN, HIGH); - _delay_ms(LED_TIME); - digitalWrite(LED_PIN, LOW); - _delay_ms(LED_TIME); - } - - // send start message - rh_buf[0] = MSG_START; - rh_send(1); - - setup_watchdog(6); // approximately 4 seconds sleep - -} - -// main loop -void loop() { - - if (f_wdt) { - f_wdt = 0; - // turn on the LED - digitalWrite(LED_PIN, HIGH); - - // temperature and humidity - float t = 0;//float is 32bit = 1byte - float h = 0; - long battery = 0; - - if (counter % 4 == 0) { - rh_buf[0] = MSG_BAT; - battery = getVcc(); - memcpy(&rh_buf[1], &battery, 4); - rh_send(RH_BUF_LEN); - }else if (dht_read_data(&dht, &t, &h) == 1) { - if (counter % 2 == 0) { - rh_buf[0] = MSG_TEMP; - memcpy(&rh_buf[1], &t, 4); - } else if (counter % 2 == 1) { - rh_buf[0] = MSG_HUMID; - memcpy(&rh_buf[1], &h, 4); - } - rh_send(RH_BUF_LEN); - } else { - // error message - rh_buf[0] = MSG_ERR; - rh_send(1); - - } - counter++; - - // turn off the LED - digitalWrite(LED_PIN, LOW); - system_sleep(); - //_delay_ms(1000); - } - -} - - -// function to send RadioHead messages from the buffer -void rh_send(uint8_t len) { - rh_driver.send((uint8_t *)rh_buf, len); - rh_driver.waitPacketSent(); -} - - - -ISR(WDT_vect) -{ - f_wdt = 1; // set global flag -} - -/* set system into the sleep state - system wakes up when watchdog is timed out -*/ -void system_sleep() { - //cbi(ADCSRA, ADEN); // switch Analog to Digitalconverter OFF - - set_sleep_mode(SLEEP_MODE_PWR_DOWN); // sleep mode is set here - sleep_enable(); - - sleep_mode(); // System sleeps here - - sleep_disable(); // System continues execution here when watchdog timed out - //sbi(ADCSRA, ADEN); // switch Analog to Digitalconverter ON -} - -/* 0=16ms, 1=32ms,2=64ms,3=128ms,4=250ms,5=500ms - 6=1 sec,7=2 sec, 8=4 sec, 9= 8sec -*/ -void setup_watchdog(int ii) { - - byte bb; - int ww; - if (ii > 9 ) ii = 9; - bb = ii & 7; - if (ii > 7) bb |= (1 << 5); - bb |= (1 << WDCE); - ww = bb; - - MCUSR &= ~(1 << WDRF); - // start timed sequence - WDTCR |= (1 << WDCE) | (1 << WDE); - // set new watchdog timeout value - WDTCR = bb; - WDTCR |= _BV(WDIE); -} - - -/** - From https://github.com/cano64/ArduinoSystemStatus/blob/master/SystemStatus.cpp -*/ -int getVcc() { - //reads internal 1V1 reference against VCC - ADMUX = _BV(MUX3) | _BV(MUX2); // For ATtiny85/45 - - _delay_ms(5);; // Wait for Vref to settle - ADCSRA |= _BV(ADSC); // Convert - while (bit_is_set(ADCSRA, ADSC)); - uint8_t low = ADCL; - unsigned int val = (ADCH << 8) | low; - //discard previous result - ADCSRA |= _BV(ADSC); // Convert - while (bit_is_set(ADCSRA, ADSC)); - low = ADCL; - val = (ADCH << 8) | low; - - return ((long)1024 * 1100) / val; -}