From c4f3e8b88fdb3bfc317dac20d63178a5c38bbd78 Mon Sep 17 00:00:00 2001 From: Fisch Date: Sat, 22 Apr 2023 14:02:51 +0200 Subject: [PATCH] move ino to platformio --- .gitignore | 5 +++ .vscode/extensions.json | 10 +++++ include/README | 39 ++++++++++++++++++++ lib/README | 46 +++++++++++++++++++++++ platformio.ini | 19 ++++++++++ scalecontroller.ino => src/main.cpp | 57 +++++++++++++++++++++++++++-- test/README | 11 ++++++ 7 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 .gitignore create mode 100644 .vscode/extensions.json create mode 100644 include/README create mode 100644 lib/README create mode 100644 platformio.ini rename scalecontroller.ino => src/main.cpp (95%) create mode 100644 test/README diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch 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/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..a08bbd7 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,19 @@ +; 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:nanoatmega328] +platform = atmelavr +board = nanoatmega328 +framework = arduino + +lib_deps= + bogde/HX711@^0.7.5 + marcoschwartz/LiquidCrystal_I2C@^1.1.4 + https://github.com/arduino-libraries/Servo \ No newline at end of file diff --git a/scalecontroller.ino b/src/main.cpp similarity index 95% rename from scalecontroller.ino rename to src/main.cpp index 4141b41..2fd76d4 100644 --- a/scalecontroller.ino +++ b/src/main.cpp @@ -1,7 +1,8 @@ +#include //use arduino 1.0.5, otherwise display library does not work properly #include -#include "HX711.h" +#include #include #include #include @@ -66,7 +67,9 @@ uint8_t btn_set_press=0; #define DEFAULT_SPSADC 10 // DOUT, SCK -HX711 scale(A1, A0); // parameter "gain" is ommited; the default value 128 is used by the library +//HX711 scale(A1, A0); // parameter "gain" is ommited; the default value 128 is used by the library +HX711 scale; + //A+= green, A-=white, E-=Black, E+=Red LiquidCrystal_I2C lcd(0x27,16,2); // set the LCD address to 0x27 for a 16 chars and 2 line display //lcd sda an pin 27 (A4) @@ -149,6 +152,40 @@ uint8_t state=S_SCALEDISPLAY; uint32_t statetimer=0; //for state delays + + +void rpm_interrupt(); +float StringToFloat(String s); +void EEPROMWriteDouble(int ee, double value); +double EEPROMReadDouble(int ee); +uint16_t EEPROMReadInt(uint8_t paddr); +void EEPROMWriteInt(uint8_t paddr,uint16_t pdata); +void loadDefaults(); +void writeEEPROMsettings(); +void updateFPS(); +void updateSPSADC(); +void loadEEPROMsettings(); +String toStringBar(double val,double minimum,double maximum); +String toString(double w,uint8_t dec); +String toString(double w); +String toWeightString(double w,uint8_t dec,uint8_t len); +String toWeightString(double w); +double getWeightSeriesMax(); +double getWeightSeriesMin(); +double getWeightMedian(); +double getVoltage(); +double getCurrent(); +String menuentry_string(); +void menuentry_set(uint8_t presstype); +void menuentry_back(uint8_t presstype); +void menuentry_up(uint8_t presstype); +void menuentry_down(uint8_t presstype); +void resetBTNFlag(uint8_t *btnpress); +void buttonHandler(uint8_t pin,uint32_t *btntdown,uint32_t *btntrelease,uint8_t *btnpress); +void buttonCheck(); +void updateLCD(); + + void setup() { Serial.begin(9600); @@ -190,6 +227,8 @@ void setup() { dtostrf(scalecalibration,4,5,tempstring); lcd.print("cal="+String(tempstring)); + + scale.begin(A1, A0); scale.set_scale(scalecalibration); scale.tare(); @@ -570,6 +609,7 @@ void loop() { } void updateLCD(){ + /*switch(state){ case S_SCALEDISPLAY: if ((getWeightSeriesMax()-getWeightSeriesMin())