diff --git a/firmware/.gitignore b/firmware/.gitignore new file mode 100644 index 0000000..3fe18ad --- /dev/null +++ b/firmware/.gitignore @@ -0,0 +1,3 @@ +.pio +CMakeListsPrivate.txt +cmake-build-*/ diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt new file mode 100644 index 0000000..e241a23 --- /dev/null +++ b/firmware/CMakeLists.txt @@ -0,0 +1,33 @@ +# !!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE +# https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags +# +# If you need to override existing CMake configuration or add extra, +# please create `CMakeListsUser.txt` in the root of project. +# The `CMakeListsUser.txt` will not be overwritten by PlatformIO. + +cmake_minimum_required(VERSION 3.13) +set(CMAKE_SYSTEM_NAME Generic) +set(CMAKE_C_COMPILER_WORKS 1) +set(CMAKE_CXX_COMPILER_WORKS 1) + +project("untitled" C CXX) + +include(CMakeListsPrivate.txt) + +if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeListsUser.txt) +include(CMakeListsUser.txt) +endif() + +add_custom_target( + Production ALL + COMMAND platformio -c clion run "$<$>:-e${CMAKE_BUILD_TYPE}>" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_custom_target( + Debug ALL + COMMAND platformio -c clion debug "$<$>:-e${CMAKE_BUILD_TYPE}>" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_executable(Z_DUMMY_TARGET ${SRC_LIST}) diff --git a/firmware/README.md b/firmware/README.md new file mode 100644 index 0000000..9e0d564 --- /dev/null +++ b/firmware/README.md @@ -0,0 +1,7 @@ + +## Run + +### View logs + +* `screen /dev/cu.usbserial-142140 9600` +* Use `↓Ctrl ↓a ↑a ↓\ ↑\` to exit. \ No newline at end of file diff --git a/firmware/include/README b/firmware/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/firmware/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/firmware/lib/README b/firmware/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/firmware/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/firmware/platformio.ini b/firmware/platformio.ini new file mode 100644 index 0000000..d453463 --- /dev/null +++ b/firmware/platformio.ini @@ -0,0 +1,14 @@ +; 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:wemos_d1_uno32] +platform = espressif32 +board = wemos_d1_uno32 +framework = arduino \ No newline at end of file diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp new file mode 100644 index 0000000..2f8fcdb --- /dev/null +++ b/firmware/src/main.cpp @@ -0,0 +1,70 @@ +#include +#include +#include + +#define u64 uint64_t +#define timeMillis() std::chrono::duration_cast(std::chrono::system_clock::now().time_since_epoch()).count() +#define min(a, b) ((a) < (b) ? (a) : (b)) + +u64 start_time = 0; + +const int NUM_SENSORS = 2; +int pins[] = {34, 39}; // GPIO34 +int notes[] = {84, 86}; // C6, D6 +int lasts[NUM_SENSORS]; // variable to store the value coming from the sensor +u64 last_hit_times[NUM_SENSORS]; + +int max_sensor = 4096; +int max_threshold = 700; +int active_threshold = 400; // Minimum value to be considered as a hit + +void setup() +{ + // Initialize pin and serial + for (int pin : pins) pinMode(pin, INPUT); + Serial.begin(9600); + Serial.printf("Initialized\r\n"); + + start_time = timeMillis(); +} + +/** + * Called when the sensor value changes + * + * @param id Sensor index + */ +void on_sensor_update(int id, u64 time, int last, int current) +{ + // If the last value is larger than the current value, check timeout + if (last > current && last > active_threshold) { + u64 elapsed = time - last_hit_times[id]; + if (elapsed < 150) { + // If the last hit is too close, ignore this hit + return; + } + + // The last value is a local maximum, + // and we read it as the hit strength of our note. Send midi command to the host. + // /hit + Serial.printf("/hit %d %d\r\n", notes[id], min((last - active_threshold) * 127 / (max_threshold - active_threshold), 127)); + + // Update last hit time + last_hit_times[id] = time; + } +} + +void loop() { + u64 time = timeMillis(); + + // Read sensor value from each pin + for (int i = 0; i < NUM_SENSORS; i++) { + int v = analogRead(pins[i]); + if (v != lasts[i]) { + u64 elapsed = time - start_time; + Serial.printf("Sensor #%d - %" PRIu64 ": %d\r\n", i, elapsed, v); + + on_sensor_update(i, time, lasts[i], v); + } + lasts[i] = v; + } +} \ No newline at end of file diff --git a/models/ringring.py b/models/ringring.py new file mode 100644 index 0000000..d4d142d --- /dev/null +++ b/models/ringring.py @@ -0,0 +1,41 @@ +# A REST-API webhook endpoint for OctoEverywhere to make a noise when a print is done. +import os + +import fastapi +import uvicorn + +import logging +from rich.logging import RichHandler + +FORMAT = "%(message)s" +logging.basicConfig( + level="NOTSET", format=FORMAT, datefmt="[%X]", handlers=[RichHandler()] +) + +log = logging.getLogger("rich") + +# Create HTTP Server +app = fastapi.FastAPI() + + +# Create a webhook endpoint +@app.post('/webhook') +async def webhook(request: fastapi.Request): + # log.info(f"Request: {request}") + # log.info(f"Request Headers: {request.headers}") + # log.info(f"Request Query: {request.query_params}") + + # Get the JSON body + obj = await request.json() + if obj.get('Progress') == 100: + # Make a noise + os.system("say 'Meow Meow Meow! Print Complete, Print Complete, Meow Meow Meow Meow Meow!'") + + log.info(obj) + + return 'OK' + + +if __name__ == '__main__': + # Run the server + uvicorn.run(app, host='0.0.0.0', port=8484) \ No newline at end of file