diff options
| -rw-r--r-- | common.mk | 6 | ||||
| -rw-r--r-- | common_features.mk | 2 | ||||
| -rw-r--r-- | drivers/avr/analog.c (renamed from quantum/analog.c) | 0 | ||||
| -rw-r--r-- | drivers/avr/analog.h (renamed from quantum/analog.h) | 0 | ||||
| -rw-r--r-- | drivers/avr/glcdfont.c (renamed from keyboards/lets_split/common/glcdfont.c) | 0 | ||||
| -rw-r--r-- | drivers/avr/pro_micro.h (renamed from keyboards/atreus62/pro_micro.h) | 0 | ||||
| -rw-r--r-- | drivers/avr/ssd1306.c (renamed from keyboards/orthodox/ssd1306.c) | 2 | ||||
| -rw-r--r-- | drivers/avr/ssd1306.h (renamed from keyboards/lets_split/ssd1306.h) | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/avr/ws2812.c (renamed from quantum/light_ws2812.c) | 2 | ||||
| -rw-r--r--[-rwxr-xr-x] | drivers/avr/ws2812.h (renamed from quantum/light_ws2812.h) | 0 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/rgbsps.c | 2 | ||||
| -rw-r--r-- | keyboards/handwired/promethium/rules.mk | 4 | ||||
| -rw-r--r-- | keyboards/lets_split/pro_micro.h | 362 | ||||
| -rw-r--r-- | keyboards/lets_split/ssd1306.c | 470 | ||||
| -rw-r--r-- | keyboards/nyquist/pro_micro.h | 362 | ||||
| -rw-r--r-- | keyboards/orthodox/pro_micro.h | 362 | ||||
| -rw-r--r-- | keyboards/orthodox/ssd1306.h | 17 | ||||
| -rw-r--r-- | quantum/rgblight.h | 2 | ||||
| -rw-r--r-- | tmk_core/avr.mk | 2 | 
19 files changed, 13 insertions, 1582 deletions
| @@ -9,6 +9,9 @@ LIB_PATH = $(TOP_DIR)/lib  QUANTUM_DIR = quantum  QUANTUM_PATH = $(TOP_DIR)/$(QUANTUM_DIR) +DRIVER_DIR = drivers +DRIVER_PATH = $(TOP_DIR)/$(DRIVER_DIR) +  BUILD_DIR := $(TOP_DIR)/.build  COMMON_VPATH := $(TOP_DIR) @@ -17,4 +20,5 @@ COMMON_VPATH += $(QUANTUM_PATH)  COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras  COMMON_VPATH += $(QUANTUM_PATH)/audio  COMMON_VPATH += $(QUANTUM_PATH)/process_keycode -COMMON_VPATH += $(QUANTUM_PATH)/api
\ No newline at end of file +COMMON_VPATH += $(QUANTUM_PATH)/api +COMMON_VPATH += $(DRIVER_PATH)
\ No newline at end of file diff --git a/common_features.mk b/common_features.mk index f5e7af01fa..5eb56ccbfc 100644 --- a/common_features.mk +++ b/common_features.mk @@ -87,7 +87,7 @@ endif  ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)      OPT_DEFS += -DRGBLIGHT_ENABLE -    SRC += $(QUANTUM_DIR)/light_ws2812.c +    SRC += ws2812.c      SRC += $(QUANTUM_DIR)/rgblight.c      CIE1931_CURVE = yes      LED_BREATHING_TABLE = yes diff --git a/quantum/analog.c b/drivers/avr/analog.c index 1ec38df75d..1ec38df75d 100644 --- a/quantum/analog.c +++ b/drivers/avr/analog.c diff --git a/quantum/analog.h b/drivers/avr/analog.h index 8d93de7dc2..8d93de7dc2 100644 --- a/quantum/analog.h +++ b/drivers/avr/analog.h diff --git a/keyboards/lets_split/common/glcdfont.c b/drivers/avr/glcdfont.c index 6f88bd23a7..6f88bd23a7 100644 --- a/keyboards/lets_split/common/glcdfont.c +++ b/drivers/avr/glcdfont.c diff --git a/keyboards/atreus62/pro_micro.h b/drivers/avr/pro_micro.h index f9e7ed75d9..f9e7ed75d9 100644 --- a/keyboards/atreus62/pro_micro.h +++ b/drivers/avr/pro_micro.h diff --git a/keyboards/orthodox/ssd1306.c b/drivers/avr/ssd1306.c index 5c6dff27f8..f9312d2dc1 100644 --- a/keyboards/orthodox/ssd1306.c +++ b/drivers/avr/ssd1306.c @@ -6,7 +6,7 @@  #include <string.h>  #include "print.h"  #include "lets_split.h" -#include "common/glcdfont.c" +#include "glcdfont.c"  #ifdef ADAFRUIT_BLE_ENABLE  #include "adafruit_ble.h"  #endif diff --git a/keyboards/lets_split/ssd1306.h b/drivers/avr/ssd1306.h index b0c74f987e..b0c74f987e 100644 --- a/keyboards/lets_split/ssd1306.h +++ b/drivers/avr/ssd1306.h diff --git a/quantum/light_ws2812.c b/drivers/avr/ws2812.c index 2506e3d8ec..59e032bf71 100755..100644 --- a/quantum/light_ws2812.c +++ b/drivers/avr/ws2812.c @@ -21,7 +21,7 @@  * along with this program.  If not, see <http://www.gnu.org/licenses/>.  */ -#include "light_ws2812.h" +#include "ws2812.h"  #include <avr/interrupt.h>  #include <avr/io.h>  #include <util/delay.h> diff --git a/quantum/light_ws2812.h b/drivers/avr/ws2812.h index 60924a0fb6..60924a0fb6 100755..100644 --- a/quantum/light_ws2812.h +++ b/drivers/avr/ws2812.h diff --git a/keyboards/handwired/promethium/rgbsps.c b/keyboards/handwired/promethium/rgbsps.c index f30badd356..84fac1ae1f 100644 --- a/keyboards/handwired/promethium/rgbsps.c +++ b/keyboards/handwired/promethium/rgbsps.c @@ -1,4 +1,4 @@ -#include "light_ws2812.h" +#include "ws2812.h"  #include "rgbsps.h"  struct cRGB led[RGBSPS_NUM]; diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk index 6fa45b42b6..69903dcebe 100644 --- a/keyboards/handwired/promethium/rules.mk +++ b/keyboards/handwired/promethium/rules.mk @@ -72,7 +72,7 @@ BLUETOOTH = AdafruitBLE  # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE  SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend -SRC += $(QUANTUM_DIR)/light_ws2812.c +SRC += ws2812.c  SRC += rgbsps.c -SRC += $(QUANTUM_DIR)/analog.c +SRC += analog.c  SRC += matrix.c diff --git a/keyboards/lets_split/pro_micro.h b/keyboards/lets_split/pro_micro.h deleted file mode 100644 index f9e7ed75d9..0000000000 --- a/keyboards/lets_split/pro_micro.h +++ /dev/null @@ -1,362 +0,0 @@ -/* -  pins_arduino.h - Pin definition functions for Arduino -  Part of Arduino - http://www.arduino.cc/ - -  Copyright (c) 2007 David A. Mellis - -  This library is free software; you can redistribute it and/or -  modify it under the terms of the GNU Lesser General Public -  License as published by the Free Software Foundation; either -  version 2.1 of the License, or (at your option) any later version. - -  This library is distributed in the hope that it will be useful, -  but WITHOUT ANY WARRANTY; without even the implied warranty of -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU -  Lesser General Public License for more details. - -  You should have received a copy of the GNU Lesser General -  Public License along with this library; if not, write to the -  Free Software Foundation, Inc., 59 Temple Place, Suite 330, -  Boston, MA  02111-1307  USA - -  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ -*/ - -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include <avr/pgmspace.h> - -// Workaround for wrong definitions in "iom32u4.h". -// This should be fixed in the AVR toolchain. -#undef UHCON -#undef UHINT -#undef UHIEN -#undef UHADDR -#undef UHFNUM -#undef UHFNUML -#undef UHFNUMH -#undef UHFLEN -#undef UPINRQX -#undef UPINTX -#undef UPNUM -#undef UPRST -#undef UPCONX -#undef UPCFG0X -#undef UPCFG1X -#undef UPSTAX -#undef UPCFG2X -#undef UPIENX -#undef UPDATX -#undef TCCR2A -#undef WGM20 -#undef WGM21 -#undef COM2B0 -#undef COM2B1 -#undef COM2A0 -#undef COM2A1 -#undef TCCR2B -#undef CS20 -#undef CS21 -#undef CS22 -#undef WGM22 -#undef FOC2B -#undef FOC2A -#undef TCNT2 -#undef TCNT2_0 -#undef TCNT2_1 -#undef TCNT2_2 -#undef TCNT2_3 -#undef TCNT2_4 -#undef TCNT2_5 -#undef TCNT2_6 -#undef TCNT2_7 -#undef OCR2A -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 -#undef OCR2B -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 - -#define NUM_DIGITAL_PINS  30 -#define NUM_ANALOG_INPUTS 12 - -#define TX_RX_LED_INIT  DDRD |= (1<<5), DDRB |= (1<<0) -#define TXLED0          PORTD |= (1<<5) -#define TXLED1          PORTD &= ~(1<<5) -#define RXLED0          PORTB |= (1<<0) -#define RXLED1          PORTB &= ~(1<<0) - -static const uint8_t SDA = 2; -static const uint8_t SCL = 3; -#define LED_BUILTIN 13 - -// Map SPI port to 'new' pins D14..D17 -static const uint8_t SS   = 17; -static const uint8_t MOSI = 16; -static const uint8_t MISO = 14; -static const uint8_t SCK  = 15; - -// Mapping of analog pins as digital I/O -// A6-A11 share with digital pins -static const uint8_t ADC0 = 18; -static const uint8_t ADC1 = 19; -static const uint8_t ADC2 = 20; -static const uint8_t ADC3 = 21; -static const uint8_t ADC4 = 22; -static const uint8_t ADC5 = 23; -static const uint8_t ADC6 = 24;   // D4 -static const uint8_t ADC7 = 25;   // D6 -static const uint8_t ADC8 = 26;   // D8 -static const uint8_t ADC9 = 27;   // D9 -static const uint8_t ADC10 = 28;  // D10 -static const uint8_t ADC11 = 29;  // D12 - -#define digitalPinToPCICR(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0)) -#define digitalPinToPCICRbit(p) 0 -#define digitalPinToPCMSK(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCMSK0) : ((uint8_t *)0)) -#define digitalPinToPCMSKbit(p) ( ((p) >= 8 && (p) <= 11) ? (p) - 4 : ((p) == 14 ? 3 : ((p) == 15 ? 1 : ((p) == 16 ? 2 : ((p) == 17 ? 0 : (p - A8 + 4)))))) - -//  __AVR_ATmega32U4__ has an unusual mapping of pins to channels -extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; -#define analogPinToChannel(P)  ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) ) - -#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT))))) - -#ifdef ARDUINO_MAIN - -// On the Arduino board, digital pins are also used -// for the analog output (software PWM).  Analog input -// pins are a separate set. - -// ATMEL ATMEGA32U4 / ARDUINO LEONARDO -// -// D0               PD2                 RXD1/INT2 -// D1               PD3                 TXD1/INT3 -// D2               PD1     SDA         SDA/INT1 -// D3#              PD0     PWM8/SCL    OC0B/SCL/INT0 -// D4       A6      PD4                 ADC8 -// D5#              PC6     ???         OC3A/#OC4A -// D6#      A7      PD7     FastPWM     #OC4D/ADC10 -// D7               PE6                 INT6/AIN0 -// -// D8       A8      PB4                 ADC11/PCINT4 -// D9#      A9      PB5     PWM16       OC1A/#OC4B/ADC12/PCINT5 -// D10#     A10     PB6     PWM16       OC1B/0c4B/ADC13/PCINT6 -// D11#             PB7     PWM8/16     0C0A/OC1C/#RTS/PCINT7 -// D12      A11     PD6                 T1/#OC4D/ADC9 -// D13#             PC7     PWM10       CLK0/OC4A -// -// A0       D18     PF7                 ADC7 -// A1       D19     PF6                 ADC6 -// A2       D20     PF5                 ADC5 -// A3       D21     PF4                 ADC4 -// A4       D22     PF1                 ADC1 -// A5       D23     PF0                 ADC0 -// -// New pins D14..D17 to map SPI port to digital pins -// -// MISO     D14     PB3                 MISO,PCINT3 -// SCK      D15     PB1                 SCK,PCINT1 -// MOSI     D16     PB2                 MOSI,PCINT2 -// SS       D17     PB0                 RXLED,SS/PCINT0 -// -// Connected LEDs on board for TX and RX -// TXLED    D24     PD5                 XCK1 -// RXLED    D17     PB0 -// HWB              PE2                 HWB - -// these arrays map port names (e.g. port B) to the -// appropriate addresses for various functions (e.g. reading -// and writing) -const uint16_t PROGMEM port_to_mode_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &DDRB, -    (uint16_t) &DDRC, -    (uint16_t) &DDRD, -    (uint16_t) &DDRE, -    (uint16_t) &DDRF, -}; - -const uint16_t PROGMEM port_to_output_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PORTB, -    (uint16_t) &PORTC, -    (uint16_t) &PORTD, -    (uint16_t) &PORTE, -    (uint16_t) &PORTF, -}; - -const uint16_t PROGMEM port_to_input_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PINB, -    (uint16_t) &PINC, -    (uint16_t) &PIND, -    (uint16_t) &PINE, -    (uint16_t) &PINF, -}; - -const uint8_t PROGMEM digital_pin_to_port_PGM[] = { -    PD, // D0 - PD2 -    PD, // D1 - PD3 -    PD, // D2 - PD1 -    PD, // D3 - PD0 -    PD, // D4 - PD4 -    PC, // D5 - PC6 -    PD, // D6 - PD7 -    PE, // D7 - PE6 - -    PB, // D8 - PB4 -    PB, // D9 - PB5 -    PB, // D10 - PB6 -    PB, // D11 - PB7 -    PD, // D12 - PD6 -    PC, // D13 - PC7 - -    PB, // D14 - MISO - PB3 -    PB, // D15 - SCK - PB1 -    PB, // D16 - MOSI - PB2 -    PB, // D17 - SS - PB0 - -    PF, // D18 - A0 - PF7 -    PF, // D19 - A1 - PF6 -    PF, // D20 - A2 - PF5 -    PF, // D21 - A3 - PF4 -    PF, // D22 - A4 - PF1 -    PF, // D23 - A5 - PF0 - -    PD, // D24 - PD5 -    PD, // D25 / D6 - A7 - PD7 -    PB, // D26 / D8 - A8 - PB4 -    PB, // D27 / D9 - A9 - PB5 -    PB, // D28 / D10 - A10 - PB6 -    PD, // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { -    _BV(2), // D0 - PD2 -    _BV(3), // D1 - PD3 -    _BV(1), // D2 - PD1 -    _BV(0), // D3 - PD0 -    _BV(4), // D4 - PD4 -    _BV(6), // D5 - PC6 -    _BV(7), // D6 - PD7 -    _BV(6), // D7 - PE6 - -    _BV(4), // D8 - PB4 -    _BV(5), // D9 - PB5 -    _BV(6), // D10 - PB6 -    _BV(7), // D11 - PB7 -    _BV(6), // D12 - PD6 -    _BV(7), // D13 - PC7 - -    _BV(3), // D14 - MISO - PB3 -    _BV(1), // D15 - SCK - PB1 -    _BV(2), // D16 - MOSI - PB2 -    _BV(0), // D17 - SS - PB0 - -    _BV(7), // D18 - A0 - PF7 -    _BV(6), // D19 - A1 - PF6 -    _BV(5), // D20 - A2 - PF5 -    _BV(4), // D21 - A3 - PF4 -    _BV(1), // D22 - A4 - PF1 -    _BV(0), // D23 - A5 - PF0 - -    _BV(5), // D24 - PD5 -    _BV(7), // D25 / D6 - A7 - PD7 -    _BV(4), // D26 / D8 - A8 - PB4 -    _BV(5), // D27 / D9 - A9 - PB5 -    _BV(6), // D28 / D10 - A10 - PB6 -    _BV(6), // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    TIMER0B,        /* 3 */ -    NOT_ON_TIMER, -    TIMER3A,        /* 5 */ -    TIMER4D,        /* 6 */ -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    TIMER1A,        /* 9 */ -    TIMER1B,        /* 10 */ -    TIMER0A,        /* 11 */ - -    NOT_ON_TIMER, -    TIMER4A,        /* 13 */ - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -}; - -const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { -    7,  // A0               PF7                 ADC7 -    6,  // A1               PF6                 ADC6 -    5,  // A2               PF5                 ADC5 -    4,  // A3               PF4                 ADC4 -    1,  // A4               PF1                 ADC1 -    0,  // A5               PF0                 ADC0 -    8,  // A6       D4      PD4                 ADC8 -    10, // A7       D6      PD7                 ADC10 -    11, // A8       D8      PB4                 ADC11 -    12, // A9       D9      PB5                 ADC12 -    13, // A10      D10     PB6                 ADC13 -    9   // A11      D12     PD6                 ADC9 -}; - -#endif /* ARDUINO_MAIN */ - -// These serial port names are intended to allow libraries and architecture-neutral -// sketches to automatically default to the correct port name for a particular type -// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, -// the first hardware serial port whose RX/TX pins are not dedicated to another use. -// -// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor -// -// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial -// -// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library -// -// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins. -// -// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX -//                            pins are NOT connected to anything by default. -#define SERIAL_PORT_MONITOR        Serial -#define SERIAL_PORT_USBVIRTUAL     Serial -#define SERIAL_PORT_HARDWARE       Serial1 -#define SERIAL_PORT_HARDWARE_OPEN  Serial1 - -#endif /* Pins_Arduino_h */ diff --git a/keyboards/lets_split/ssd1306.c b/keyboards/lets_split/ssd1306.c deleted file mode 100644 index 5c6dff27f8..0000000000 --- a/keyboards/lets_split/ssd1306.c +++ /dev/null @@ -1,470 +0,0 @@ -#ifdef SSD1306OLED - -#include "ssd1306.h" -#include "config.h" -#include "i2c.h" -#include <string.h> -#include "print.h" -#include "lets_split.h" -#include "common/glcdfont.c" -#ifdef ADAFRUIT_BLE_ENABLE -#include "adafruit_ble.h" -#endif -#ifdef PROTOCOL_LUFA -#include "lufa.h" -#endif -#include "sendchar.h" -#include "pincontrol.h" - -//assign the right code to your layers -#define _BASE 0 -#define _LOWER 8 -#define _RAISE 16 -#define _FNLAYER 64 -#define _NUMLAY 128 -#define _NLOWER 136 -#define _NFNLAYER 192 -#define _MOUSECURSOR 256 -#define _ADJUST 65560 - -// Set this to 1 to help diagnose early startup problems -// when testing power-on with ble.  Turn it off otherwise, -// as the latency of printing most of the debug info messes -// with the matrix scan, causing keys to drop. -#define DEBUG_TO_SCREEN 0 - -// Controls the SSD1306 128x32 OLED display via i2c - -#define i2cAddress 0x3C - -#define DisplayHeight 32 -#define DisplayWidth 128 - -#define FontHeight 8 -#define FontWidth 6 - -#define MatrixRows (DisplayHeight / FontHeight) -#define MatrixCols (DisplayWidth / FontWidth) - -struct CharacterMatrix { -  uint8_t display[MatrixRows][MatrixCols]; -  uint8_t *cursor; -  bool dirty; -}; - -static struct CharacterMatrix display; -//static uint16_t last_battery_update; -//static uint32_t vbat; -//#define BatteryUpdateInterval 10000 /* milliseconds */ -#define ScreenOffInterval 300000 /* milliseconds */ -#if DEBUG_TO_SCREEN -static uint8_t displaying; -#endif -static uint16_t last_flush; - -enum ssd1306_cmds { -  DisplayOff = 0xAE, -  DisplayOn = 0xAF, - -  SetContrast = 0x81, -  DisplayAllOnResume = 0xA4, - -  DisplayAllOn = 0xA5, -  NormalDisplay = 0xA6, -  InvertDisplay = 0xA7, -  SetDisplayOffset = 0xD3, -  SetComPins = 0xda, -  SetVComDetect = 0xdb, -  SetDisplayClockDiv = 0xD5, -  SetPreCharge = 0xd9, -  SetMultiPlex = 0xa8, -  SetLowColumn = 0x00, -  SetHighColumn = 0x10, -  SetStartLine = 0x40, - -  SetMemoryMode = 0x20, -  ColumnAddr = 0x21, -  PageAddr = 0x22, - -  ComScanInc = 0xc0, -  ComScanDec = 0xc8, -  SegRemap = 0xa0, -  SetChargePump = 0x8d, -  ExternalVcc = 0x01, -  SwitchCapVcc = 0x02, - -  ActivateScroll = 0x2f, -  DeActivateScroll = 0x2e, -  SetVerticalScrollArea = 0xa3, -  RightHorizontalScroll = 0x26, -  LeftHorizontalScroll = 0x27, -  VerticalAndRightHorizontalScroll = 0x29, -  VerticalAndLeftHorizontalScroll = 0x2a, -}; - - -// Write command sequence. -// Returns true on success. -static inline bool _send_cmd1(uint8_t cmd) { -  bool res = false; - -  if (i2c_start_write(i2cAddress)) { -    xprintf("failed to start write to %d\n", i2cAddress); -    goto done; -  } - -  if (i2c_master_write(0x0 /* command byte follows */)) { -    print("failed to write control byte\n"); - -    goto done; -  } - -  if (i2c_master_write(cmd)) { -    xprintf("failed to write command %d\n", cmd); -    goto done; -  } -  res = true; -done: -  i2c_master_stop(); -  return res; -} - -// Write 2-byte command sequence. -// Returns true on success -static inline bool _send_cmd2(uint8_t cmd, uint8_t opr) { -  if (!_send_cmd1(cmd)) { -    return false; -  } -  return _send_cmd1(opr); -} - -// Write 3-byte command sequence. -// Returns true on success -static inline bool _send_cmd3(uint8_t cmd, uint8_t opr1, uint8_t opr2) { -  if (!_send_cmd1(cmd)) { -    return false; -  } -  if (!_send_cmd1(opr1)) { -    return false; -  } -  return _send_cmd1(opr2); -} - -#define send_cmd1(c) if (!_send_cmd1(c)) {goto done;} -#define send_cmd2(c,o) if (!_send_cmd2(c,o)) {goto done;} -#define send_cmd3(c,o1,o2) if (!_send_cmd3(c,o1,o2)) {goto done;} - -static void matrix_clear(struct CharacterMatrix *matrix); - -static void clear_display(void) { -  matrix_clear(&display); - -  // Clear all of the display bits (there can be random noise -  // in the RAM on startup) -  send_cmd3(PageAddr, 0, (DisplayHeight / 8) - 1); -  send_cmd3(ColumnAddr, 0, DisplayWidth - 1); - -  if (i2c_start_write(i2cAddress)) { -    goto done; -  } -  if (i2c_master_write(0x40)) { -    // Data mode -    goto done; -  } -  for (uint8_t row = 0; row < MatrixRows; ++row) { -    for (uint8_t col = 0; col < DisplayWidth; ++col) { -      i2c_master_write(0); -    } -  } - -  display.dirty = false; - -done: -  i2c_master_stop(); -} - -#if DEBUG_TO_SCREEN -#undef sendchar -static int8_t capture_sendchar(uint8_t c) { -  sendchar(c); -  iota_gfx_write_char(c); - -  if (!displaying) { -    iota_gfx_flush(); -  } -  return 0; -} -#endif - -bool iota_gfx_init(void) { -  bool success = false; - -  send_cmd1(DisplayOff); -  send_cmd2(SetDisplayClockDiv, 0x80); -  send_cmd2(SetMultiPlex, DisplayHeight - 1); - -  send_cmd2(SetDisplayOffset, 0); - - -  send_cmd1(SetStartLine | 0x0); -  send_cmd2(SetChargePump, 0x14 /* Enable */); -  send_cmd2(SetMemoryMode, 0 /* horizontal addressing */); - -/// Flips the display orientation 0 degrees -  send_cmd1(SegRemap | 0x1); -  send_cmd1(ComScanDec); -/* -// the following Flip the display orientation 180 degrees -  send_cmd1(SegRemap); -  send_cmd1(ComScanInc); -// end flip */ -  send_cmd2(SetComPins, 0x2); -  send_cmd2(SetContrast, 0x8f); -  send_cmd2(SetPreCharge, 0xf1); -  send_cmd2(SetVComDetect, 0x40); -  send_cmd1(DisplayAllOnResume); -  send_cmd1(NormalDisplay); -  send_cmd1(DeActivateScroll); -  send_cmd1(DisplayOn); - -  send_cmd2(SetContrast, 0); // Dim - -  clear_display(); - -  success = true; - -  iota_gfx_flush(); - -#if DEBUG_TO_SCREEN -  print_set_sendchar(capture_sendchar); -#endif - -done: -  return success; -} - -bool iota_gfx_off(void) { -  bool success = false; - -  send_cmd1(DisplayOff); -  success = true; - -done: -  return success; -}  - -bool iota_gfx_on(void) { -  bool success = false; - -  send_cmd1(DisplayOn); -  success = true; - -done: -  return success; -} - -static void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c) { -  *matrix->cursor = c; -  ++matrix->cursor; - -  if (matrix->cursor - &matrix->display[0][0] == sizeof(matrix->display)) { -    // We went off the end; scroll the display upwards by one line -    memmove(&matrix->display[0], &matrix->display[1], -            MatrixCols * (MatrixRows - 1)); -    matrix->cursor = &matrix->display[MatrixRows - 1][0]; -    memset(matrix->cursor, ' ', MatrixCols); -  } -} - -static void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c) { -  matrix->dirty = true; - -  if (c == '\n') { -    // Clear to end of line from the cursor and then move to the -    // start of the next line -    uint8_t cursor_col = (matrix->cursor - &matrix->display[0][0]) % MatrixCols; - -    while (cursor_col++ < MatrixCols) { -      matrix_write_char_inner(matrix, ' '); -    } -    return; -  } - -  matrix_write_char_inner(matrix, c); -} - -void iota_gfx_write_char(uint8_t c) { -  matrix_write_char(&display, c); -} - -static void matrix_write(struct CharacterMatrix *matrix, const char *data) { -  const char *end = data + strlen(data); -  while (data < end) { -    matrix_write_char(matrix, *data); -    ++data; -  } -} - -void iota_gfx_write(const char *data) { -  matrix_write(&display, data); -} - -static void matrix_write_P(struct CharacterMatrix *matrix, const char *data) { -  while (true) { -    uint8_t c = pgm_read_byte(data); -    if (c == 0) { -      return; -    } -    matrix_write_char(matrix, c); -    ++data; -  } -} - -void iota_gfx_write_P(const char *data) { -  matrix_write_P(&display, data); -} - -static void matrix_clear(struct CharacterMatrix *matrix) { -  memset(matrix->display, ' ', sizeof(matrix->display)); -  matrix->cursor = &matrix->display[0][0]; -  matrix->dirty = true; -} - -void iota_gfx_clear_screen(void) { -  matrix_clear(&display); -} - -static void matrix_render(struct CharacterMatrix *matrix) { -  last_flush = timer_read(); -  iota_gfx_on(); -#if DEBUG_TO_SCREEN -  ++displaying; -#endif - -  // Move to the home position -  send_cmd3(PageAddr, 0, MatrixRows - 1); -  send_cmd3(ColumnAddr, 0, (MatrixCols * FontWidth) - 1); - -  if (i2c_start_write(i2cAddress)) { -    goto done; -  } -  if (i2c_master_write(0x40)) { -    // Data mode -    goto done; -  } - -  for (uint8_t row = 0; row < MatrixRows; ++row) { -    for (uint8_t col = 0; col < MatrixCols; ++col) { -      const uint8_t *glyph = font + (matrix->display[row][col] * (FontWidth - 1)); - -      for (uint8_t glyphCol = 0; glyphCol < FontWidth - 1; ++glyphCol) { -        uint8_t colBits = pgm_read_byte(glyph + glyphCol); -        i2c_master_write(colBits); -      } - -      // 1 column of space between chars (it's not included in the glyph) -      i2c_master_write(0); -    } -  } - -  matrix->dirty = false; - -done: -  i2c_master_stop(); -#if DEBUG_TO_SCREEN -  --displaying; -#endif -} - -void iota_gfx_flush(void) { -  matrix_render(&display); -} - -static void matrix_update(struct CharacterMatrix *dest, -                          const struct CharacterMatrix *source) { -  if (memcmp(dest->display, source->display, sizeof(dest->display))) { -    memcpy(dest->display, source->display, sizeof(dest->display)); -    dest->dirty = true; -  } -} - -static void render_status_info(void) { -#if DEBUG_TO_SCREEN -  if (debug_enable) { -    return; -  } -#endif - -  struct CharacterMatrix matrix; - -  matrix_clear(&matrix); -  matrix_write_P(&matrix, PSTR("USB: ")); -#ifdef PROTOCOL_LUFA -  switch (USB_DeviceState) { -    case DEVICE_STATE_Unattached: -      matrix_write_P(&matrix, PSTR("Unattached")); -      break; -    case DEVICE_STATE_Suspended: -      matrix_write_P(&matrix, PSTR("Suspended")); -      break; -    case DEVICE_STATE_Configured: -      matrix_write_P(&matrix, PSTR("Connected")); -      break; -    case DEVICE_STATE_Powered: -      matrix_write_P(&matrix, PSTR("Powered")); -      break; -    case DEVICE_STATE_Default: -      matrix_write_P(&matrix, PSTR("Default")); -      break; -    case DEVICE_STATE_Addressed: -      matrix_write_P(&matrix, PSTR("Addressed")); -      break; -    default: -      matrix_write_P(&matrix, PSTR("Invalid")); -  } -#endif - -// Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below - -  char buf[40]; -  snprintf(buf,sizeof(buf), "Undef-%ld", layer_state); -  matrix_write_P(&matrix, PSTR("\n\nLayer: ")); -    switch (layer_state) { -        case _BASE: -           matrix_write_P(&matrix, PSTR("Default")); -           break; -        case _RAISE: -           matrix_write_P(&matrix, PSTR("Raise")); -           break; -        case _LOWER: -           matrix_write_P(&matrix, PSTR("Lower")); -           break; -        case _ADJUST: -           matrix_write_P(&matrix, PSTR("ADJUST")); -           break; -        default: -           matrix_write(&matrix, buf); - } -   -  // Host Keyboard LED Status -  char led[40]; -    snprintf(led, sizeof(led), "\n%s  %s  %s", -            (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ", -            (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ", -            (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    "); -  matrix_write(&matrix, led); -  matrix_update(&display, &matrix); -} - -void iota_gfx_task(void) { -  render_status_info(); - -  if (display.dirty) { -    iota_gfx_flush(); -  } - -  if (timer_elapsed(last_flush) > ScreenOffInterval) { -    iota_gfx_off(); -  } -} -#endif diff --git a/keyboards/nyquist/pro_micro.h b/keyboards/nyquist/pro_micro.h deleted file mode 100644 index f9e7ed75d9..0000000000 --- a/keyboards/nyquist/pro_micro.h +++ /dev/null @@ -1,362 +0,0 @@ -/* -  pins_arduino.h - Pin definition functions for Arduino -  Part of Arduino - http://www.arduino.cc/ - -  Copyright (c) 2007 David A. Mellis - -  This library is free software; you can redistribute it and/or -  modify it under the terms of the GNU Lesser General Public -  License as published by the Free Software Foundation; either -  version 2.1 of the License, or (at your option) any later version. - -  This library is distributed in the hope that it will be useful, -  but WITHOUT ANY WARRANTY; without even the implied warranty of -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU -  Lesser General Public License for more details. - -  You should have received a copy of the GNU Lesser General -  Public License along with this library; if not, write to the -  Free Software Foundation, Inc., 59 Temple Place, Suite 330, -  Boston, MA  02111-1307  USA - -  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ -*/ - -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include <avr/pgmspace.h> - -// Workaround for wrong definitions in "iom32u4.h". -// This should be fixed in the AVR toolchain. -#undef UHCON -#undef UHINT -#undef UHIEN -#undef UHADDR -#undef UHFNUM -#undef UHFNUML -#undef UHFNUMH -#undef UHFLEN -#undef UPINRQX -#undef UPINTX -#undef UPNUM -#undef UPRST -#undef UPCONX -#undef UPCFG0X -#undef UPCFG1X -#undef UPSTAX -#undef UPCFG2X -#undef UPIENX -#undef UPDATX -#undef TCCR2A -#undef WGM20 -#undef WGM21 -#undef COM2B0 -#undef COM2B1 -#undef COM2A0 -#undef COM2A1 -#undef TCCR2B -#undef CS20 -#undef CS21 -#undef CS22 -#undef WGM22 -#undef FOC2B -#undef FOC2A -#undef TCNT2 -#undef TCNT2_0 -#undef TCNT2_1 -#undef TCNT2_2 -#undef TCNT2_3 -#undef TCNT2_4 -#undef TCNT2_5 -#undef TCNT2_6 -#undef TCNT2_7 -#undef OCR2A -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 -#undef OCR2B -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 - -#define NUM_DIGITAL_PINS  30 -#define NUM_ANALOG_INPUTS 12 - -#define TX_RX_LED_INIT  DDRD |= (1<<5), DDRB |= (1<<0) -#define TXLED0          PORTD |= (1<<5) -#define TXLED1          PORTD &= ~(1<<5) -#define RXLED0          PORTB |= (1<<0) -#define RXLED1          PORTB &= ~(1<<0) - -static const uint8_t SDA = 2; -static const uint8_t SCL = 3; -#define LED_BUILTIN 13 - -// Map SPI port to 'new' pins D14..D17 -static const uint8_t SS   = 17; -static const uint8_t MOSI = 16; -static const uint8_t MISO = 14; -static const uint8_t SCK  = 15; - -// Mapping of analog pins as digital I/O -// A6-A11 share with digital pins -static const uint8_t ADC0 = 18; -static const uint8_t ADC1 = 19; -static const uint8_t ADC2 = 20; -static const uint8_t ADC3 = 21; -static const uint8_t ADC4 = 22; -static const uint8_t ADC5 = 23; -static const uint8_t ADC6 = 24;   // D4 -static const uint8_t ADC7 = 25;   // D6 -static const uint8_t ADC8 = 26;   // D8 -static const uint8_t ADC9 = 27;   // D9 -static const uint8_t ADC10 = 28;  // D10 -static const uint8_t ADC11 = 29;  // D12 - -#define digitalPinToPCICR(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0)) -#define digitalPinToPCICRbit(p) 0 -#define digitalPinToPCMSK(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCMSK0) : ((uint8_t *)0)) -#define digitalPinToPCMSKbit(p) ( ((p) >= 8 && (p) <= 11) ? (p) - 4 : ((p) == 14 ? 3 : ((p) == 15 ? 1 : ((p) == 16 ? 2 : ((p) == 17 ? 0 : (p - A8 + 4)))))) - -//  __AVR_ATmega32U4__ has an unusual mapping of pins to channels -extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; -#define analogPinToChannel(P)  ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) ) - -#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT))))) - -#ifdef ARDUINO_MAIN - -// On the Arduino board, digital pins are also used -// for the analog output (software PWM).  Analog input -// pins are a separate set. - -// ATMEL ATMEGA32U4 / ARDUINO LEONARDO -// -// D0               PD2                 RXD1/INT2 -// D1               PD3                 TXD1/INT3 -// D2               PD1     SDA         SDA/INT1 -// D3#              PD0     PWM8/SCL    OC0B/SCL/INT0 -// D4       A6      PD4                 ADC8 -// D5#              PC6     ???         OC3A/#OC4A -// D6#      A7      PD7     FastPWM     #OC4D/ADC10 -// D7               PE6                 INT6/AIN0 -// -// D8       A8      PB4                 ADC11/PCINT4 -// D9#      A9      PB5     PWM16       OC1A/#OC4B/ADC12/PCINT5 -// D10#     A10     PB6     PWM16       OC1B/0c4B/ADC13/PCINT6 -// D11#             PB7     PWM8/16     0C0A/OC1C/#RTS/PCINT7 -// D12      A11     PD6                 T1/#OC4D/ADC9 -// D13#             PC7     PWM10       CLK0/OC4A -// -// A0       D18     PF7                 ADC7 -// A1       D19     PF6                 ADC6 -// A2       D20     PF5                 ADC5 -// A3       D21     PF4                 ADC4 -// A4       D22     PF1                 ADC1 -// A5       D23     PF0                 ADC0 -// -// New pins D14..D17 to map SPI port to digital pins -// -// MISO     D14     PB3                 MISO,PCINT3 -// SCK      D15     PB1                 SCK,PCINT1 -// MOSI     D16     PB2                 MOSI,PCINT2 -// SS       D17     PB0                 RXLED,SS/PCINT0 -// -// Connected LEDs on board for TX and RX -// TXLED    D24     PD5                 XCK1 -// RXLED    D17     PB0 -// HWB              PE2                 HWB - -// these arrays map port names (e.g. port B) to the -// appropriate addresses for various functions (e.g. reading -// and writing) -const uint16_t PROGMEM port_to_mode_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &DDRB, -    (uint16_t) &DDRC, -    (uint16_t) &DDRD, -    (uint16_t) &DDRE, -    (uint16_t) &DDRF, -}; - -const uint16_t PROGMEM port_to_output_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PORTB, -    (uint16_t) &PORTC, -    (uint16_t) &PORTD, -    (uint16_t) &PORTE, -    (uint16_t) &PORTF, -}; - -const uint16_t PROGMEM port_to_input_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PINB, -    (uint16_t) &PINC, -    (uint16_t) &PIND, -    (uint16_t) &PINE, -    (uint16_t) &PINF, -}; - -const uint8_t PROGMEM digital_pin_to_port_PGM[] = { -    PD, // D0 - PD2 -    PD, // D1 - PD3 -    PD, // D2 - PD1 -    PD, // D3 - PD0 -    PD, // D4 - PD4 -    PC, // D5 - PC6 -    PD, // D6 - PD7 -    PE, // D7 - PE6 - -    PB, // D8 - PB4 -    PB, // D9 - PB5 -    PB, // D10 - PB6 -    PB, // D11 - PB7 -    PD, // D12 - PD6 -    PC, // D13 - PC7 - -    PB, // D14 - MISO - PB3 -    PB, // D15 - SCK - PB1 -    PB, // D16 - MOSI - PB2 -    PB, // D17 - SS - PB0 - -    PF, // D18 - A0 - PF7 -    PF, // D19 - A1 - PF6 -    PF, // D20 - A2 - PF5 -    PF, // D21 - A3 - PF4 -    PF, // D22 - A4 - PF1 -    PF, // D23 - A5 - PF0 - -    PD, // D24 - PD5 -    PD, // D25 / D6 - A7 - PD7 -    PB, // D26 / D8 - A8 - PB4 -    PB, // D27 / D9 - A9 - PB5 -    PB, // D28 / D10 - A10 - PB6 -    PD, // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { -    _BV(2), // D0 - PD2 -    _BV(3), // D1 - PD3 -    _BV(1), // D2 - PD1 -    _BV(0), // D3 - PD0 -    _BV(4), // D4 - PD4 -    _BV(6), // D5 - PC6 -    _BV(7), // D6 - PD7 -    _BV(6), // D7 - PE6 - -    _BV(4), // D8 - PB4 -    _BV(5), // D9 - PB5 -    _BV(6), // D10 - PB6 -    _BV(7), // D11 - PB7 -    _BV(6), // D12 - PD6 -    _BV(7), // D13 - PC7 - -    _BV(3), // D14 - MISO - PB3 -    _BV(1), // D15 - SCK - PB1 -    _BV(2), // D16 - MOSI - PB2 -    _BV(0), // D17 - SS - PB0 - -    _BV(7), // D18 - A0 - PF7 -    _BV(6), // D19 - A1 - PF6 -    _BV(5), // D20 - A2 - PF5 -    _BV(4), // D21 - A3 - PF4 -    _BV(1), // D22 - A4 - PF1 -    _BV(0), // D23 - A5 - PF0 - -    _BV(5), // D24 - PD5 -    _BV(7), // D25 / D6 - A7 - PD7 -    _BV(4), // D26 / D8 - A8 - PB4 -    _BV(5), // D27 / D9 - A9 - PB5 -    _BV(6), // D28 / D10 - A10 - PB6 -    _BV(6), // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    TIMER0B,        /* 3 */ -    NOT_ON_TIMER, -    TIMER3A,        /* 5 */ -    TIMER4D,        /* 6 */ -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    TIMER1A,        /* 9 */ -    TIMER1B,        /* 10 */ -    TIMER0A,        /* 11 */ - -    NOT_ON_TIMER, -    TIMER4A,        /* 13 */ - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -}; - -const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { -    7,  // A0               PF7                 ADC7 -    6,  // A1               PF6                 ADC6 -    5,  // A2               PF5                 ADC5 -    4,  // A3               PF4                 ADC4 -    1,  // A4               PF1                 ADC1 -    0,  // A5               PF0                 ADC0 -    8,  // A6       D4      PD4                 ADC8 -    10, // A7       D6      PD7                 ADC10 -    11, // A8       D8      PB4                 ADC11 -    12, // A9       D9      PB5                 ADC12 -    13, // A10      D10     PB6                 ADC13 -    9   // A11      D12     PD6                 ADC9 -}; - -#endif /* ARDUINO_MAIN */ - -// These serial port names are intended to allow libraries and architecture-neutral -// sketches to automatically default to the correct port name for a particular type -// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, -// the first hardware serial port whose RX/TX pins are not dedicated to another use. -// -// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor -// -// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial -// -// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library -// -// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins. -// -// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX -//                            pins are NOT connected to anything by default. -#define SERIAL_PORT_MONITOR        Serial -#define SERIAL_PORT_USBVIRTUAL     Serial -#define SERIAL_PORT_HARDWARE       Serial1 -#define SERIAL_PORT_HARDWARE_OPEN  Serial1 - -#endif /* Pins_Arduino_h */ diff --git a/keyboards/orthodox/pro_micro.h b/keyboards/orthodox/pro_micro.h deleted file mode 100644 index f9e7ed75d9..0000000000 --- a/keyboards/orthodox/pro_micro.h +++ /dev/null @@ -1,362 +0,0 @@ -/* -  pins_arduino.h - Pin definition functions for Arduino -  Part of Arduino - http://www.arduino.cc/ - -  Copyright (c) 2007 David A. Mellis - -  This library is free software; you can redistribute it and/or -  modify it under the terms of the GNU Lesser General Public -  License as published by the Free Software Foundation; either -  version 2.1 of the License, or (at your option) any later version. - -  This library is distributed in the hope that it will be useful, -  but WITHOUT ANY WARRANTY; without even the implied warranty of -  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU -  Lesser General Public License for more details. - -  You should have received a copy of the GNU Lesser General -  Public License along with this library; if not, write to the -  Free Software Foundation, Inc., 59 Temple Place, Suite 330, -  Boston, MA  02111-1307  USA - -  $Id: wiring.h 249 2007-02-03 16:52:51Z mellis $ -*/ - -#ifndef Pins_Arduino_h -#define Pins_Arduino_h - -#include <avr/pgmspace.h> - -// Workaround for wrong definitions in "iom32u4.h". -// This should be fixed in the AVR toolchain. -#undef UHCON -#undef UHINT -#undef UHIEN -#undef UHADDR -#undef UHFNUM -#undef UHFNUML -#undef UHFNUMH -#undef UHFLEN -#undef UPINRQX -#undef UPINTX -#undef UPNUM -#undef UPRST -#undef UPCONX -#undef UPCFG0X -#undef UPCFG1X -#undef UPSTAX -#undef UPCFG2X -#undef UPIENX -#undef UPDATX -#undef TCCR2A -#undef WGM20 -#undef WGM21 -#undef COM2B0 -#undef COM2B1 -#undef COM2A0 -#undef COM2A1 -#undef TCCR2B -#undef CS20 -#undef CS21 -#undef CS22 -#undef WGM22 -#undef FOC2B -#undef FOC2A -#undef TCNT2 -#undef TCNT2_0 -#undef TCNT2_1 -#undef TCNT2_2 -#undef TCNT2_3 -#undef TCNT2_4 -#undef TCNT2_5 -#undef TCNT2_6 -#undef TCNT2_7 -#undef OCR2A -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 -#undef OCR2B -#undef OCR2_0 -#undef OCR2_1 -#undef OCR2_2 -#undef OCR2_3 -#undef OCR2_4 -#undef OCR2_5 -#undef OCR2_6 -#undef OCR2_7 - -#define NUM_DIGITAL_PINS  30 -#define NUM_ANALOG_INPUTS 12 - -#define TX_RX_LED_INIT  DDRD |= (1<<5), DDRB |= (1<<0) -#define TXLED0          PORTD |= (1<<5) -#define TXLED1          PORTD &= ~(1<<5) -#define RXLED0          PORTB |= (1<<0) -#define RXLED1          PORTB &= ~(1<<0) - -static const uint8_t SDA = 2; -static const uint8_t SCL = 3; -#define LED_BUILTIN 13 - -// Map SPI port to 'new' pins D14..D17 -static const uint8_t SS   = 17; -static const uint8_t MOSI = 16; -static const uint8_t MISO = 14; -static const uint8_t SCK  = 15; - -// Mapping of analog pins as digital I/O -// A6-A11 share with digital pins -static const uint8_t ADC0 = 18; -static const uint8_t ADC1 = 19; -static const uint8_t ADC2 = 20; -static const uint8_t ADC3 = 21; -static const uint8_t ADC4 = 22; -static const uint8_t ADC5 = 23; -static const uint8_t ADC6 = 24;   // D4 -static const uint8_t ADC7 = 25;   // D6 -static const uint8_t ADC8 = 26;   // D8 -static const uint8_t ADC9 = 27;   // D9 -static const uint8_t ADC10 = 28;  // D10 -static const uint8_t ADC11 = 29;  // D12 - -#define digitalPinToPCICR(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCICR) : ((uint8_t *)0)) -#define digitalPinToPCICRbit(p) 0 -#define digitalPinToPCMSK(p)    ((((p) >= 8 && (p) <= 11) || ((p) >= 14 && (p) <= 17) || ((p) >= A8 && (p) <= A10)) ? (&PCMSK0) : ((uint8_t *)0)) -#define digitalPinToPCMSKbit(p) ( ((p) >= 8 && (p) <= 11) ? (p) - 4 : ((p) == 14 ? 3 : ((p) == 15 ? 1 : ((p) == 16 ? 2 : ((p) == 17 ? 0 : (p - A8 + 4)))))) - -//  __AVR_ATmega32U4__ has an unusual mapping of pins to channels -extern const uint8_t PROGMEM analog_pin_to_channel_PGM[]; -#define analogPinToChannel(P)  ( pgm_read_byte( analog_pin_to_channel_PGM + (P) ) ) - -#define digitalPinToInterrupt(p) ((p) == 0 ? 2 : ((p) == 1 ? 3 : ((p) == 2 ? 1 : ((p) == 3 ? 0 : ((p) == 7 ? 4 : NOT_AN_INTERRUPT))))) - -#ifdef ARDUINO_MAIN - -// On the Arduino board, digital pins are also used -// for the analog output (software PWM).  Analog input -// pins are a separate set. - -// ATMEL ATMEGA32U4 / ARDUINO LEONARDO -// -// D0               PD2                 RXD1/INT2 -// D1               PD3                 TXD1/INT3 -// D2               PD1     SDA         SDA/INT1 -// D3#              PD0     PWM8/SCL    OC0B/SCL/INT0 -// D4       A6      PD4                 ADC8 -// D5#              PC6     ???         OC3A/#OC4A -// D6#      A7      PD7     FastPWM     #OC4D/ADC10 -// D7               PE6                 INT6/AIN0 -// -// D8       A8      PB4                 ADC11/PCINT4 -// D9#      A9      PB5     PWM16       OC1A/#OC4B/ADC12/PCINT5 -// D10#     A10     PB6     PWM16       OC1B/0c4B/ADC13/PCINT6 -// D11#             PB7     PWM8/16     0C0A/OC1C/#RTS/PCINT7 -// D12      A11     PD6                 T1/#OC4D/ADC9 -// D13#             PC7     PWM10       CLK0/OC4A -// -// A0       D18     PF7                 ADC7 -// A1       D19     PF6                 ADC6 -// A2       D20     PF5                 ADC5 -// A3       D21     PF4                 ADC4 -// A4       D22     PF1                 ADC1 -// A5       D23     PF0                 ADC0 -// -// New pins D14..D17 to map SPI port to digital pins -// -// MISO     D14     PB3                 MISO,PCINT3 -// SCK      D15     PB1                 SCK,PCINT1 -// MOSI     D16     PB2                 MOSI,PCINT2 -// SS       D17     PB0                 RXLED,SS/PCINT0 -// -// Connected LEDs on board for TX and RX -// TXLED    D24     PD5                 XCK1 -// RXLED    D17     PB0 -// HWB              PE2                 HWB - -// these arrays map port names (e.g. port B) to the -// appropriate addresses for various functions (e.g. reading -// and writing) -const uint16_t PROGMEM port_to_mode_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &DDRB, -    (uint16_t) &DDRC, -    (uint16_t) &DDRD, -    (uint16_t) &DDRE, -    (uint16_t) &DDRF, -}; - -const uint16_t PROGMEM port_to_output_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PORTB, -    (uint16_t) &PORTC, -    (uint16_t) &PORTD, -    (uint16_t) &PORTE, -    (uint16_t) &PORTF, -}; - -const uint16_t PROGMEM port_to_input_PGM[] = { -    NOT_A_PORT, -    NOT_A_PORT, -    (uint16_t) &PINB, -    (uint16_t) &PINC, -    (uint16_t) &PIND, -    (uint16_t) &PINE, -    (uint16_t) &PINF, -}; - -const uint8_t PROGMEM digital_pin_to_port_PGM[] = { -    PD, // D0 - PD2 -    PD, // D1 - PD3 -    PD, // D2 - PD1 -    PD, // D3 - PD0 -    PD, // D4 - PD4 -    PC, // D5 - PC6 -    PD, // D6 - PD7 -    PE, // D7 - PE6 - -    PB, // D8 - PB4 -    PB, // D9 - PB5 -    PB, // D10 - PB6 -    PB, // D11 - PB7 -    PD, // D12 - PD6 -    PC, // D13 - PC7 - -    PB, // D14 - MISO - PB3 -    PB, // D15 - SCK - PB1 -    PB, // D16 - MOSI - PB2 -    PB, // D17 - SS - PB0 - -    PF, // D18 - A0 - PF7 -    PF, // D19 - A1 - PF6 -    PF, // D20 - A2 - PF5 -    PF, // D21 - A3 - PF4 -    PF, // D22 - A4 - PF1 -    PF, // D23 - A5 - PF0 - -    PD, // D24 - PD5 -    PD, // D25 / D6 - A7 - PD7 -    PB, // D26 / D8 - A8 - PB4 -    PB, // D27 / D9 - A9 - PB5 -    PB, // D28 / D10 - A10 - PB6 -    PD, // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = { -    _BV(2), // D0 - PD2 -    _BV(3), // D1 - PD3 -    _BV(1), // D2 - PD1 -    _BV(0), // D3 - PD0 -    _BV(4), // D4 - PD4 -    _BV(6), // D5 - PC6 -    _BV(7), // D6 - PD7 -    _BV(6), // D7 - PE6 - -    _BV(4), // D8 - PB4 -    _BV(5), // D9 - PB5 -    _BV(6), // D10 - PB6 -    _BV(7), // D11 - PB7 -    _BV(6), // D12 - PD6 -    _BV(7), // D13 - PC7 - -    _BV(3), // D14 - MISO - PB3 -    _BV(1), // D15 - SCK - PB1 -    _BV(2), // D16 - MOSI - PB2 -    _BV(0), // D17 - SS - PB0 - -    _BV(7), // D18 - A0 - PF7 -    _BV(6), // D19 - A1 - PF6 -    _BV(5), // D20 - A2 - PF5 -    _BV(4), // D21 - A3 - PF4 -    _BV(1), // D22 - A4 - PF1 -    _BV(0), // D23 - A5 - PF0 - -    _BV(5), // D24 - PD5 -    _BV(7), // D25 / D6 - A7 - PD7 -    _BV(4), // D26 / D8 - A8 - PB4 -    _BV(5), // D27 / D9 - A9 - PB5 -    _BV(6), // D28 / D10 - A10 - PB6 -    _BV(6), // D29 / D12 - A11 - PD6 -}; - -const uint8_t PROGMEM digital_pin_to_timer_PGM[] = { -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    TIMER0B,        /* 3 */ -    NOT_ON_TIMER, -    TIMER3A,        /* 5 */ -    TIMER4D,        /* 6 */ -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    TIMER1A,        /* 9 */ -    TIMER1B,        /* 10 */ -    TIMER0A,        /* 11 */ - -    NOT_ON_TIMER, -    TIMER4A,        /* 13 */ - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, - -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -    NOT_ON_TIMER, -}; - -const uint8_t PROGMEM analog_pin_to_channel_PGM[] = { -    7,  // A0               PF7                 ADC7 -    6,  // A1               PF6                 ADC6 -    5,  // A2               PF5                 ADC5 -    4,  // A3               PF4                 ADC4 -    1,  // A4               PF1                 ADC1 -    0,  // A5               PF0                 ADC0 -    8,  // A6       D4      PD4                 ADC8 -    10, // A7       D6      PD7                 ADC10 -    11, // A8       D8      PB4                 ADC11 -    12, // A9       D9      PB5                 ADC12 -    13, // A10      D10     PB6                 ADC13 -    9   // A11      D12     PD6                 ADC9 -}; - -#endif /* ARDUINO_MAIN */ - -// These serial port names are intended to allow libraries and architecture-neutral -// sketches to automatically default to the correct port name for a particular type -// of use.  For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, -// the first hardware serial port whose RX/TX pins are not dedicated to another use. -// -// SERIAL_PORT_MONITOR        Port which normally prints to the Arduino Serial Monitor -// -// SERIAL_PORT_USBVIRTUAL     Port which is USB virtual serial -// -// SERIAL_PORT_LINUXBRIDGE    Port which connects to a Linux system via Bridge library -// -// SERIAL_PORT_HARDWARE       Hardware serial port, physical RX & TX pins. -// -// SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX -//                            pins are NOT connected to anything by default. -#define SERIAL_PORT_MONITOR        Serial -#define SERIAL_PORT_USBVIRTUAL     Serial -#define SERIAL_PORT_HARDWARE       Serial1 -#define SERIAL_PORT_HARDWARE_OPEN  Serial1 - -#endif /* Pins_Arduino_h */ diff --git a/keyboards/orthodox/ssd1306.h b/keyboards/orthodox/ssd1306.h deleted file mode 100644 index b0c74f987e..0000000000 --- a/keyboards/orthodox/ssd1306.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef SSD1306_H -#define SSD1306_H - -#include <stdbool.h> -#include <stdio.h> - -bool iota_gfx_init(void); -void iota_gfx_task(void); -bool iota_gfx_off(void); -bool iota_gfx_on(void); -void iota_gfx_flush(void); -void iota_gfx_write_char(uint8_t c); -void iota_gfx_write(const char *data); -void iota_gfx_write_P(const char *data); -void iota_gfx_clear_screen(void); - -#endif diff --git a/quantum/rgblight.h b/quantum/rgblight.h index 92130192ce..8fea96a9e8 100644 --- a/quantum/rgblight.h +++ b/quantum/rgblight.h @@ -61,7 +61,7 @@  #include <stdint.h>  #include <stdbool.h>  #include "eeconfig.h" -#include "light_ws2812.h" +#include "ws2812.h"  extern LED_TYPE led[RGBLED_NUM]; diff --git a/tmk_core/avr.mk b/tmk_core/avr.mk index 6773726ee3..4af34ba574 100644 --- a/tmk_core/avr.mk +++ b/tmk_core/avr.mk @@ -12,7 +12,7 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature  EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)   BIN = - +COMMON_VPATH += $(DRIVER_PATH)/avr  COMPILEFLAGS += -funsigned-char  COMPILEFLAGS += -funsigned-bitfields | 
