summaryrefslogtreecommitdiff
path: root/keyboards/sol/common
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-05-06 17:06:43 -0500
committerDrashna Jaelre <drashna@live.com>2019-05-06 15:06:43 -0700
commite01b2d518a1a08ce07278ef9a38c7a793c843749 (patch)
treebb63e0653e09308286d86df303c8d17a447df46c /keyboards/sol/common
parent99500243e10c12c0a5005da49aa1986947b27153 (diff)
[Keyboard] Sol keyboard conversion to split common (#5773)
* Split common conversion * Updated serial and encoder pins * Fixing default folder until r2 * Fixing oled driver on slave split common * Fixing keymap compile errors * Fixing oled inactivity timer on slave split common * Hoisted oled driver task, init, & activity to keyboard.c * Update keyboards/sol/config.h Co-Authored-By: XScorpion2 <rcalt2vt@gmail.com> * Remove TAPPING_FORCE_HOLD
Diffstat (limited to 'keyboards/sol/common')
-rw-r--r--keyboards/sol/common/knob_v2.c71
-rw-r--r--keyboards/sol/common/knob_v2.h28
2 files changed, 0 insertions, 99 deletions
diff --git a/keyboards/sol/common/knob_v2.c b/keyboards/sol/common/knob_v2.c
deleted file mode 100644
index f22f7c5d86..0000000000
--- a/keyboards/sol/common/knob_v2.c
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "knob_v2.h"
-
-bool knob_prev_a = false;
-static knob_report_t knob_report = {.dir = 0, .phase = 0};
-
-void knob_init(void) {
- // I use pins D1 (ISR1) & D4 for a knob.
-
- // Set pin mode for D4 as input.
- DDRD &= ~(0UL << ENCODER_PIN_2);
-
- // Enable internal pull-up for D4.
- // This is done by "writing" 1 to a pin that has its mode set to input.
- PORTD |= (1 << ENCODER_PIN_2);
-
- // Enable interrupt for D1
- // For more info on the below flags see this awesome section 11.1 (pages 89-90) here:
- // https://cdn-shop.adafruit.com/datasheets/atmel-7766-8-bit-avr-atmega16u4-32u4_datasheet.pdf
- // Set pin mode & pull-up.
- DDRD &= ~(0UL << ENCODER_PIN_1);
- PORTD |= (1UL << ENCODER_PIN_1);
-
- // INT: 33221100
- EICRA |= 0b00010000; // 0b01 - any edge
- // INT: 6 3210
- EIMSK |= 0b00000100;
-}
-
-ISR(ENCODER_INT) {
- bool a = PIND & (1 << ENCODER_PIN_1);
-
- if (knob_prev_a != a) {
- // "A" channel has REALLY changed.
- knob_report.phase = a;
- knob_prev_a = a;
- bool b = PIND & (1 << ENCODER_PIN_2);
- if (a == b) {
- // Halfway through CCW rotation (A == B)
- //
- // +---YOU ARE HERE (A=1, B=1)
- // | +---OR HERE (A=0, B=0)
- // | |
- // v v
- // A: _____/^^^^^\__
- // B: __/^^^^^\_____
- knob_report.dir++;
- } else {
- // Halfway through CW rotation (A != B)
- //
- // +---YOU ARE HERE (A=1, B=0)
- // | +---OR HERE (A=0, B=1)
- // | |
- // v v
- // A: _____/^^^^^\_____
- // B: ________/^^^^^\__
- knob_report.dir--;
- }
- }
-}
-
-knob_report_t knob_report_read(void) {
- // Return knob report.
- return knob_report;
-}
-
-void knob_report_reset(void) {
- // Call this ASAP once you've processed the previous knob report.
- // TODO: This should probably be called within `knob_report_read`.
- knob_report.dir = 0;
- knob_report.phase = 0;
-}
diff --git a/keyboards/sol/common/knob_v2.h b/keyboards/sol/common/knob_v2.h
deleted file mode 100644
index 45196eb1a6..0000000000
--- a/keyboards/sol/common/knob_v2.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Rotary knob implementation - Version 2.
-// Uses 2 digital pins - D2 (via interrupt) & D6.
-// #include "rev1.h"
-#include <avr/io.h>
-#include <avr/interrupt.h>
-#include <stdbool.h>
-
-#ifndef ENCODER_PIN_1
- #define ENCODER_PIN_1 PD2
-#endif
-#ifndef ENCODER_PIN_2
- #define ENCODER_PIN_2 PD6
-#endif
-#ifndef ENCODER_INT
- #define ENCODER_INT INT2_vect
-#endif
-
-typedef struct knob_report_t {
- int8_t dir; // Contains number of rotations that happened
- int8_t phase; // Contains 0 if last rotation happened on 90 degrees, 1 if on 270
-} knob_report_t;
-
-void knob_init(void);
-knob_report_t knob_report_read(void);
-void knob_report_reset(void);
-
-bool knob_prev_a;
-int8_t knob_dir;