Skip to content

Commit

Permalink
Merge pull request pichenettes#44 from luzpaz/typos
Browse files Browse the repository at this point in the history
Fix various typos
  • Loading branch information
pichenettes authored Jan 22, 2022
2 parents ff32805 + c5f910f commit 11cc3a8
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion marbles/clock_self_patching_detector.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
//
// Class for detecting if the t1 or t2 gate outputs are patched into the X
// clock input. This is done by comparing the number of synchronous transitions
// on the gate ouputs and the clock input. A small margin of error is allowed
// on the gate outputs and the clock input. A small margin of error is allowed
// because of acquisition delays.

#ifndef MARBLES_CLOCK_SELF_PATCHING_DETECTOR_H_
Expand Down
2 changes: 1 addition & 1 deletion marbles/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FAMILY = f4xx
APPLICATION_LARGE = TRUE
BOOTLOADER = marbles_bootloader

# Prefered upload command
# Preferred upload command
UPLOAD_COMMAND = upload_combo_jtag_erase_first

# Packages to build
Expand Down
2 changes: 1 addition & 1 deletion marbles/ramp/slave_ramp.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
//
// -----------------------------------------------------------------------------
//
// A ramp that follows a mater ramp through division/multiplication.
// A ramp that follows a master ramp through division/multiplication.

#ifndef MARBLES_RAMP_SLAVE_RAMP_H_
#define MARBLES_RAMP_SLAVE_RAMP_H_
Expand Down
2 changes: 1 addition & 1 deletion plaits/dsp/engine/additive_engine.cc
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ void AdditiveEngine::UpdateAmplitudes(

// Warning about the following line: this is not a proper LP filter because
// of the normalization. But in spite of its strange working, this line
// turns out ot be absolutely essential.
// turns out to be absolutely essential.
//
// I have tried both normalizing the LP-ed spectrum, and LP-ing the
// normalized spectrum, and both of them cause more annoyances than this
Expand Down
4 changes: 2 additions & 2 deletions plaits/dsp/oscillator/string_synth_oscillator.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ class StringSynthOscillator {
frequency *= 8.0f;

// Deal with very high frequencies by shifting everything 1 or 2 octave
// down: Instead of playing the 1nd harmonic of a 8kHz wave, we play the
// second harmonic of a 4kHz wave.
// down: Instead of playing the 1st harmonic of a 8kHz wave, we play the
// 2nd harmonic of a 4kHz wave.
size_t shift = 0;
while (frequency > 0.5f) {
shift += 2;
Expand Down
2 changes: 1 addition & 1 deletion plaits/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FAMILY = f37x
APPLICATION_LARGE = TRUE
BOOTLOADER = plaits_bootloader

# Prefered upload command
# Preferred upload command
UPLOAD_COMMAND = upload_combo_jtag_erase_first

# Packages to build
Expand Down
2 changes: 1 addition & 1 deletion plaits/ui.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class Ui {

int active_engine_;

float cv_c1_; // For calibraiton
float cv_c1_; // For calibration

static const CvAdcChannel normalized_channels_[kNumNormalizedChannels];

Expand Down
2 changes: 1 addition & 1 deletion rings/dsp/string_synth_part.cc
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ const float chords[kMaxStringSynthPolyphony][kNumChords][kMaxChordSize] = {
// Original chord table:
// - wider, occupies more room in the spectrum.
// - minimum number of note changes between adjacent chords.
// - consistant with the chord table used for the sympathetic strings model.
// - consistent with the chord table used for the sympathetic strings model.
const float chords[kMaxStringSynthPolyphony][kNumChords][kMaxChordSize] = {
{
{ -24.0f, -12.0f, 0.0f, 0.01f, 0.02f, 11.99f, 12.0f, 24.0f },
Expand Down
2 changes: 1 addition & 1 deletion stages/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FAMILY = f37x
APPLICATION_LARGE = TRUE
BOOTLOADER = stages_bootloader

# Prefered upload command
# Preferred upload command
UPLOAD_COMMAND = upload_combo_jtag_erase_first

# Packages to build
Expand Down
2 changes: 1 addition & 1 deletion streams/cv_scaler.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class CvScaler {

bool can_calibrate() const;

// This class owns the calibration data and is reponsible for removing
// This class owns the calibration data and is responsible for removing
// offsets.
inline int16_t audio_sample(uint8_t channel) const {
int32_t value = static_cast<int32_t>(
Expand Down
2 changes: 1 addition & 1 deletion tides2/makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FAMILY = f37x
APPLICATION_LARGE = TRUE
BOOTLOADER = tides2_bootloader

# Prefered upload command
# Preferred upload command
UPLOAD_COMMAND = upload_combo_jtag_erase_first

# Packages to build
Expand Down
2 changes: 1 addition & 1 deletion yarns/layout_configurator.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// -----------------------------------------------------------------------------
//
// Class monitoring a sequence of notes on the MIDI input and automatically
// chosing the best layout
// choosing the best layout

#include "yarns/layout_configurator.h"
#include "yarns/multi.h"
Expand Down
2 changes: 1 addition & 1 deletion yarns/layout_configurator.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// -----------------------------------------------------------------------------
//
// Class monitoring a sequence of notes on the MIDI input and automatically
// chosing the best layout
// choosing the best layout

#ifndef YARNS_LAYOUT_CONFIGURATOR_H_
#define YARNS_LAYOUT_CONFIGURATOR_H_
Expand Down
2 changes: 1 addition & 1 deletion yarns/multi.cc
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void Multi::Init(bool reset_calibration) {
recording_ = false;

// Put the multi in a usable state. Even if these settings will later be
// overriden with some data retrieved from Flash (presets).
// overridden with some data retrieved from Flash (presets).
settings_.clock_tempo = 120;
settings_.clock_swing = 0;
settings_.clock_input_division = 1;
Expand Down

0 comments on commit 11cc3a8

Please sign in to comment.