1
0
Fork 0

Format code according to conventions (#16322)

This commit is contained in:
QMK Bot 2022-02-12 10:29:31 -08:00 committed by GitHub
parent afcdd7079c
commit 63646e8906
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
345 changed files with 4916 additions and 3229 deletions

View file

@ -25,16 +25,18 @@
#endif
sequencer_config_t sequencer_config = {
false, // enabled
{false}, // steps
{0}, // track notes
60, // tempo
SQ_RES_4, // resolution
false, // enabled
{false}, // steps
{0}, // track notes
60, // tempo
SQ_RES_4, // resolution
};
sequencer_state_t sequencer_internal_state = {0, 0, 0, 0, SEQUENCER_PHASE_ATTACK};
bool is_sequencer_on(void) { return sequencer_config.enabled; }
bool is_sequencer_on(void) {
return sequencer_config.enabled;
}
void sequencer_on(void) {
dprintln("sequencer on");
@ -65,7 +67,9 @@ void sequencer_set_track_notes(const uint16_t track_notes[SEQUENCER_TRACKS]) {
}
}
bool is_sequencer_track_active(uint8_t track) { return (sequencer_internal_state.active_tracks >> track) & true; }
bool is_sequencer_track_active(uint8_t track) {
return (sequencer_internal_state.active_tracks >> track) & true;
}
void sequencer_set_track_activation(uint8_t track, bool value) {
if (value) {
@ -76,7 +80,9 @@ void sequencer_set_track_activation(uint8_t track, bool value) {
dprintf("sequencer: track %d is %s\n", track, value ? "active" : "inactive");
}
void sequencer_toggle_track_activation(uint8_t track) { sequencer_set_track_activation(track, !is_sequencer_track_active(track)); }
void sequencer_toggle_track_activation(uint8_t track) {
sequencer_set_track_activation(track, !is_sequencer_track_active(track));
}
void sequencer_toggle_single_active_track(uint8_t track) {
if (is_sequencer_track_active(track)) {
@ -86,9 +92,13 @@ void sequencer_toggle_single_active_track(uint8_t track) {
}
}
bool is_sequencer_step_on(uint8_t step) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0; }
bool is_sequencer_step_on(uint8_t step) {
return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0;
}
bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true; }
bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) {
return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true;
}
void sequencer_set_step(uint8_t step, bool value) {
if (step < SEQUENCER_STEPS) {
@ -122,7 +132,9 @@ void sequencer_set_all_steps(bool value) {
dprintf("sequencer: all steps are %s\n", value ? "on" : "off");
}
uint8_t sequencer_get_tempo(void) { return sequencer_config.tempo; }
uint8_t sequencer_get_tempo(void) {
return sequencer_config.tempo;
}
void sequencer_set_tempo(uint8_t tempo) {
if (tempo > 0) {
@ -142,9 +154,13 @@ void sequencer_increase_tempo(void) {
}
}
void sequencer_decrease_tempo(void) { sequencer_set_tempo(sequencer_config.tempo - 1); }
void sequencer_decrease_tempo(void) {
sequencer_set_tempo(sequencer_config.tempo - 1);
}
sequencer_resolution_t sequencer_get_resolution(void) { return sequencer_config.resolution; }
sequencer_resolution_t sequencer_get_resolution(void) {
return sequencer_config.resolution;
}
void sequencer_set_resolution(sequencer_resolution_t resolution) {
if (resolution >= 0 && resolution < SEQUENCER_RESOLUTIONS) {
@ -155,11 +171,17 @@ void sequencer_set_resolution(sequencer_resolution_t resolution) {
}
}
void sequencer_increase_resolution(void) { sequencer_set_resolution(sequencer_config.resolution + 1); }
void sequencer_increase_resolution(void) {
sequencer_set_resolution(sequencer_config.resolution + 1);
}
void sequencer_decrease_resolution(void) { sequencer_set_resolution(sequencer_config.resolution - 1); }
void sequencer_decrease_resolution(void) {
sequencer_set_resolution(sequencer_config.resolution - 1);
}
uint8_t sequencer_get_current_step(void) { return sequencer_internal_state.current_step; }
uint8_t sequencer_get_current_step(void) {
return sequencer_internal_state.current_step;
}
void sequencer_phase_attack(void) {
dprintf("sequencer: step %d\n", sequencer_internal_state.current_step);
@ -229,9 +251,13 @@ void sequencer_task(void) {
}
}
uint16_t sequencer_get_beat_duration(void) { return get_beat_duration(sequencer_config.tempo); }
uint16_t sequencer_get_beat_duration(void) {
return get_beat_duration(sequencer_config.tempo);
}
uint16_t sequencer_get_step_duration(void) { return get_step_duration(sequencer_config.tempo, sequencer_config.resolution); }
uint16_t sequencer_get_step_duration(void) {
return get_step_duration(sequencer_config.tempo, sequencer_config.resolution);
}
uint16_t get_beat_duration(uint8_t tempo) {
// Dont crash in the unlikely case where the given tempo is 0

View file

@ -48,7 +48,7 @@ typedef struct {
bool enabled;
uint8_t steps[SEQUENCER_STEPS];
uint16_t track_notes[SEQUENCER_TRACKS];
uint8_t tempo; // Is a maximum tempo of 255 reasonable?
uint8_t tempo; // Is a maximum tempo of 255 reasonable?
sequencer_resolution_t resolution;
} sequencer_config_t;
@ -57,9 +57,9 @@ typedef struct {
* We use a "phase" state machine to delay some of the events.
*/
typedef enum sequencer_phase_t {
SEQUENCER_PHASE_ATTACK, // t=0ms, send the MIDI note on signal
SEQUENCER_PHASE_RELEASE, // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
SEQUENCER_PHASE_PAUSE // t=step duration ms, loop
SEQUENCER_PHASE_ATTACK, // t=0ms, send the MIDI note on signal
SEQUENCER_PHASE_RELEASE, // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
SEQUENCER_PHASE_PAUSE // t=step duration ms, loop
} sequencer_phase_t;
typedef struct {

View file

@ -19,8 +19,14 @@
uint16_t last_noteon = 0;
uint16_t last_noteoff = 0;
uint16_t midi_compute_note(uint16_t keycode) { return keycode; }
uint16_t midi_compute_note(uint16_t keycode) {
return keycode;
}
void process_midi_basic_noteon(uint16_t note) { last_noteon = note; }
void process_midi_basic_noteon(uint16_t note) {
last_noteon = note;
}
void process_midi_basic_noteoff(uint16_t note) { last_noteoff = note; }
void process_midi_basic_noteoff(uint16_t note) {
last_noteoff = note;
}

View file

@ -78,7 +78,9 @@ class SequencerTest : public ::testing::Test {
sequencer_state_t state_copy;
};
TEST_F(SequencerTest, TestOffByDefault) { EXPECT_EQ(is_sequencer_on(), false); }
TEST_F(SequencerTest, TestOffByDefault) {
EXPECT_EQ(is_sequencer_on(), false);
}
TEST_F(SequencerTest, TestOn) {
sequencer_config.enabled = false;