From e2fdbc026c60c7c7a5ceea4720f21bd7691a6857 Mon Sep 17 00:00:00 2001 From: cvonk Date: Thu, 20 Oct 2016 18:48:11 -0700 Subject: [PATCH] add autobuild cfg, update comments --- .travis.yml | 41 +++++ README.md | 2 +- .../arduino-pitch_detector.ino | 2 +- .../arduino-pitch_detector.sln | 26 +++ arduino-pitch_detector/pitch-detector.vcxproj | 173 ++++++++++++++++++ .../pitch-detector.vcxproj.filters | 146 +++++++++++++++ 6 files changed, 388 insertions(+), 2 deletions(-) create mode 100644 .travis.yml create mode 100644 arduino-pitch_detector/arduino-pitch_detector.sln create mode 100644 arduino-pitch_detector/pitch-detector.vcxproj create mode 100644 arduino-pitch_detector/pitch-detector.vcxproj.filters diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..d35f5ee --- /dev/null +++ b/.travis.yml @@ -0,0 +1,41 @@ +# Copyright (c) Microsoft. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. + +language: generic +env: + global: + - IDE_VERSION=1.6.12 + matrix: + - BOARD="arduino:avr:uno" +before_install: + - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_1.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :1 -ac -screen 0 1280x1024x16 + - sleep 3 + - export DISPLAY=:1.0 + - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz + - tar xf arduino-$IDE_VERSION-linux64.tar.xz + - mv arduino-$IDE_VERSION $HOME/arduino-ide + - export PATH=$PATH:$HOME/arduino-ide + - if [[ "$BOARD" =~ "esp8266:esp8266:" ]]; then + arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --install-boards esp8266:esp8266; + arduino --pref "boardsmanager.additional.urls=" --save-prefs; + arduino --install-library NTPClient; + arduino --install-library NTPClient; + fi + - findAndReplace() { sed -i'' -e"s|$1|$2|g" "$3"; } + - buildExampleSketch() { + EXAMPLE_SKETCH=$PWD/$1/$1.ino; + + if [[ "$BOARD" =~ "esp8266:esp8266:" ]]; then + findAndReplace WiFi101 ESP8266WiFi $EXAMPLE_SKETCH; + findAndReplace WiFiSSLClient WiFiClientSecure $EXAMPLE_SKETCH; + findAndReplace WiFiUdp WiFiUdp $EXAMPLE_SKETCH; + fi + + cat $EXAMPLE_SKETCH; + + arduino --verbose-build --verify --board $BOARD $EXAMPLE_SKETCH; + } +install: + - # ln -s $PWD $HOME/Arduino/libraries/. +script: + - buildExampleSketch simplesample_http \ No newline at end of file diff --git a/README.md b/README.md index 60b9351..4016ca4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# arduino-pitch_detector +# arduino-pitch_detector [![Build Status](https://travis-ci.org/cvonk/arduino-pitch_detector.svg)](https://travis-ci.org/cvonk/arduino-pitch_detector) ## Pitch Detection on Arduino using Autocorrelation While playing my clarinet, I realized that it would be fun to hear other instruments playing alongside me. Instruments like guitar, piano or even a choir. It would also be nice if the melodies could be transcribed on paper. All existing solutions to these problems require a bulky computer or a cell phone. I realized that creating this compact device would combine my interest for music with my passion for engineering and math. diff --git a/arduino-pitch_detector/arduino-pitch_detector.ino b/arduino-pitch_detector/arduino-pitch_detector.ino index 53f5822..f369239 100644 --- a/arduino-pitch_detector/arduino-pitch_detector.ino +++ b/arduino-pitch_detector/arduino-pitch_detector.ino @@ -11,7 +11,7 @@ * * Platform: Arduino UNO R3 using Arduino IDE * Documentation: http://www.coertvonk.com/technology/embedded/arduino-pitch-detector-13252 - * Tested with: Arduino IDE 1.6.12, board package arduino avr 1.6.13, Arduino/Genuino UNO R3 + * Tested with: Arduino IDE 1.6.12, board package arduino avr 1.6.14, Arduino/Genuino UNO R3 * * GNU GENERAL PUBLIC LICENSE Version 3, check the file LICENSE for more information * (c) Copyright 2015-2016, Johan Vonk diff --git a/arduino-pitch_detector/arduino-pitch_detector.sln b/arduino-pitch_detector/arduino-pitch_detector.sln new file mode 100644 index 0000000..743ce9f --- /dev/null +++ b/arduino-pitch_detector/arduino-pitch_detector.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 14 +VisualStudioVersion = 14.0.24720.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arduino-pitch_detector", "pitch-detector.vcxproj", "{2C5C9DC8-0A82-424B-994D-01A616332F55}" +EndProject +Global + GlobalSection(SubversionScc) = preSolution + Svn-Managed = True + Manager = AnkhSVN - Subversion Support for Visual Studio + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2C5C9DC8-0A82-424B-994D-01A616332F55}.Debug|Win32.ActiveCfg = Debug|Win32 + {2C5C9DC8-0A82-424B-994D-01A616332F55}.Debug|Win32.Build.0 = Debug|Win32 + {2C5C9DC8-0A82-424B-994D-01A616332F55}.Release|Win32.ActiveCfg = Release|Win32 + {2C5C9DC8-0A82-424B-994D-01A616332F55}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/arduino-pitch_detector/pitch-detector.vcxproj b/arduino-pitch_detector/pitch-detector.vcxproj new file mode 100644 index 0000000..30f64b3 --- /dev/null +++ b/arduino-pitch_detector/pitch-detector.vcxproj @@ -0,0 +1,173 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {2C5C9DC8-0A82-424B-994D-01A616332F55} + pitchdetector + arduino-pitch_detector + + + + Application + true + v140 + MultiByte + + + Application + false + v140 + true + MultiByte + + + + + + + + + + + + + + + Level3 + Disabled + true + C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SPI\src;C:\Program Files (x86)\Arduino\libraries\SD\src;C:\Users\Coert\Documents\Arduino\libraries\Adafruit_ST7735;C:\Users\Coert\Documents\Arduino\libraries\Adafruit-GFX;C:\Users\Coert\Documents\Arduino\libraries\Adafruit_ST7735\utility;C:\Users\Coert\Documents\Arduino\libraries\Adafruit-GFX\utility;C:\Program Files (x86)\Arduino\libraries\SD\src\utility;C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries\SPI\src\utility;C:\Program Files (x86)\Arduino\libraries;C:\Program Files (x86)\Arduino\hardware\arduino\avr\libraries;C:\Users\Coert\Documents\Arduino\libraries;C:\Program Files (x86)\Arduino\hardware\arduino\avr\cores\arduino;C:\Program Files (x86)\Arduino\hardware\arduino\avr\variants\standard;\\nas.vonk\Coert Vonk\Projects\Inquiries with the boys\Embedded\Arduino Pitch Detector (Johan)\src (github)\arduino-pitch_detector;C:\Program Files (x86)\Arduino\hardware\tools\avr/avr/include/;C:\Program Files (x86)\Arduino\hardware\tools\avr//avr/include/avr/;C:\Program Files (x86)\Arduino\hardware\tools\avr/lib\gcc\avr\4.8.1\include;%(AdditionalIncludeDirectories) + \\nas.vonk\Coert Vonk\Projects\Inquiries with the boys\Embedded\Arduino Pitch Detector (Johan)\src (github)\arduino-pitch_detector\__vm\.arduino-pitch_detector.vsarduino.h;%(ForcedIncludeFiles) + false + __AVR_ATmega328p__;__AVR_ATmega328P__;F_CPU=16000000L;ARDUINO=106012;ARDUINO_AVR_UNO;ARDUINO_ARCH_AVR;__cplusplus=201103L;%(PreprocessorDefinitions) + + + true + + + + + Level3 + MaxSpeed + true + true + true + + + true + true + true + + + + + CppCode + + + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + CppCode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/arduino-pitch_detector/pitch-detector.vcxproj.filters b/arduino-pitch_detector/pitch-detector.vcxproj.filters new file mode 100644 index 0000000..8c2c7f7 --- /dev/null +++ b/arduino-pitch_detector/pitch-detector.vcxproj.filters @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file