From dba16cc27e3e72353b7dbd81479cd430edd4ef59 Mon Sep 17 00:00:00 2001 From: Fisch Date: Sat, 12 Dec 2020 21:50:20 +0100 Subject: [PATCH] migrate to platformio --- include/README | 39 +++++++++++++++++++++++ lib/README | 46 ++++++++++++++++++++++++++++ platformio.ini | 19 ++++++++++++ effect.h => src/effect.h | 0 fx_flash.cpp => src/fx_flash.cpp | 0 fx_flash.h => src/fx_flash.h | 0 fx_scanner.cpp => src/fx_scanner.cpp | 0 fx_scanner.h => src/fx_scanner.h | 0 achterbahn.ino => src/main.cpp | 26 ++++++++++++++++ wagon.cpp => src/wagon.cpp | 6 ++-- wagon.h => src/wagon.h | 0 11 files changed, 133 insertions(+), 3 deletions(-) create mode 100644 include/README create mode 100644 lib/README create mode 100644 platformio.ini rename effect.h => src/effect.h (100%) rename fx_flash.cpp => src/fx_flash.cpp (100%) rename fx_flash.h => src/fx_flash.h (100%) rename fx_scanner.cpp => src/fx_scanner.cpp (100%) rename fx_scanner.h => src/fx_scanner.h (100%) rename achterbahn.ino => src/main.cpp (97%) rename wagon.cpp => src/wagon.cpp (98%) rename wagon.h => src/wagon.h (100%) 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..f88909e --- /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:d1_mini] +platform = espressif8266 +board = d1_mini +framework = arduino + +monitor_speed = 115200 + +lib_deps = + adafruit/Adafruit NeoPixel @ ^1.7.0 \ No newline at end of file diff --git a/effect.h b/src/effect.h similarity index 100% rename from effect.h rename to src/effect.h diff --git a/fx_flash.cpp b/src/fx_flash.cpp similarity index 100% rename from fx_flash.cpp rename to src/fx_flash.cpp diff --git a/fx_flash.h b/src/fx_flash.h similarity index 100% rename from fx_flash.h rename to src/fx_flash.h diff --git a/fx_scanner.cpp b/src/fx_scanner.cpp similarity index 100% rename from fx_scanner.cpp rename to src/fx_scanner.cpp diff --git a/fx_scanner.h b/src/fx_scanner.h similarity index 100% rename from fx_scanner.h rename to src/fx_scanner.h diff --git a/achterbahn.ino b/src/main.cpp similarity index 97% rename from achterbahn.ino rename to src/main.cpp index eac2242..11f0551 100644 --- a/achterbahn.ino +++ b/src/main.cpp @@ -1,5 +1,7 @@ //flash as Wemos D1 R2 & mini +#include + #include #ifdef __AVR__ #include @@ -15,6 +17,21 @@ #include "fx_flash.h" +void resetHeightmap(); +void printHeightmapRaw(); +void interpolateHeightValues(); +void previewHeightmap(int waittime); +void spawnWagon(); +void spawnWagon(float pos, float wagonlength,float startvel, float startacc, float mass, uint8_t wheelcolor); +void checkSerial(); +void loop_configmode(); +void loop_achterbahn(); +void removeAllWagons(); +uint32_t Wheel(byte WheelPos); +void loadHeightmapRaw(); +void saveHeightmapRaw(); + + #define PIN D2 #define NUMPIXELS 600 @@ -103,6 +120,8 @@ void setup() { } + + void resetHeightmap(){ for (int i=0;isetPixelColor(iCorrected,_tmpr,_tmpg,_tmpb); //draw pixel } diff --git a/wagon.h b/src/wagon.h similarity index 100% rename from wagon.h rename to src/wagon.h