azalea/open-keyprec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[+] S3 test

Browse Source
This commit is contained in:
Hykilpikonna
2023-04-11 14:16:02 -04:00
parent 103cd75096
commit af86289acd
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
firmware/platformio.ini
+9 -4
View File
@@ -13,16 +13,21 @@
;board = wemos_d1_uno32 ;board = wemos_d1_uno32
;framework = arduino ;framework = arduino
[env:s2] ;[env:s2]
platform = espressif32 ;platform = espressif32
board = lolin_s2_mini ;board = lolin_s2_mini
framework = arduino ;framework = arduino
;[env:c3] ;[env:c3]
;platform = espressif32 ;platform = espressif32
;board = dfrobot_beetle_esp32c3 ;board = dfrobot_beetle_esp32c3
;framework = arduino ;framework = arduino
[env:s3]
platform = espressif32
board = esp32-s3-devkitc-1
framework = arduino
;[env:n328p] ;[env:n328p]
;platform = atmelavr ;platform = atmelavr
;board = nanoatmega328 ;board = nanoatmega328
firmware/src/main.cpp
+13 -12
View File
@@ -1,7 +1,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <chrono> #include <chrono>
#include <cinttypes> #include <cinttypes>
//#include <driver/adc.h> #include <driver/adc.h>
#define u8 uint8_t #define u8 uint8_t
#define u16 uint16_t #define u16 uint16_t
@@ -32,15 +32,15 @@ const Note notes[] = {
}; };
// LED pins // LED pins
val PIN_LED = 8; val PIN_LED = 37;
let led_state = true; let led_state = true;
// 5 Multiplexers: GPIO pins for each analog multiplexer that handles 12 sensors (1 octave) // 5 Multiplexers: GPIO pins for each analog multiplexer that handles 12 sensors (1 octave)
// Notes are connected in order: Mux #1 (0-11), Mux #2 (12-23), Mux #3 (24-35), Mux #4 (36-47), Mux #5 (48-59) // Notes are connected in order: Mux #1 (0-11), Mux #2 (12-23), Mux #3 (24-35), Mux #4 (36-47), Mux #5 (48-59)
val NUM_MUX = 5; val NUM_MUX = 5;
val PINS_PER_MUX = 12; val PINS_PER_MUX = 12;
//const adc1_channel_t mux_in[] = {ADC1_CHANNEL_0, ADC1_CHANNEL_1, ADC1_CHANNEL_2, ADC1_CHANNEL_3, ADC1_CHANNEL_4}; const adc1_channel_t mux_in[] = {ADC1_CHANNEL_1, ADC1_CHANNEL_2, ADC1_CHANNEL_3, ADC1_CHANNEL_4, ADC1_CHANNEL_5};
const int mux_in[] = {A0, A1, A2, A3, A4}; //const int mux_in[] = {A0, A1, A2, A3, A4};
// Select pins for every multiplexer, each multiplexer has 4 select pins, all sel0 are connected to 14, etc. // Select pins for every multiplexer, each multiplexer has 4 select pins, all sel0 are connected to 14, etc.
val NUM_MUX_SEL = 4; val NUM_MUX_SEL = 4;
@@ -64,12 +64,12 @@ void setup()
// Initialize pin and serial // Initialize pin and serial
for (int pin: mux_in) pinMode(pin, INPUT); for (int pin: mux_in) pinMode(pin, INPUT);
// adc1_config_width(ADC_WIDTH_MAX); adc1_config_width(ADC_WIDTH_MAX);
// for (val pin : mux_in) { for (val pin : mux_in) {
//// adcAttachPin(pin); adcAttachPin(pin);
// adc1_config_channel_atten(pin, ADC_ATTEN_DB_11); adc1_config_channel_atten(pin, ADC_ATTEN_DB_11);
// } }
for (val pin: mux_sel) pinMode(pin, OUTPUT); // for (val pin: mux_sel) pinMode(pin, OUTPUT);
Serial.begin(9600); Serial.begin(9600);
Serial.println("Initialized"); Serial.println("Initialized");
@@ -96,7 +96,7 @@ void on_sensor_update(int id, u64 time, int last, int current)
// The last value is a local maximum, // The last value is a local maximum,
// and we read it as the hit strength of our note. Send midi command to the host. // and we read it as the hit strength of our note. Send midi command to the host.
// /hit <note> <velocity> // /hit <note> <velocity>
printf("/hit %d %d\r\n", notes[id].midi, Serial.printf("/hit %d %d\r\n", notes[id].midi,
min((last - active_threshold) * 127 / (max_threshold - active_threshold), 127)); min((last - active_threshold) * 127 / (max_threshold - active_threshold), 127));
// Update last hit time // Update last hit time
@@ -127,12 +127,13 @@ void loop()
// Toggle LED // Toggle LED
led_state = !led_state; led_state = !led_state;
digitalWrite(PIN_LED, led_state); digitalWrite(PIN_LED, led_state);
delay(100);
// // Loop through each multiplexer input // // Loop through each multiplexer input
for (val mux : mux_in) for (val mux : mux_in)
{ {
val v = read_sensor(mux); val v = read_sensor(mux);
printf("%d ", v); Serial.printf("%d ", v);
} }
Serial.println(); Serial.println();
src/main.rs
+1 -1
View File
@@ -10,7 +10,7 @@ fn start() -> Result<()> {
let midi_out = MidiOutput::new("MIDI Output")?; let midi_out = MidiOutput::new("MIDI Output")?;
let mut conn_out = midi_out.create_virtual("Virtual MIDI Output").unwrap(); let mut conn_out = midi_out.create_virtual("Virtual MIDI Output").unwrap();
let serial_port = serialport::new("/dev/cu.usbmodem14101", 9600) let serial_port = serialport::new("/dev/cu.usbmodem14501", 9600)
.timeout(std::time::Duration::from_millis(10)) .timeout(std::time::Duration::from_millis(10))
.open()?; .open()?;
let mut reader = BufReader::new(serial_port); let mut reader = BufReader::new(serial_port);