diff --git a/touchcontroller/.gitignore b/touchcontroller/.gitignore new file mode 100644 index 0000000..03f4a3c --- /dev/null +++ b/touchcontroller/.gitignore @@ -0,0 +1 @@ +.pio diff --git a/touchcontroller/.travis.yml b/touchcontroller/.travis.yml new file mode 100644 index 0000000..7c486f1 --- /dev/null +++ b/touchcontroller/.travis.yml @@ -0,0 +1,67 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# +# +# Please choose one of the following templates (proposed below) and uncomment +# it (remove "# " before each line) or use own configuration according to the +# Travis CI documentation (see above). +# + + +# +# Template #1: General project. Test it using existing `platformio.ini`. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio run + + +# +# Template #2: The project is intended to be used as a library with examples. +# + +# language: python +# python: +# - "2.7" +# +# sudo: false +# cache: +# directories: +# - "~/.platformio" +# +# env: +# - PLATFORMIO_CI_SRC=path/to/test/file.c +# - PLATFORMIO_CI_SRC=examples/file.ino +# - PLATFORMIO_CI_SRC=path/to/test/directory +# +# install: +# - pip install -U platformio +# - platformio update +# +# script: +# - platformio ci --lib="." --board=ID_1 --board=ID_2 --board=ID_N diff --git a/touchcontroller/.vscode/c_cpp_properties.json b/touchcontroller/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..eeb4ce2 --- /dev/null +++ b/touchcontroller/.vscode/c_cpp_properties.json @@ -0,0 +1,57 @@ +{ + "configurations": [ + { + "name": "!!! WARNING !!! AUTO-GENERATED FILE, PLEASE DO NOT MODIFY IT AND USE https://docs.platformio.org/page/projectconf/section_env_build.html#build-flags" + }, + { + "name": "Linux", + "includePath": [ + "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/include", + "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/cores/arduino", + "/home/fisch/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/HID/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/SPI/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/Wire/src", + "/home/fisch/.platformio/packages/tool-unity", + "" + ], + "browse": { + "limitSymbolsToIncludedHeaders": true, + "path": [ + "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/include", + "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/cores/arduino", + "/home/fisch/.platformio/packages/framework-arduino-avr/variants/eightanaloginputs", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/EEPROM/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/HID/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/SPI/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/SoftwareSerial/src", + "/home/fisch/.platformio/packages/framework-arduino-avr/libraries/Wire/src", + "/home/fisch/.platformio/packages/tool-unity", + "" + ] + }, + "defines": [ + "PLATFORMIO=40201", + "ARDUINO_AVR_PRO", + "F_CPU=16000000L", + "ARDUINO_ARCH_AVR", + "ARDUINO=10808", + "__AVR_ATmega328P__", + "" + ], + "intelliSenseMode": "clang-x64", + "cStandard": "c11", + "cppStandard": "c++11", + "compilerPath": "/home/fisch/.platformio/packages/toolchain-atmelavr/bin/avr-gcc", + "compilerArgs": [ + "-mmcu=atmega328p", + "" + ] + } + ], + "version": 4 +} diff --git a/touchcontroller/.vscode/extensions.json b/touchcontroller/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/touchcontroller/.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/touchcontroller/.vscode/launch.json b/touchcontroller/.vscode/launch.json new file mode 100644 index 0000000..adaf4ef --- /dev/null +++ b/touchcontroller/.vscode/launch.json @@ -0,0 +1,32 @@ +// AUTOMATICALLY GENERATED FILE. PLEASE DO NOT MODIFY IT MANUALLY + +// PIO Unified Debugger +// +// Documentation: https://docs.platformio.org/page/plus/debugging.html +// Configuration: https://docs.platformio.org/page/projectconf/section_env_debug.html + +{ + "version": "0.2.0", + "configurations": [ + { + "type": "platformio-debug", + "request": "launch", + "name": "PIO Debug", + "executable": "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/.pio/build/pro16MHzatmega328/firmware.elf", + "toolchainBinDir": "/home/fisch/.platformio/packages/toolchain-atmelavr/bin", + "preLaunchTask": { + "type": "PlatformIO", + "task": "Pre-Debug" + }, + "internalConsoleOptions": "openOnSessionStart" + }, + { + "type": "platformio-debug", + "request": "launch", + "name": "PIO Debug (skip Pre-Debug)", + "executable": "/media/fisch/HDD/Projects/ctdo/bananenkeyboard/touchcontroller/.pio/build/pro16MHzatmega328/firmware.elf", + "toolchainBinDir": "/home/fisch/.platformio/packages/toolchain-atmelavr/bin", + "internalConsoleOptions": "openOnSessionStart" + } + ] +} \ No newline at end of file diff --git a/touchcontroller/include/README b/touchcontroller/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/touchcontroller/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/touchcontroller/lib/README b/touchcontroller/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/touchcontroller/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/touchcontroller/platformio.ini b/touchcontroller/platformio.ini new file mode 100644 index 0000000..cff5121 --- /dev/null +++ b/touchcontroller/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:pro16MHzatmega328] +platform = atmelavr +board = pro16MHzatmega328 +framework = arduino + +monitor_speed = 115200 diff --git a/touchcontroller/touchcontroller.ino b/touchcontroller/src/main.cpp similarity index 86% rename from touchcontroller/touchcontroller.ino rename to touchcontroller/src/main.cpp index f98930e..b4f37c6 100644 --- a/touchcontroller/touchcontroller.ino +++ b/touchcontroller/src/main.cpp @@ -1,10 +1,11 @@ +#include "Arduino.h" #define INPUTS 8 byte touchOut=0; //binary encoded sensors uint16_t rawIn[INPUTS]; uint16_t countedLow[INPUTS]; //count the times input was below threshold (touched) -#define TOUCHTHRESHOLD 300 //below which value input counts as touched +#define TOUCHTHRESHOLD 700 //below which value input counts as touched. 0