From b44166e7e2464c355492a2e5bed60736b009a990 Mon Sep 17 00:00:00 2001 From: Anthony Taylor Date: Sun, 31 May 2020 18:11:22 -0500 Subject: [PATCH 1/2] two changes, one i have commented out a switchframe in tetris that was causing the score to not show, two I have added a simple business card --- BusinessCard.cpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++ BusinessCard.h | 6 ++++++ Keebcard.ino | 2 +- 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 BusinessCard.cpp create mode 100644 BusinessCard.h diff --git a/BusinessCard.cpp b/BusinessCard.cpp new file mode 100644 index 0000000..e3b3ae3 --- /dev/null +++ b/BusinessCard.cpp @@ -0,0 +1,47 @@ +#include "settings.h" +#include "BusinessCard.h" + +void businessCard(SSD1306Device* _oled) { + int state = 0; + + _oled->setMemoryAddressingMode(0); + _oled->clear(); + + while(1){ + int old_state = state; + if (digitalRead(LEFT_BUTTON) == LOW) state = 1; + else if (digitalRead(MIDDLE_BUTTON) == LOW) state = 2; + else if (digitalRead(RIGHT_BUTTON) == LOW) state = 3; + else state = 4; + + if(old_state != state) { + if(state == 0 || state == 4) { + _oled->clear(); + _oled->setCursor(25, 1); + _oled->print("FALLS GEEK"); + } + else if(state == 2) { + _oled->clear(); + _oled->setCursor(5, 0); + _oled->print("fallsgeek.com"); + _oled->setCursor(5, 2); + _oled->print("940-400-0411"); + + } + else if(state == 1) { + _oled->clear(); + _oled->setCursor(5, 0); + _oled->print("Web Design"); + _oled->setCursor(5,2); + _oled->print("Computer Repair"); + } + else if(state == 3) { + _oled->clear(); + _oled->setCursor(5, 0); + _oled->print("3D Printing"); + _oled->setCursor(5,2); + _oled->print("Laser Engraving"); + } + } + } +} diff --git a/BusinessCard.h b/BusinessCard.h new file mode 100644 index 0000000..c6f15e4 --- /dev/null +++ b/BusinessCard.h @@ -0,0 +1,6 @@ +#include +#include + +//SSD1306Device* oled; + +void businessCard(SSD1306Device* _oled); diff --git a/Keebcard.ino b/Keebcard.ino index e538f92..cb36a0e 100644 --- a/Keebcard.ino +++ b/Keebcard.ino @@ -81,7 +81,7 @@ void setup_game(){ Tetris tetris(&oled); gameOver(tetris.run()); - oled.switchFrame(); + //oled.switchFrame(); #elif defined(CONWAY) oled.setMemoryAddressingMode(0); // TODO prolly don't need this Conway conway(&oled); From a265589b0271a66a7e87e58200c4a69ad3a09bbf Mon Sep 17 00:00:00 2001 From: Anthony Taylor Date: Sun, 31 May 2020 18:41:01 -0500 Subject: [PATCH 2/2] fixed a bug in buisnesscard and changed text to KeebCard --- BusinessCard.cpp | 21 +++++++++++---------- Keebcard.ino | 4 ++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/BusinessCard.cpp b/BusinessCard.cpp index e3b3ae3..6f96de6 100644 --- a/BusinessCard.cpp +++ b/BusinessCard.cpp @@ -5,6 +5,7 @@ void businessCard(SSD1306Device* _oled) { int state = 0; _oled->setMemoryAddressingMode(0); + _oled->switchRenderFrame(); _oled->clear(); while(1){ @@ -18,30 +19,30 @@ void businessCard(SSD1306Device* _oled) { if(state == 0 || state == 4) { _oled->clear(); _oled->setCursor(25, 1); - _oled->print("FALLS GEEK"); + _oled->print("KEEBCARD"); } else if(state == 2) { _oled->clear(); - _oled->setCursor(5, 0); - _oled->print("fallsgeek.com"); - _oled->setCursor(5, 2); - _oled->print("940-400-0411"); + _oled->setCursor(0, 0); + _oled->print("thekeebproject"); + _oled->setCursor(80, 2); + _oled->print(".com"); } else if(state == 1) { _oled->clear(); _oled->setCursor(5, 0); - _oled->print("Web Design"); + _oled->print("Pong, Tetris"); _oled->setCursor(5,2); - _oled->print("Computer Repair"); + _oled->print("Snake and More!"); } else if(state == 3) { _oled->clear(); _oled->setCursor(5, 0); - _oled->print("3D Printing"); + _oled->print("128x32 Screen"); _oled->setCursor(5,2); - _oled->print("Laser Engraving"); - } + _oled->print("ATTiny85"); + } } } } diff --git a/Keebcard.ino b/Keebcard.ino index cb36a0e..22f1b29 100644 --- a/Keebcard.ino +++ b/Keebcard.ino @@ -7,8 +7,8 @@ // PROGRAM DEFINES ============================================================= // uncomment whichever one you want -// #define BUSINESS_CARD -#define TETRIS +#define BUSINESS_CARD +//#define TETRIS // #define CONWAY // #define PONG // #define SNAKE