Skip to content

Commit

Permalink
changes in clang format configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
@corrados
corrados committed Jul 17, 2024
1 parent 0d4d070 commit 6faff07
Show file tree
Hide file tree
Showing 10 changed files with 408 additions and 408 deletions.
4 changes: 2 additions & 2 deletions .clang-format
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ BinPackArguments: false
BinPackParameters: false
PenaltyBreakBeforeFirstCallParameter: 0
AllowShortCaseLabelsOnASingleLine: true
AlignConsecutiveAssignments: true
AlignConsecutiveAssignments: Consecutive
AlignConsecutiveDeclarations: Consecutive
SpacesBeforeTrailingComments: 1
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortFunctionsOnASingleLine: All
IndentPPDirectives: AfterHash
AlignAfterOpenBracket: Align
#AllowShortLiteralsOnASingleLine: true
10 changes: 5 additions & 5 deletions common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
#define MAX_NUM_PAD_INPUTS 5 // a maximum of 5 sensors per pad is supported (where one is rim and one is the sum of three)

inline void update_fifo(const float input,
const int fifo_length,
float* fifo_memory)
const int fifo_length,
float* fifo_memory)
{
// move all values in the history one step back and put new value on the top
for (int i = 0; i < fifo_length - 1; i++)
Expand All @@ -37,7 +37,7 @@ inline void update_fifo(const float input,
fifo_memory[fifo_length - 1] = input;
}

inline void allocate_initialize(float** array_memory,
inline void allocate_initialize(float** array_memory,
const int array_length)
{
// (delete and) allocate memory
Expand Down Expand Up @@ -79,6 +79,6 @@ class FastWriteFIFO

protected:
float* fifo_memory = nullptr;
int pointer;
int fifo_length;
int pointer;
int fifo_length;
};
6 changes: 3 additions & 3 deletions edrumulus.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ Edrumulus::Edrumulus()
dc_offset_iir_one_minus_gamma = 1.0f - dc_offset_iir_gamma;
}

void Edrumulus::setup(const int conf_num_pads,
void Edrumulus::setup(const int conf_num_pads,
const int* conf_analog_pins,
const int* conf_analog_pins_rim_shot)
{
Expand Down Expand Up @@ -437,8 +437,8 @@ void Edrumulus::set_coupled_pad_idx(const int pad_idx, const int new_idx)
}
}

void Edrumulus::cancel_ADC_spikes(float& signal,
int& overload_detected,
void Edrumulus::cancel_ADC_spikes(float& signal,
int& overload_detected,
const int pad_index,
const int input_channel_index,
const int level)
Expand Down
204 changes: 102 additions & 102 deletions edrumulus.h
View file

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions edrumulus.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ Edrumulus edrumulus;
const int midi_channel = 10; // default for edrums is 10
const int hihat_pad_idx = 2; // this definition should not be changed
const int hihatctrl_pad_idx = 3; // this definition should not be changed
int number_pads = number_pads4; // initialization value, may be overwritten by get_prototype_pins()
int status_LED_pin = 0; // initialization value, will be set in get_prototype_pins()
bool is_status_LED_on = false; // initialization value
int selected_pad = 0; // initialization value
int number_pads = number_pads4; // initialization value, may be overwritten by get_prototype_pins()
int status_LED_pin = 0; // initialization value, will be set in get_prototype_pins()
bool is_status_LED_on = false; // initialization value
int selected_pad = 0; // initialization value

void setup()
{
// get the pin-to-pad assignments
int* analog_pins = analog_pins4; // initialize with the default setup
int* analog_pins_rimshot = analog_pins_rimshot4; // initialize with the default setup
const int prototype = Edrumulus_hardware::get_prototype_pins(&analog_pins,
int* analog_pins = analog_pins4; // initialize with the default setup
int* analog_pins_rimshot = analog_pins_rimshot4; // initialize with the default setup
const int prototype = Edrumulus_hardware::get_prototype_pins(&analog_pins,
&analog_pins_rimshot,
&number_pads,
&status_LED_pin);
Expand Down Expand Up @@ -186,7 +186,7 @@ void loop()
{
// get current MIDI note and velocity (maybe note will be overwritten later on)
const int midi_velocity = edrumulus.get_midi_velocity(pad_idx);
int midi_note = edrumulus.get_midi_note(pad_idx);
int midi_note = edrumulus.get_midi_note(pad_idx);

// send midi positional control message if positional sensing is enabled for the current pad
if (edrumulus.get_pos_sense_is_used(pad_idx))
Expand All @@ -198,9 +198,9 @@ void loop()
// send Hi-Hat control message right before each Hi-Hat pad hit
if (pad_idx == hihat_pad_idx)
{
const int midi_ctrl_ch = edrumulus.get_midi_ctrl_ch(hihatctrl_pad_idx);
const int midi_ctrl_value = edrumulus.get_midi_ctrl_value(hihatctrl_pad_idx);
const bool hi_hat_is_open = edrumulus.get_midi_ctrl_is_open(hihatctrl_pad_idx);
const int midi_ctrl_ch = edrumulus.get_midi_ctrl_ch(hihatctrl_pad_idx);
const int midi_ctrl_value = edrumulus.get_midi_ctrl_value(hihatctrl_pad_idx);
const bool hi_hat_is_open = edrumulus.get_midi_ctrl_is_open(hihatctrl_pad_idx);
MYMIDI.sendControlChange(midi_ctrl_ch, midi_ctrl_value, midi_channel);

// if Hi-Hat is open, overwrite MIDI note
Expand Down Expand Up @@ -461,8 +461,8 @@ void loop()

#ifdef USE_MIDI
// give feedback to the controller GUI via MIDI Note Off
void confirm_setting(const int controller,
const int value,
void confirm_setting(const int controller,
const int value,
const bool send_all)
{
if (send_all)
Expand Down
30 changes: 15 additions & 15 deletions hardware.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ Edrumulus_hardware::Edrumulus_hardware()

int Edrumulus_hardware::get_prototype_pins(int** analog_pins,
int** analog_pins_rimshot,
int* number_pins,
int* status_LED_pin)
int* number_pins,
int* status_LED_pin)
{
// clang-format off
// analog pins setup: snare | kick | hi-hat | hi-hat-ctrl | crash | tom1 | ride | tom2 | tom3
Expand All @@ -50,7 +50,7 @@ int Edrumulus_hardware::get_prototype_pins(int** analog_pins,
void Edrumulus_hardware::setup(const int conf_Fs,
const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS])
int analog_pin[][MAX_NUM_PAD_INPUTS])
{
// set essential parameters
Fs = conf_Fs;
Expand Down Expand Up @@ -96,8 +96,8 @@ void Edrumulus_hardware::setup(const int conf_Fs,
myTimer.begin(on_timer, 1000000 / Fs); // here we define the sampling rate (1 MHz / Fs)
}

void Edrumulus_hardware::write_setting(const int pad_index,
const int address,
void Edrumulus_hardware::write_setting(const int pad_index,
const int address,
const byte value)
{
EEPROM.update(pad_index * MAX_NUM_SET_PER_PAD + address, value);
Expand All @@ -117,8 +117,8 @@ void Edrumulus_hardware::on_timer()

void Edrumulus_hardware::capture_samples(const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS])
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS])
{
// wait for the timer to get the correct sampling rate when reading the analog value
while (!timer_ready) delayMicroseconds(5);
Expand Down Expand Up @@ -151,8 +151,8 @@ void Edrumulus_hardware::capture_samples(const int number_pads,

int Edrumulus_hardware::get_prototype_pins(int** analog_pins,
int** analog_pins_rimshot,
int* number_pins,
int* status_LED_pin)
int* number_pins,
int* status_LED_pin)
{
# ifdef CONFIG_IDF_TARGET_ESP32
// Definition:
Expand Down Expand Up @@ -226,15 +226,15 @@ int Edrumulus_hardware::get_prototype_pins(int** analog_pins,
void Edrumulus_hardware::setup(const int conf_Fs,
const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS])
int analog_pin[][MAX_NUM_PAD_INPUTS])
{
// set essential parameters
Fs = conf_Fs;
eeprom_settings.begin((number_pads + 1) * MAX_NUM_SET_PER_PAD); // "+ 1" for pad-independent global settings

// create linear vectors containing the pin/ADC information for each pad and pad-input
bool input_is_used[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int input_adc[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int input_adc[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
total_number_inputs = 0; // we use it as a counter, too

for (int i = 0; i < number_pads; i++)
Expand Down Expand Up @@ -370,8 +370,8 @@ void IRAM_ATTR Edrumulus_hardware::on_timer()

void Edrumulus_hardware::capture_samples(const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS])
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS])
{
// wait for the timer to get the correct sampling rate when reading the analog value
if (xSemaphoreTake(timer_semaphore, portMAX_DELAY) == pdTRUE)
Expand Down Expand Up @@ -503,8 +503,8 @@ uint16_t Edrumulus_hardware::my_analogRead(const uint8_t pin)

void Edrumulus_hardware::my_analogRead_parallel(const uint32_t channel_adc1_bitval,
const uint32_t channel_adc2_bitval,
uint16_t& out_adc1,
uint16_t& out_adc2)
uint16_t& out_adc1,
uint16_t& out_adc2)
{
# ifdef CONFIG_IDF_TARGET_ESP32
// start ADC1
Expand Down
62 changes: 31 additions & 31 deletions hardware.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,31 +42,31 @@ class Edrumulus_hardware

static int get_prototype_pins(int** analog_pins,
int** analog_pins_rimshot,
int* number_pins,
int* status_LED_pin);
int* number_pins,
int* status_LED_pin);

void setup(const int conf_Fs,
const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS]);
int analog_pin[][MAX_NUM_PAD_INPUTS]);

void capture_samples(const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS]);
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS]);

void write_setting(const int pad_index, const int address, const byte value);
byte read_setting(const int pad_index, const int address);

protected:
int Fs;
int Fs;
IntervalTimer myTimer;
static void on_timer();
static void on_timer();
volatile bool timer_ready;
ADC adc_obj;
ADC adc_obj;

int total_number_inputs;
int input_pin[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int total_number_inputs;
int input_pin[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
uint16_t input_sample[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
};

Expand Down Expand Up @@ -96,45 +96,45 @@ class Edrumulus_hardware

static int get_prototype_pins(int** analog_pins,
int** analog_pins_rimshot,
int* number_pins,
int* status_LED_pin);
int* number_pins,
int* status_LED_pin);

void setup(const int conf_Fs,
const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS]);
int analog_pin[][MAX_NUM_PAD_INPUTS]);

void capture_samples(const int number_pads,
const int number_inputs[],
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS]);
int analog_pin[][MAX_NUM_PAD_INPUTS],
int sample_org[][MAX_NUM_PAD_INPUTS]);

void write_setting(const int, const int, const byte){}; // not supported
byte read_setting(const int, const int) { return 0; }; // not supported

protected:
int Fs;
EEPROMClass eeprom_settings;
int Fs;
EEPROMClass eeprom_settings;
volatile SemaphoreHandle_t timer_semaphore;
hw_timer_t* timer = nullptr;
static void IRAM_ATTR on_timer();
static void start_timer_core0_task(void* param);
hw_timer_t* timer = nullptr;
static void IRAM_ATTR on_timer();
static void start_timer_core0_task(void* param);

void setup_timer();
void init_my_analogRead();
void setup_timer();
void init_my_analogRead();
uint16_t my_analogRead(const uint8_t pin);
void my_analogRead_parallel(const uint32_t channel_adc1_bitval,
const uint32_t channel_adc2_bitval,
uint16_t& out_adc1,
uint16_t& out_adc2);
void my_analogRead_parallel(const uint32_t channel_adc1_bitval,
const uint32_t channel_adc2_bitval,
uint16_t& out_adc1,
uint16_t& out_adc2);

int total_number_inputs;
int input_pin[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int total_number_inputs;
int input_pin[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
uint16_t input_sample[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];

int num_pin_pairs;
int adc1_index[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int adc2_index[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int num_pin_pairs;
int adc1_index[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
int adc2_index[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
uint32_t channel_adc1_bitval[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];
uint32_t channel_adc2_bitval[MAX_NUM_PADS * MAX_NUM_PAD_INPUTS];

Expand Down
Loading

0 comments on commit 6faff07

Please sign in to comment.