Cons-n-Stuff/Taiko-Drum-Controller-Arduino
1
0
Fork 1
mirror of https://github.com/ShikyC/Taiko-Drum-Controller-Arduino.git synced 2024-11-23 22:10:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

DMA attempt

Browse Source
This commit is contained in:
ShikyC 2024-06-01 10:09:55 -07:00
parent 07cea8839d
commit 57eb1974fa
1 changed files with 67 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
ESP32-S3-Analog/two_players.h
View File

@ -1,4 +1,5 @@
#include "driver/i2s.h"
#include "driver/adc.h"
// #include "driver/i2s.h"
#include "freertos/FreeRTOS.h"
#include "params.h"
@ -13,28 +14,80 @@
#define P2_R_DON_SENS 1.0
#define P2_R_KAT_SENS 1.0
const byte players = 2;
#define PLAYERS 2
#define BUF_LENGH 1024
#define CONV_NUM BUF_LENGH * PLAYERS / CHANNELS
const byte inPins[players][CHANNELS] = {
#define TIMES 256
#define GET_UNIT(x) ((x>>3) & 0x1)
const byte inPins[PLAYERS][CHANNELS] = {
P1_L_DON_IN, P1_L_KAT_IN, P1_R_DON_IN, P1_R_KAT_IN,
P2_L_DON_IN, P2_L_KAT_IN, P2_R_DON_IN, P2_R_KAT_IN
};
const float sensitivities[players][CHANNELS] = {
const float sensitivities[PLAYERS][CHANNELS] = {
P1_L_DON_SENS, P1_L_KAT_SENS, P1_R_DON_SENS, P1_R_KAT_SENS,
P2_L_DON_SENS, P2_L_KAT_SENS, P2_R_DON_SENS, P2_R_KAT_SENS};
Cache<int, SAMPLE_CACHE_LENGTH> inputWindow[players][CHANNELS];
unsigned long power[players][CHANNELS];
Cache<int, SAMPLE_CACHE_LENGTH> inputWindow[PLAYERS][CHANNELS];
unsigned long power[PLAYERS][CHANNELS];
uint axisValues[players][CHANNELS] = {0, 0, 0, 0, 0, 0, 0, 0};
uint axisValues[PLAYERS][CHANNELS] = {0, 0, 0, 0, 0, 0, 0, 0};
Joystick_ Joystick(JOYSTICK_DEFAULT_REPORT_ID, JOYSTICK_TYPE_GAMEPAD, 10, 4,
true, true, false, true, true, false, false, false, false,
false, false);
uint maxVal[players] = {0, 0};
uint maxIndex[players] = {-1, -1};
uint maxVal[PLAYERS] = {0, 0};
uint maxIndex[PLAYERS] = {-1, -1};
adc_channel_t adcChannles[PLAYERS][CHANNELS] = {
ADC_CHANNEL_3,
ADC_CHANNEL_4,
ADC_CHANNEL_5,
ADC_CHANNEL_6,
ADC_CHANNEL_7,
ADC_CHANNEL_0,
ADC_CHANNEL_8,
ADC_CHANNEL_9
};
static void adc_init(adc_channel_t *channel, uint8_t channel_num)
{
adc_digi_init_config_t adc_dma_config = {
.max_store_buf_size = BUF_LENGH,
.conv_num_each_intr = CONV_NUM,
.adc1_chan_mask = BIT3 | BIT4 | BIT5 | BIT6 | BIT7 | BIT0 | BIT8 | BIT9,
.adc2_chan_mask = 0
};
ESP_ERROR_CHECK(adc_digi_initialize(&adc_dma_config));
adc_digi_configuration_t dig_cfg = {
.conv_limit_en = 1,
.conv_limit_num = 4,
.sample_freq_hz = 2 * 1000,
.conv_mode = ADC_CONV_SINGLE_UNIT_1,
.format = ADC_DIGI_OUTPUT_FORMAT_TYPE1,
};
adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
dig_cfg.pattern_num = channel_num;
for (int i = 0; i < channel_num; i++) {
uint8_t unit = GET_UNIT(channel[i]);
uint8_t ch = channel[i] & 0x7;
adc_pattern[i].atten = ADC_ATTEN_DB_11;
adc_pattern[i].channel = ch;
adc_pattern[i].unit = unit;
adc_pattern[i].bit_width = SOC_ADC_DIGI_MAX_BITWIDTH;
ESP_LOGI(TAG, "adc_pattern[%d].atten is :%x", i, adc_pattern[i].atten);
ESP_LOGI(TAG, "adc_pattern[%d].channel is :%x", i, adc_pattern[i].channel);
ESP_LOGI(TAG, "adc_pattern[%d].unit is :%x", i, adc_pattern[i].unit);
}
dig_cfg.adc_pattern = adc_pattern;
ESP_ERROR_CHECK(adc_digi_controller_configure(&dig_cfg));
}
void setP1Axes(int index, int value) {
switch (index) {
@ -85,7 +138,7 @@ void setP2Axes(int index, int value) {
}
void setup() {
for (byte p = 0; p < players; p++) {
for (byte p = 0; p < PLAYERS; p++) {
for (byte i = 0; i < CHANNELS; i++) {
power[p][i] = 0;
pinMode(inPins[p][i], INPUT);
@ -101,16 +154,18 @@ void setup() {
Joystick.setYAxisRange(-AXIS_RANGE, AXIS_RANGE);
Joystick.setRxAxisRange(-AXIS_RANGE, AXIS_RANGE);
Joystick.setRyAxisRange(-AXIS_RANGE, AXIS_RANGE);
}
void loop() {
for (byte p = 0; p < players; p++) {
for (byte p = 0; p < PLAYERS; p++) {
for (byte i = 0; i < CHANNELS; i++) {
inputWindow[p][i].put(analogRead(inPins[p][i]));
}
}
for (byte p = 0; p < players; p++) {
for (byte p = 0; p < PLAYERS; p++) {
maxVal[p] = 0;
maxIndex[p] = -1;