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

refactor cache

Browse Source
This commit is contained in:
Ma Qiming 2016-03-24 22:17:49 +08:00
parent 3b2ade41d7
commit 621b0b1c1f
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
sanro/sanro.ino
View File

@ -22,15 +22,14 @@
#define HEAVY_THRES 5000000 #define HEAVY_THRES 5000000
#include <Keyboard.h> #include <Keyboard.h>
#include "cache.h"
int channelSample [CHANNELS]; int channelSample [CHANNELS];
int lastChannelSample [CHANNELS]; int lastChannelSample [CHANNELS];
int sampleCache [CHANNELS][SAMPLE_CACHE_LENGTH]; Cache<int,SAMPLE_CACHE_LENGTH> sampleCache [CHANNELS];
short int sampleCacheIndex [CHANNELS];
long int power [CHANNELS]; long int power [CHANNELS];
long int powerCache [CHANNELS][POWER_CACHE_LENGTH]; Cache<long int,POWER_CACHE_LENGTH> powerCache [CHANNELS];
short int powerCacheIndex [CHANNELS];
bool triggered [CHANNELS]; bool triggered [CHANNELS];
@ -39,14 +38,6 @@ void setup() {
Keyboard.begin (); Keyboard.begin ();
analogReference (DEFAULT); analogReference (DEFAULT);
for (short int i = 0; i < CHANNELS; i++) { for (short int i = 0; i < CHANNELS; i++) {
for (short int j = 0; j < SAMPLE_CACHE_LENGTH; j++) {
sampleCache [i][j] = 0;
}
sampleCacheIndex [i] = SAMPLE_CACHE_LENGTH - 1;
for (short int j = 0; j < POWER_CACHE_LENGTH; j++) {
powerCache [i][j] = 0;
}
powerCacheIndex [i] = POWER_CACHE_LENGTH - 1;
power [i] = 0; power [i] = 0;
lastChannelSample [i] = 0; lastChannelSample [i] = 0;
triggered [i] = false; triggered [i] = false;
@ -63,28 +54,25 @@ void loop() {
for (short int i = 0; i < CHANNELS; i++) { for (short int i = 0; i < CHANNELS; i++) {
sampleCacheIndex [i] = (sampleCacheIndex [i] + 1) % SAMPLE_CACHE_LENGTH; sampleCache [i].put(channelSample [i] - lastChannelSample [i]);
sampleCache [i][sampleCacheIndex [i]] = channelSample [i] - lastChannelSample [i];
long int tempInt; long int tempInt;
tempInt = sampleCache [i][(sampleCacheIndex [i] + 1) % SAMPLE_CACHE_LENGTH]; tempInt = sampleCache [i].get(1);
power [i] -= tempInt * tempInt; power [i] -= tempInt * tempInt;
tempInt = sampleCache [i][sampleCacheIndex [i]]; tempInt = sampleCache [i].get();
power [i] += tempInt * tempInt; power [i] += tempInt * tempInt;
if (power [i] < LIGHT_THRES) { if (power [i] < LIGHT_THRES) {
power [i] = 0; power [i] = 0;
} }
powerCacheIndex [i] = (powerCacheIndex [i] + 1 ) % POWER_CACHE_LENGTH; powerCache [i].put(power [i]);
powerCache [i][powerCacheIndex [i]] = power [i];
lastChannelSample [i] = channelSample [i]; lastChannelSample [i] = channelSample [i];
for (short int j = 0; j < POWER_CACHE_LENGTH - 1; j++){ for (short int j = 0; j < POWER_CACHE_LENGTH - 1; j++){
if (!triggered) { if (!triggered) {
if (powerCache [i][(powerCacheIndex [i] + j + 1) % POWER_CACHE_LENGTH] > powerCache [i][(powerCacheIndex [i] + j) % POWER_CACHE_LENGTH] || j != POWER_CACHE_LENGTH - 2) { if (powerCache [i].get(j + 1) > powerCache [i].get(j) || j != POWER_CACHE_LENGTH - 2) {
break; break;
} else { } else {
#if MODE_JIRO #if MODE_JIRO