From 24afc219d7c54a42661a84d4915192e3980b169b Mon Sep 17 00:00:00 2001 From: Jesse Vincent Date: Mon, 2 May 2016 10:31:46 -0700 Subject: [PATCH] The old beta hardware is obsolete and won't get new firmware updates from this branch of the code. --- implementation/Model01Beta.cpp | 175 --------------------------------- implementation/Model01Beta.h | 141 -------------------------- 2 files changed, 316 deletions(-) delete mode 100644 implementation/Model01Beta.cpp delete mode 100644 implementation/Model01Beta.h diff --git a/implementation/Model01Beta.cpp b/implementation/Model01Beta.cpp deleted file mode 100644 index 14ecc880..00000000 --- a/implementation/Model01Beta.cpp +++ /dev/null @@ -1,175 +0,0 @@ -#include "Model01Beta.h" - - -sx1509Class Model01Beta::leftsx1509(LEFT_SX1509_ADDRESS); -sx1509Class Model01Beta::rightsx1509(RIGHT_SX1509_ADDRESS); - - -WS2812 Model01Beta::LED(LED_COUNT); - -Model01Beta::Model01Beta(void) { - -} - -void Model01Beta::setup(void) { - pins_setup(); - leds_setup(); -} -void Model01Beta::leds_setup() { - LED.setOutput(LED_DATA_PIN); - LED.setColorOrderGRB(); // Uncomment for RGB color order -} - -cRGB Model01Beta::get_key_color(byte row, byte col) { - return LED.get_crgb_at(key_led_map[row][col]); -} - -void Model01Beta::led_set_crgb_at(uint8_t i, cRGB crgb) { - LED.set_crgb_at(i, crgb); -} - -void Model01Beta::led_sync() { - LED.sync(); -} - - - - -void Model01Beta::scan_matrix() { - //scan the Keyboard matrix looking for connections - for (byte row = 0; row < LEFT_ROWS; row++) { - scan_row(row); - - for (byte col = 0; col < LEFT_COLS; col++) { - scan_left_col(row,col,&matrixState[row][col]); - handle_key_event(row, col, &matrixState[row][col]); - - if (right_hand_connected()) { - scan_right_col(row,col,&matrixState[row][(COLS - 1) - col]); - handle_key_event(row, (COLS - 1) - col, &matrixState[row][(COLS - 1) - col]); - } - } - finish_scanning_row(row); - } -} - - - - - - - -void Model01Beta::scan_row(byte row) { - if (left_initted) { - leftsx1509.updatePinState(left_rowpins[row], LOW); - leftsx1509.sendPinStates(); - leftsx1509.fetchPinStates(); - } - if (right_initted) { - rightsx1509.updatePinState(right_rowpins[row], LOW); - rightsx1509.sendPinStates(); - rightsx1509.fetchPinStates(); - - } -} -void Model01Beta::finish_scanning_row(byte row) { - if (left_initted) - leftsx1509.updatePinState(left_rowpins[row], HIGH); - if (right_initted) - rightsx1509.updatePinState(right_rowpins[row], HIGH); -} - -void Model01Beta::scan_left_col(byte row, byte col,uint8_t *state) { - - //If we see an electrical connection on I->J, - - - *state <<= 1; - - if (left_initted && leftsx1509.readPrefetchedPin(left_colpins[col])) { - *state |= 0; - } else { - *state |= 1; - } -} - -void Model01Beta::scan_right_col(byte row, byte col, uint8_t *state) { - - //If we see an electrical connection on I->J, - - *state <<= 1; - - - if (right_initted && rightsx1509.readPrefetchedPin(right_colpins[col])) { - *state |= 0; - } else { - *state |= 1; - } - -} - - - - -boolean Model01Beta::right_hand_connected(void) { - if (right_initted) { - return true; - } else { - return false; - } -} - -void Model01Beta::pins_setup() { - right_initted = setup_sx1509(rightsx1509, right_colpins, right_rowpins); - left_initted = setup_sx1509(leftsx1509, left_colpins, left_rowpins); - rightsx1509.fetchPinStates(); -} - - -void Model01Beta::make_input(sx1509Class sx1509, uint8_t pin) { - sx1509.pinDir(pin, INPUT); // Set SX1509 pin 1 as an input - sx1509.writePin(pin, HIGH); // Activate pull-up -} - -void Model01Beta::make_output(sx1509Class sx1509, uint8_t pin) { - sx1509.pinDir(pin, OUTPUT); - sx1509.writePin(pin, HIGH); -} - -int Model01Beta::setup_sx1509 (sx1509Class sx1509, uint8_t colpins[], uint8_t rowpins[]) { - byte initted; - - for (int counter = 0; counter < 10; counter++) { - initted = sx1509.init(); - - if (initted) - break; - } - - if (initted) { // init ok - // In order to use the keypad, the clock must first be - // configured. We can call configureClock() with the default - // parameters (2MHz internal oscillator, no clock in/out). - sx1509.configClock(); - - - // the debounceConfig function sets the debounce time. This - // function's parameter should be a 3-bit value. - // 3: 4ms * 2MHz/fOSC - sx1509.debounceConfig(4); - - for (int i = 0; i < LEFT_ROWS; i++) { - make_output(sx1509, rowpins[i]); - } - - for (int j = 0; j < LEFT_COLS; j++) { - make_input(sx1509, colpins[j]); - sx1509.debounceEnable(colpins[j]); - } - - - } - return initted; - -} - diff --git a/implementation/Model01Beta.h b/implementation/Model01Beta.h deleted file mode 100644 index a8beaae8..00000000 --- a/implementation/Model01Beta.h +++ /dev/null @@ -1,141 +0,0 @@ -#pragma once - -#include -#include "../keymaps.h" -#include "WS2812.h" -#include "KeyboardioSX1509.h" -#include "../key_events.h" - - - -#define HARDWARE_IMPLEMENTATION Model01Beta - -#define USE_HSV_CURVE 1 - -// SX1509 I2C address (10) -#define LEFT_SX1509_ADDRESS 0x70 -// SX1509 I2C address (11) -#define RIGHT_SX1509_ADDRESS 0x71 - -#define RIGHT_COLS 8 -#define RIGHT_ROWS 4 -#define LEFT_COLS 8 -#define LEFT_ROWS 4 - - -class Model01Beta { - public: - Model01Beta(void); - void led_sync(void); - void led_set_crgb_at(uint8_t i, cRGB crgb); - cRGB get_key_color(byte row, byte col); - - void scan_matrix(void); - void setup(); - - - private: - static sx1509Class leftsx1509; - static sx1509Class rightsx1509; - static WS2812 LED; - int right_initted = 0; - int left_initted = 0; - uint8_t matrixState[ROWS][COLS] = {{0}}; - uint8_t left_colpins[LEFT_COLS]= {7,6,5,4,3,2,1,0}; - uint8_t left_rowpins[LEFT_ROWS]= {8,9,10,11}; - - uint8_t right_colpins[RIGHT_COLS]= {0,1,2,3,4,5,6,7}; - uint8_t right_rowpins[RIGHT_ROWS]= {8,9,10,11}; - - - static constexpr uint8_t key_led_map[4][16] = { - {3,4,11,12,19,20,26,27, 36,37,43,44,51,52,59,60}, - {2,5,10,13,18,21,31,28, 35,32,42,45,50,53,58,61}, - {1,6,9,14, 17,22,25,29, 34,38,41,46,49,54,57,62}, - {0,7,8,15,16,23,24,30, 33,39,40,47,48,55,56,63}, - }; - boolean right_hand_connected(void); - void pins_setup(); - void leds_setup(); - void scan_row(byte row); - void finish_scanning_row(byte row); - void scan_right_col(byte row, byte col, uint8_t *state); - void scan_left_col(byte row, byte col, uint8_t *state); - void make_input(sx1509Class sx1509, uint8_t pin) ; - void make_output(sx1509Class sx1509, uint8_t pin) ; - int setup_sx1509 (sx1509Class sx1509, uint8_t colpins[], uint8_t rowpins[]); - -}; - -#define LED_DATA_PIN 4 - -#define LED_COUNT 64 - - - -#define LED_PGDN 0 -#define LED_PGUP 1 -#define LED_BACKTICK 2 -#define LED_LED 3 -#define LED_1 4 -#define LED_Q 5 -#define LED_A 6 -#define LED_Z 7 -#define LED_X 8 -#define LED_S 9 -#define LED_W 10 -#define LED_2 11 -#define LED_3 12 -#define LED_E 13 -#define LED_D 14 -#define LED_C 15 -#define LED_V 16 -#define LED_F 17 -#define LED_R 18 -#define LED_4 19 -#define LED_5 20 -#define LED_T 21 -#define LED_REC_MACRO 22 -#define LED_B 23 -#define LED_ESC 24 -#define LED_TAB 25 -#define LED_REC 26 -#define LED_L_FN 27 -#define LED_L_CTRL 28 -#define LED_DEL 29 -#define LED_CMD 30 -#define LED_L_SHIFT 31 -#define LED_R_SHIFT 32 -#define LED_ALT 33 -#define LED_SPACE 34 -#define LED_CTRL 35 -#define LED_R_FN 36 -#define LED_ANY 37 -#define LED_RETURN 38 -#define LED_BUTTERFLY 39 -#define LED_N 40 -#define LED_H 41 -#define LED_Y 42 -#define LED_6 43 -#define LED_7 44 -#define LED_U 45 -#define LED_J 46 -#define LED_M 47 -#define LED_COMMA 48 -#define LED_K 49 -#define LED_I 50 -#define LED_8 51 -#define LED_9 52 -#define LED_O 53 -#define LED_L 54 -#define LED_PERIOD 55 -#define LED_SLASH 56 -#define LED_SEMICOLON 57 -#define LED_P 58 -#define LED_0 59 -#define LED_NUM 60 -#define LED_EQUALS 61 -#define LED_APOSTROPHE 62 -#define LED_MINUS 63 - -