commit 3290c7e7941b85dd494ac016962c35a4432fc363 Author: Fabian Schlenz Date: Sun Jan 3 17:12:47 2021 +0100 Initial commit 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..0f0d740 --- /dev/null +++ b/.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/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/include/config.h b/include/config.h new file mode 100644 index 0000000..d8267b5 --- /dev/null +++ b/include/config.h @@ -0,0 +1,19 @@ +#pragma once + +#define CORNERS_PER_PART 3 +#define LEDS_PER_CORNER 2 + +// Layout definition +// Every node has EDGES_PER_PART corners and edges. +// The edge the signal comes in is edge number 0. +// All other edges are numbered counter-clockwise. +// LAYOUT contains a list of edges the signal takes. +// First node is implied. + +// Examples, assuming EDGES_PER_PART == 3: +// Example: Nodes arranged in a circle: {1, 2, 2, 2, 2} +// Example: Nodes arranged in a line: {1, 2, 1, 2, 1, 2} +#define NODE_COUNT 3 +#define LAYOUT {2, 1} + +#define LED_COUNT NODE_COUNT * CORNERS_PER_PART * LEDS_PER_CORNER \ No newline at end of file diff --git a/include/corner.h b/include/corner.h new file mode 100644 index 0000000..6405698 --- /dev/null +++ b/include/corner.h @@ -0,0 +1,3 @@ +#pragma once + +class Corner {}; \ No newline at end of file diff --git a/include/edge.h b/include/edge.h new file mode 100644 index 0000000..3361b99 --- /dev/null +++ b/include/edge.h @@ -0,0 +1,3 @@ +#pragma once + +class Edge {}; \ No newline at end of file diff --git a/include/node.h b/include/node.h new file mode 100644 index 0000000..ec5d193 --- /dev/null +++ b/include/node.h @@ -0,0 +1,14 @@ +#pragma once +#include +#include "config.h" +#include "edge.h" +#include "corner.h" + +class Node { + public: + Node* neighbours[CORNERS_PER_PART]; + Edge* edges[CORNERS_PER_PART]; + Corner* corners[CORNERS_PER_PART]; + Node(); + Node* create_neighbour(uint8_t edge); +}; \ No newline at end of file diff --git a/include/prototypes.h b/include/prototypes.h new file mode 100644 index 0000000..0865ba8 --- /dev/null +++ b/include/prototypes.h @@ -0,0 +1,14 @@ +#pragma once +#include +#include +#include "config.h" +#include "node.h" +#include "edge.h" +#include "corner.h" + + +extern std::list nodes; +extern std::list edges; +extern std::list corners; + +extern CRGB leds[LED_COUNT]; \ No newline at end of file diff --git a/include/tools.h b/include/tools.h new file mode 100644 index 0000000..b2d6d3b --- /dev/null +++ b/include/tools.h @@ -0,0 +1,9 @@ +#pragma once +#include + +#define LOG(...) Serial.printf(__VA_ARGS__) +#define LOGln(...) Serial.printf(__VA_ARGS__); Serial.println() + + +void clear_leds(); +void set_all_leds(CRGB color); \ No newline at end of file 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..b8a44e9 --- /dev/null +++ b/platformio.ini @@ -0,0 +1,20 @@ +; 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 +upload_port = /dev/cu.wchusbserial* +upload_speed = 921600 +monitor_port = /dev/cu.wchusbserial* +monitor_speed = 74880 +monitor_filters = default, colorize, time, send_on_enter, esp8266_exception_decoder +lib_deps = FastLED \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..f445f26 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,70 @@ +#include +#include +#include "config.h" +#include "tools.h" +#include "node.h" +#include "edge.h" +#include "corner.h" +#include "prototypes.h" + +std::list nodes; +std::list edges; +std::list corners; + +CRGB leds[LED_COUNT]; + +void setup_layout() { + LOGln("Setting up layout..."); + uint8_t layout[] = LAYOUT; + Node* current_node = new Node(); + nodes.push_back(current_node); + + for(uint16_t i=0; icreate_neighbour(layout[i]); + nodes.push_back(current_node); + } + + for(Node* node: nodes) { + for(Edge* edge: node->edges) { + //LOGln("Edge #%d: %p", i, edge); + auto e = std::find(edges.begin(), edges.end(), edge); + if (e == edges.end()) { + edges.push_back(edge); + } + } + for(Corner* corner: node->corners) { + //LOGln("Corner #%d: %p", i, corner); + auto c = std::find(corners.begin(), corners.end(), corner); + if (c == corners.end()) { + corners.push_back(corner); + } + } + } + + LOGln("Counts:"); + LOGln("Nodes: %3d", nodes.size()); + LOGln("Edges: %3d", edges.size()); + LOGln("Corners: %3d", corners.size()); +} + +void setup_fastled() { + LOGln("Setting up FastLED..."); + // GPIO5 = D1 + // GPIO2 = D4 + FastLED.addLeds(leds, LEDS_PER_CORNER * CORNERS_PER_PART * NODE_COUNT).setCorrection(TypicalLEDStrip); + LOGln("LEDs: %3d", LED_COUNT); + FastLED.setBrightness(255); + set_all_leds(CRGB(0xFF)); +} + +void setup() { + Serial.begin(74880); + LOGln("ESPleaf starting."); + + setup_layout(); + setup_fastled(); +} + +void loop() { + // put your main code here, to run repeatedly: +} \ No newline at end of file diff --git a/src/node.cpp b/src/node.cpp new file mode 100644 index 0000000..8b0f4e8 --- /dev/null +++ b/src/node.cpp @@ -0,0 +1,22 @@ +#include "node.h" + +Node::Node() { + for(int i=0; ineighbours[0] = this; + neighbours[edge] = node; + + delete node->edges[0]; + node->edges[0] = this->edges[edge]; + delete node->corners[0]; + node->corners[0] = this->corners[(edge-1) % CORNERS_PER_PART]; + delete node->corners[CORNERS_PER_PART-1]; + node->corners[CORNERS_PER_PART-1] = this->corners[edge]; + return node; +} \ No newline at end of file diff --git a/src/tools.cpp b/src/tools.cpp new file mode 100644 index 0000000..d88b52b --- /dev/null +++ b/src/tools.cpp @@ -0,0 +1,11 @@ +#include "tools.h" +#include "prototypes.h" +#include "config.h" + +void clear_leds() { + set_all_leds(CRGB::Black); +} + +void set_all_leds(CRGB color) { + FastLED.showColor(color); +} \ No newline at end of file diff --git a/test/README b/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/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