diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..27f2cfd --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "ios": "cpp" + } +} \ No newline at end of file diff --git a/README.md b/README.md index 892b766..1142f14 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# Lanes \ No newline at end of file +# Trigor Mortse +Trigor Mortse is an eurorack sequencer module based on morse code. diff --git a/TrigorMortse.ino b/TrigorMortse.ino index ed1d827..5455475 100644 --- a/TrigorMortse.ino +++ b/TrigorMortse.ino @@ -22,9 +22,9 @@ const int DisplaySpi = 0; //todo: find spi port ## from library Encoder LeftEnc( Enc1P1, Enc1P2); Encoder RightEnc( Enc2P1, Enc2P2); -MortseUi Ui(DisplaySpi); +//MortseUi Ui(DisplaySpi); -String TestText = "Momento Mortse" +String TestText = "Momento Mortse"; int E1 = 0; int E2 = 0; @@ -124,7 +124,7 @@ void loop() { ClockPrev = tmpClock; if (abs(ClockInPrev - clkInTick) > 500){ - Clock = = ((1.0/(clkInTick/1000000.0)) * 60.0)/(float)PpQN; + Clock == ((1.0/(clkInTick/1000000.0)) * 60.0)/(float)PpQN; String outputBPM = "New BPM: "; outputBPM.concat(newBPM); Serial.println(outputBPM); @@ -176,7 +176,7 @@ void loop() { //Insert Beat Output here! char outputChar = TestString[Channel1Index]; - if (outputChar == '/0'){ + if (outputChar == '\0'){ Channel1Index = 0; outputChar = TestString[Channel1Index]; } @@ -212,7 +212,7 @@ void loop() { Channel3State = false; } - Ui.tick(); + //Ui.tick(); } diff --git a/src/MortseGfx.cpp b/src/MortseGfx.cpp index 66809cb..85f478e 100644 --- a/src/MortseGfx.cpp +++ b/src/MortseGfx.cpp @@ -6,6 +6,22 @@ byte MortseGfx::cursor_y = 0; enum cursorState MortseGfx::cursor_state = hidden; -void MortseGfx::init(){ +void MortseGfx::MortseGfx(){ +} + +void MortseGfx::MoveCursor(byte row, byte column){ + +} + +void MortseGfx::SetChar(byte row, byte column, char value){ + +} + +void MortseGfx::ClearChar(byte row, byte column){ + +} + +void MortseGfx::SetCursorState(cursorState state){ + } \ No newline at end of file diff --git a/src/MortseGfx.h b/src/MortseGfx.h index dddf8e0..43fbb5b 100644 --- a/src/MortseGfx.h +++ b/src/MortseGfx.h @@ -24,7 +24,7 @@ #define LOGO_HEIGHT 16 #define LOGO_WIDTH 16 -static const unsigned char PROGMEM +//static const unsigned char PROGMEM class MortseGfx { @@ -35,9 +35,9 @@ class MortseGfx public: - void init(); - void tick(); + void MortseGfx(); + void MoveCursor(byte row, byte column); void SetChar(byte row, byte column, char value); diff --git a/src/MortseUi.cpp b/src/MortseUi.cpp index ab1d4eb..5ddc4ce 100644 --- a/src/MortseUi.cpp +++ b/src/MortseUi.cpp @@ -5,7 +5,7 @@ //Private Variables unsigned long MortseUI::nextCursorFlash = 0; -MortseGfx MortseUI::Gfx(); +MortseGfx MortseUI::_gfx(); enum cursorState MortseUI::_cursorStyle = below; bool MortseUI::_cursor_visible = true; @@ -34,6 +34,7 @@ void MortseUi::MortseUi(){ for(int ix = 0; ix < LINE_LENGTH; ix++){ _line1[ix] = _line2[ix] = _line1_buff[ix] = _line2_buff[ix] = ' '; } + } /// @brief Called every frame