AkaiiKitsune/Taiko-Nijiiro-Analog-IOBoard
1
0
Fork 0
forked from Cons-n-Stuff/Taiko-Drum-Controller-Arduino
Code Pull Requests Activity

minor bug fix

Browse Source
This commit is contained in:
ShikyC 2016-03-28 00:29:10 +08:00
parent d54ed2a83a
commit 7f02ebbeae
2 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sanro/cache.h
View File

@ -32,8 +32,8 @@ Cache <T, L>::Cache () {
template <class T, int L> template <class T, int L>
void Cache <T, L>::put (T value) { void Cache <T, L>::put (T value) {
data_ [current_] = value;
current_ = (current_ + 1) % L; current_ = (current_ + 1) % L;
data_ [current_] = value;
} }
template <class T, int L> template <class T, int L>

41
sanro/sanro.ino
View File

@ -3,25 +3,26 @@
* Taiko Sanro - Arduino * * Taiko Sanro - Arduino *
* Support Arduino models with ATmega32u4 microprocessors * * Support Arduino models with ATmega32u4 microprocessors *
* * * *
* Shiky Chang * * Shiky Chang Chris *
* zhangxunpx@gmail.com * * zhangxunpx@gmail.com wisaly@gmail.com *
* * * *
***************************************************************/ ***************************************************************/
#define MODE_JIRO 1 #define MODE_JIRO 1
#define MODE_DEBUG 1 #define MODE_DEBUG 1
#define MODE_DEBUG_SHOW_TIME 0
#define CHANNELS 4 #define CHANNELS 4
#define SAMPLE_CACHE_LENGTH 50 #define SAMPLE_CACHE_LENGTH 15
#define POWER_CACHE_LENGTH 3 #define POWER_CACHE_LENGTH 3
#define LIGHT_THRES 0 #define LIGHT_THRES 500
#define HEAVY_THRES 70000 #define HEAVY_THRES 1000
#include <limits.h>
#include <Keyboard.h> #include <Keyboard.h>
#include "cache.h" #include "cache.h"
#include "limits.h"
#if MODE_JIRO #if MODE_JIRO
#define HEAVY_THRES LONG_MAX #define HEAVY_THRES LONG_MAX
@ -36,9 +37,9 @@ Cache <long int, POWER_CACHE_LENGTH> powerCache [CHANNELS];
bool triggered [CHANNELS]; bool triggered [CHANNELS];
int pins[] = { A0, A1, A2, A3 }; // L don, R don, L kat, R kat int pins[] = {A0, A1, A2, A3}; // L don, R don, L kat, R kat
char lightKeys[] = { 'g', 'h', 'f', 'j' }; char lightKeys[] = {'g', 'h', 'f', 'j'};
char heavyKeys[] = { 't', 'y', 'r', 'u' }; char heavyKeys[] = {'t', 'y', 'r', 'u'};
void setup() { void setup() {
Serial.begin (9600); Serial.begin (9600);
@ -100,10 +101,14 @@ void loop() {
if (isDescending) { if (isDescending) {
if (power [i] >= HEAVY_THRES) { if (power [i] >= HEAVY_THRES) {
triggered [i] = true; triggered [i] = true;
#if !MODE_DEBUG
Keyboard.print (heavyKeys [i]); Keyboard.print (heavyKeys [i]);
#endif
} else if (power [i] >= LIGHT_THRES) { } else if (power [i] >= LIGHT_THRES) {
triggered [i] = true; triggered [i] = true;
#if !MODE_DEBUG
Keyboard.print (lightKeys [i]); Keyboard.print (lightKeys [i]);
#endif
} }
#if MODE_DEBUG #if MODE_DEBUG
@ -120,11 +125,19 @@ void loop() {
} }
#if MODE_DEBUG #if MODE_DEBUG
Serial.print(sampleLastTime); // Damn Arduino plotter, the Y axis scale changes much
Serial.print('\t'); // too frequently! Use these 5000 and 0 values to "lock"
Serial.print(calcLastTime); // the plotter.
Serial.print (5000);
Serial.print ("\t");
Serial.print (0);
Serial.print ("\t");
#if MODE_DEBUG_SHOW_TIME
Serial.print (sampleLastTime);
Serial.print ('\t');
Serial.print (calcLastTime);
#endif
Serial.println (""); Serial.println ("");
#endif #endif
} }