commit 880c46bc78c5921ebe3ca78b8c137089fed5ea71 Author: Fisch Date: Thu Mar 30 17:55:45 2023 +0200 working simple ec-meter diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0f417b9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch +.pioenvs +.piolibdeps +.clang_complete +.gcc-flags.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000..080e70d --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,10 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..cad7657 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.configureOnOpen": false +} \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..91c8c61 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# EC-Meter for ESP32 + +Circuit from: https://publiclab.org/notes/bhickman/05-09-2016/conductivity-and-temperature-meter diff --git a/include/README b/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/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/lib/README b/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/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/platformio.ini b/platformio.ini new file mode 100644 index 0000000..7997102 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,16 @@ +; 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:esp32doit-devkit-v1] +platform = espressif32 +board = esp32doit-devkit-v1 +framework = arduino + +monitor_speed = 115200 \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..e2a26ae --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,86 @@ +#include + +#define EC_PIN_ADC 4 +#define EC_PIN_FREQ 5 +#define EC_PWM_CH 0 +#define EC_RESOLUTION 8 +#define EC_FREQUENCY 5000 + +#define EC_ARRAY_SIZE 1024 +uint16_t ec_array[EC_ARRAY_SIZE]; +uint16_t ec_array_pos=0; +unsigned long ec_last_read=0; +#define EC_READ_INTERVAL 1 + +unsigned long last_print=0; + +float getMean(uint16_t* parray); +uint16_t getMin(uint16_t *parray); +uint16_t getMax(uint16_t *parray); + +void setup() { + Serial.begin(115200); + pinMode(EC_PIN_ADC,INPUT); + + ledcSetup(EC_PWM_CH, EC_FREQUENCY, EC_RESOLUTION); + ledcAttachPin(EC_PIN_FREQ, EC_PWM_CH); + ledcWrite(EC_PWM_CH, 127); +} + +void loop() { + unsigned long loopmillis=millis(); + + bool flag_print=false; + + if (loopmillis>ec_last_read+EC_READ_INTERVAL) { + ec_last_read=loopmillis; + ec_array_pos++; + flag_print= ec_array_pos==EC_ARRAY_SIZE; + ec_array_pos%=EC_ARRAY_SIZE; + ec_array[ec_array_pos]=analogRead(EC_PIN_ADC); + + //Serial.print(ec_array[ec_array_pos]); Serial.print(" "); + } + + + //if (flag_print) { + if (loopmillis>last_print+250) { + last_print=loopmillis; + Serial.print(getMean(ec_array),3); + Serial.print("\t"); Serial.print(getMax(ec_array) - getMin(ec_array)); + Serial.println(); + } + +} + +float getMean(uint16_t *parray) { + double mean=0; + for (uint16_t i=0;imax) { + max=parray[i]; + } + } + + return max; +} \ No newline at end of file