diff --git a/clock.h b/clock.h index 87a2b76..00bd213 100644 --- a/clock.h +++ b/clock.h @@ -13,9 +13,9 @@ #define CLOCK_H #include -#include "uClock.h" #include "peripherials.h" +#include "uClock.h" // MIDI clock, start, stop, and continue byte definitions - based on MIDI 1.0 Standards. #define MIDI_CLOCK 0xF8 diff --git a/examples/Gravity/channel.h b/examples/Gravity/channel.h index 5578d42..9acbb70 100644 --- a/examples/Gravity/channel.h +++ b/examples/Gravity/channel.h @@ -3,6 +3,7 @@ #include #include + #include "euclidean.h" // Enums for CV configuration @@ -66,7 +67,7 @@ class Channel { } } - void setProbability(int prob) { + void setProbability(int prob) { base_probability = constrain(prob, 0, 100); if (!isCvModActive()) { cvmod_probability = base_probability; @@ -74,20 +75,20 @@ class Channel { } void setDutyCycle(int duty) { - base_duty_cycle = constrain(duty, 1, 99); + base_duty_cycle = constrain(duty, 1, 99); if (!isCvModActive()) { cvmod_duty_cycle = base_duty_cycle; } } - void setOffset(int off) { + void setOffset(int off) { base_offset = constrain(off, 0, 99); if (!isCvModActive()) { cvmod_offset = base_offset; } } void setSwing(int val) { - base_swing = constrain(val, 50, 95); + base_swing = constrain(val, 50, 95); if (!isCvModActive()) { cvmod_swing = base_swing; } @@ -141,12 +142,12 @@ class Channel { bool hit = cvmod_probability >= random(0, 100); // Euclidean rhythm check switch (pattern.NextStep()) { - case Pattern::REST: // Rest when active or fall back to probability - hit = false; - break; - case Pattern::HIT: // Hit if probability is true - hit &= true; - break; + case Pattern::REST: // Rest when active or fall back to probability + hit = false; + break; + case Pattern::HIT: // Hit if probability is true + hit &= true; + break; } if (hit) { output.High(); @@ -192,11 +193,11 @@ class Channel { (cv_destination == CV_DEST_SWING) ? constrain(base_swing + map(value, -512, 512, -25, 25), 50, 95) : base_swing; - + if (cv_destination == CV_DEST_EUC_STEPS) { pattern.SetSteps(map(value, -512, 512, 0, MAX_PATTERN_LEN)); } - + if (cv_destination == CV_DEST_EUC_HITS) { pattern.SetHits(map(value, -512, 512, 0, pattern.GetSteps())); } diff --git a/examples/Gravity/display.h b/examples/Gravity/display.h index ea33442..038d4bf 100644 --- a/examples/Gravity/display.h +++ b/examples/Gravity/display.h @@ -346,7 +346,7 @@ void DisplayChannelPage() { // Draw Channel Page menu items String menu_items[PARAM_CH_LAST] = { - F("MOD"), F("PROBABILITY"), F("DUTY"), F("OFFSET"), F("SWING"), F("EUCLID STEPS"), + F("MOD"), F("PROBABILITY"), F("DUTY"), F("OFFSET"), F("SWING"), F("EUCLID STEPS"), F("EUCLID HITS"), F("CV SOURCE"), F("CV DEST")}; drawMenuItems(menu_items, PARAM_CH_LAST); } diff --git a/examples/Gravity/save_state.cpp b/examples/Gravity/save_state.cpp index ee374d3..c435df8 100644 --- a/examples/Gravity/save_state.cpp +++ b/examples/Gravity/save_state.cpp @@ -63,7 +63,7 @@ void StateManager::reset(AppState& app) { noInterrupts(); _saveMetadata(); // Write the new metadata - _saveState(app); // Write the new (default) app state + _saveState(app); // Write the new (default) app state interrupts(); _isDirty = false; diff --git a/gravity.cpp b/gravity.cpp index a678c40..3ef6d2b 100644 --- a/gravity.cpp +++ b/gravity.cpp @@ -12,7 +12,7 @@ #include "gravity.h" // Initialize the static pointer for the EncoderDir class to null. We want to -// have a static pointer to decouple the ISR from the global gravity object. +// have a static pointer to decouple the ISR from the global gravity object. Encoder* Encoder::_instance = nullptr; void Gravity::Init() {