merge

add port shortcuts
making qmk a bit more agnostic
2017-10-27 10:40:49 -04:00 · 2017-10-27 00:30:22 -04:00 · 2017-10-26 21:24:55 -07:00 · 2017-10-26 21:24:55 -07:00 · 2017-10-26 21:24:55 -07:00 · 2017-10-26 15:16:27 -07:00
4 changed files with 102 additions and 233 deletions
--- a/quantum/config_common.h
+++ b/quantum/config_common.h
@@ -17,179 +17,86 @@
 #ifndef CONFIG_DEFINITIONS_H
 #define CONFIG_DEFINITIONS_H

+#include <avr/io.h>
+
 /* diode directions */
 #define COL2ROW       0
 #define ROW2COL       1
 #define CUSTOM_MATRIX 2 /* Disables built-in matrix scanning code */

-#if defined(__AVR__)
-    #include <avr/io.h>
+/* I/O pins */
+#define PINDEF(port, pin) (uint8_t)((((uint16_t)&PORT##port) << 4) + PIN##port##pin)

-    #define PORT_SHIFTER 4
+#define PIN(p) (*((volatile uint8_t*)(p >> 4) + 0))
+#define PIN_VALUE(p) (PIN(p) & _BV(p & 0xF))

-    #if defined(__AVR_ATmega32U4__)
-        #define pin_t uint8_t
-        #define ADDRESS_BASE 0x00
-        #define PINB_ADDRESS 0x3
-        #define PINC_ADDRESS 0x6
-        #define PIND_ADDRESS 0x9
-        #define PINE_ADDRESS 0xC
-        #define PINF_ADDRESS 0xF
-    #elif defined(__AVR_ATmega32U2__)
-        #define pin_t uint8_t
-        #define ADDRESS_BASE 0x00
-        #define PINB_ADDRESS 0x3
-        #define PINC_ADDRESS 0x6
-        #define PIND_ADDRESS 0x9
-    #elif defined(__AVR_AT90USB1286__)
-        #define pin_t uint8_t
-        #define ADDRESS_BASE 0x00
-        #define PINA_ADDRESS 0x0
-        #define PINB_ADDRESS 0x3
-        #define PINC_ADDRESS 0x6
-        #define PIND_ADDRESS 0x9
-        #define PINE_ADDRESS 0xC
-        #define PINF_ADDRESS 0xF
-    #elif defined(__AVR_ATmega32a__)
-        #define pin_t uint8_t
-        #define ADDRESS_BASE 0x10
-        #define PIND_ADDRESS 0x0
-        #define PINC_ADDRESS 0x3
-        #define PINB_ADDRESS 0x6
-        #define PINA_ADDRESS 0x9
-    #else
-        #define pin_t uint16_t
-        #define ADDRESS_BASE 0x0
-    #endif
+#define DDR(p) (*((volatile uint8_t*)(p >> 4) + 1))
+#define DDR_OUTPUT(p) (DDR(p) |= _BV(p & 0xF))
+#define DDR_INPUT(p) (DDR(p) &= ~_BV(p & 0xF))

-    /* I/O pins */
-    // #define PINDEF(port, pin) (uint8_t)((((uint16_t)&PIN##port) << 4) + PIN##port##pin)
-    //#define PINDEF(port, pin) ((pin_t)(((((uint16_t)&PIN##port) - __SFR_OFFSET)<< 4) + PIN##port##pin))
-    #define PINDEF(port, pin) ((PIN##port##_ADDRESS << PORT_SHIFTER) | pin)
+#define PORT(p) (*((volatile uint8_t*)(p >> 4) + 2))
+#define PORT_HIGH(p) (PORT(p) |= _BV(p & 0xF))
+#define PORT_LOW(p) (PORT(p) &= ~_BV(p & 0xF))

-    #ifdef PORTA
-        #define A0 PINDEF(A, 0)
-        #define A1 PINDEF(A, 1)
-        #define A2 PINDEF(A, 1)
-        #define A3 PINDEF(A, 3)
-        #define A4 PINDEF(A, 4)
-        #define A5 PINDEF(A, 5)
-        #define A6 PINDEF(A, 6)
-        #define A7 PINDEF(A, 7)
-    #endif
-    #ifdef PORTB
-        #define B0 PINDEF(B, 0)
-        #define B1 PINDEF(B, 1)
-        #define B2 PINDEF(B, 2)
-        #define B3 PINDEF(B, 3)
-        #define B4 PINDEF(B, 4)
-        #define B5 PINDEF(B, 5)
-        #define B6 PINDEF(B, 6)
-        #define B7 PINDEF(B, 7)
-    #endif
-    #ifdef PORTC
-        #define C0 PINDEF(C, 0)
-        #define C1 PINDEF(C, 1)
-        #define C2 PINDEF(C, 2)
-        #define C3 PINDEF(C, 3)
-        #define C4 PINDEF(C, 4)
-        #define C5 PINDEF(C, 5)
-        #define C6 PINDEF(C, 6)
-        #define C7 PINDEF(C, 7)
-    #endif
-    #ifdef PORTD
-        #define D0 PINDEF(D, 0)
-        #define D1 PINDEF(D, 1)
-        #define D2 PINDEF(D, 2)
-        #define D3 PINDEF(D, 3)
-        #define D4 PINDEF(D, 4)
-        #define D5 PINDEF(D, 5)
-        #define D6 PINDEF(D, 6)
-        #define D7 PINDEF(D, 7)
-    #endif
-    #ifdef PORTE
-        #define E0 PINDEF(E, 0)
-        #define E1 PINDEF(E, 1)
-        #define E2 PINDEF(E, 2)
-        #define E3 PINDEF(E, 3)
-        #define E4 PINDEF(E, 4)
-        #define E5 PINDEF(E, 5)
-        #define E6 PINDEF(E, 6)
-        #define E7 PINDEF(E, 7)
-    #endif
-    #ifdef PORTF
-        #define F0 PINDEF(F, 0)
-        #define F1 PINDEF(F, 1)
-        #define F2 PINDEF(F, 2)
-        #define F3 PINDEF(F, 3)
-        #define F4 PINDEF(F, 4)
-        #define F5 PINDEF(F, 5)
-        #define F6 PINDEF(F, 6)
-        #define F7 PINDEF(F, 7)
-    #endif
+#ifdef PORTA
+    #define A0 PINDEF(A, 0)
+    #define A1 PINDEF(A, 1)
+    #define A2 PINDEF(A, 1)
+    #define A3 PINDEF(A, 3)
+    #define A4 PINDEF(A, 4)
+    #define A5 PINDEF(A, 5)
+    #define A6 PINDEF(A, 6)
+    #define A7 PINDEF(A, 7)
 #endif
-
-#if defined(PROTOCOL_CHIBIOS)
-    #include "hal.h"
-    #define pin_t uint64_t
-
-    #ifdef GPIOA
-        #define A0 (GPIOA + 0)
-        #define A1 (GPIOA + 1)
-        #define A2 (GPIOA + 2)
-        #define A3 (GPIOA + 3)
-        #define A4 (GPIOA + 4)
-        #define A5 (GPIOA + 5)
-        #define A6 (GPIOA + 6)
-        #define A7 (GPIOA + 7)
-        #define A8 (GPIOA + 8)
-        #define A9 (GPIOA + 9)
-        #define A10 (GPIOA + 10)
-        #define A11 (GPIOA + 11)
-        #define A12 (GPIOA + 12)
-        #define A13 (GPIOA + 13)
-        #define A14 (GPIOA + 14)
-        #define A15 (GPIOA + 15)
-    #endif
-
-    #ifdef GPIOB
-        #define B0 (GPIOB + 0)
-        #define B1 (GPIOB + 1)
-        #define B2 (GPIOB + 2)
-        #define B3 (GPIOB + 3)
-        #define B4 (GPIOB + 4)
-        #define B5 (GPIOB + 5)
-        #define B6 (GPIOB + 6)
-        #define B7 (GPIOB + 7)
-        #define B8 (GPIOB + 8)
-        #define B9 (GPIOB + 9)
-        #define B10 (GPIOB + 10)
-        #define B11 (GPIOB + 11)
-        #define B12 (GPIOB + 12)
-        #define B13 (GPIOB + 13)
-        #define B14 (GPIOB + 14)
-        #define B15 (GPIOB + 15)
-    #endif
-
-    #ifdef GPIOC
-        #define C0 (GPIOC + 0)
-        #define C1 (GPIOC + 1)
-        #define C2 (GPIOC + 2)
-        #define C3 (GPIOC + 3)
-        #define C4 (GPIOC + 4)
-        #define C5 (GPIOC + 5)
-        #define C6 (GPIOC + 6)
-        #define C7 (GPIOC + 7)
-        #define C8 (GPIOC + 8)
-        #define C9 (GPIOC + 9)
-        #define C10 (GPIOC + 10)
-        #define C11 (GPIOC + 11)
-        #define C12 (GPIOC + 12)
-        #define C13 (GPIOC + 13)
-        #define C14 (GPIOC + 14)
-        #define C15 (GPIOC + 15)
-    #endif
-
+#ifdef PORTB
+    #define B0 PINDEF(B, 0)
+    #define B1 PINDEF(B, 1)
+    #define B2 PINDEF(B, 2)
+    #define B3 PINDEF(B, 3)
+    #define B4 PINDEF(B, 4)
+    #define B5 PINDEF(B, 5)
+    #define B6 PINDEF(B, 6)
+    #define B7 PINDEF(B, 7)
+#endif
+#ifdef PORTC
+    #define C0 PINDEF(C, 0)
+    #define C1 PINDEF(C, 1)
+    #define C2 PINDEF(C, 2)
+    #define C3 PINDEF(C, 3)
+    #define C4 PINDEF(C, 4)
+    #define C5 PINDEF(C, 5)
+    #define C6 PINDEF(C, 6)
+    #define C7 PINDEF(C, 7)
+#endif
+#ifdef PORTD
+    #define D0 PINDEF(D, 0)
+    #define D1 PINDEF(D, 1)
+    #define D2 PINDEF(D, 2)
+    #define D3 PINDEF(D, 3)
+    #define D4 PINDEF(D, 4)
+    #define D5 PINDEF(D, 5)
+    #define D6 PINDEF(D, 6)
+    #define D7 PINDEF(D, 7)
+#endif
+#ifdef PORTE
+    #define E0 PINDEF(E, 0)
+    #define E1 PINDEF(E, 1)
+    #define E2 PINDEF(E, 2)
+    #define E3 PINDEF(E, 3)
+    #define E4 PINDEF(E, 4)
+    #define E5 PINDEF(E, 5)
+    #define E6 PINDEF(E, 6)
+    #define E7 PINDEF(E, 7)
+#endif
+#ifdef PORTF
+    #define F0 PINDEF(F, 0)
+    #define F1 PINDEF(F, 1)
+    #define F2 PINDEF(F, 2)
+    #define F3 PINDEF(F, 3)
+    #define F4 PINDEF(F, 4)
+    #define F5 PINDEF(F, 5)
+    #define F6 PINDEF(F, 6)
+    #define F7 PINDEF(F, 7)
 #endif


--- a/quantum/matrix.c
+++ b/quantum/matrix.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "quantum.h"
+

 /* Set 0 if debouncing isn't needed */

@@ -60,8 +60,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif

 #if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
-static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 #endif

 /* matrix state(1:on, 0:off) */
@@ -220,10 +220,7 @@ uint8_t matrix_scan(void)
        }
 #   endif

-    
-    dprintf("%x\n", B0);
    matrix_scan_quantum();
-
    return 1;
 }

--- a/quantum/pincontrol.h
+++ b/quantum/pincontrol.h
@@ -1,5 +1,4 @@
 /* Copyright 2016 Wez Furlong
- *          2017 Jack Humbert
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -15,72 +14,39 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
-
 // Some helpers for controlling gpio pins
+#include <avr/io.h>

-#if defined(PROTOCOL_CHIBIOS)
-  #include "hal.h"
+enum {
+  PinDirectionInput = 0,
+  PinDirectionOutput = 1,
+  PinLevelHigh = 1,
+  PinLevelLow = 0,
+};

-  #define PIN_VALUE(p)  palReadPad(p & 0xFFFFFFF0, p & 0xF)
-
-  #define DDR_OUTPUT(p) palSetPadMode(p & 0xFFFFFFF0, p & 0xF, PAL_MODE_OUTPUT_PUSHPULL)
-  #define DDR_INPUT(p)  palSetPadMode(p & 0xFFFFFFF0, p & 0xF, PAL_MODE_INPUT_PULLDOWN)
-
-  #define PORT_HIGH(p) palSetPad(p & 0xFFFFFFF0, p & 0xF)
-  #define PORT_LOW(p) palClearPad(p & 0xFFFFFFF0, p & 0xF)
-
-#endif
-
-#if defined(__AVR__)
-  #include <avr/io.h>
-  
-  #define PIN_ADDRESS(p, offset) _SFR_IO8(ADDRESS_BASE + (p >> PORT_SHIFTER) + offset)
-
-  #define PIN(p) PIN_ADDRESS(p, 0)
-  #define PIN_VALUE(p) (PIN(p) & _BV(p & 0xF))
-
-  #define DDR(p) PIN_ADDRESS(p, 1)
-  #define DDR_OUTPUT(p) (DDR(p) |= _BV(p & 0xF))
-  #define DDR_INPUT(p) (DDR(p) &= ~_BV(p & 0xF))
-
-  #define PORT(p) PIN_ADDRESS(p, 2)
-  #define PORT_HIGH(p) (PORT(p) |= _BV(p & 0xF))
-  #define PORT_LOW(p) (PORT(p) &= ~_BV(p & 0xF))
-
-  // Arduino shortcuts
-
-  enum {
-    PinDirectionInput = 0,
-    PinDirectionOutput = 1,
-    PinLevelHigh = 1,
-    PinLevelLow = 0,
-  };
-
-  // ex: pinMode(B0, PinDirectionOutput);
-  static inline void pinMode(uint8_t pin, int mode) {
-    uint8_t bv = _BV(pin & 0xf);
-    if (mode == PinDirectionOutput) {
-      _SFR_IO8((pin >> 4) + 1) |= bv;
-    } else {
-      _SFR_IO8((pin >> 4) + 1) &= ~bv;
-      _SFR_IO8((pin >> 4) + 2) &= ~bv;
-    }
+// ex: pinMode(B0, PinDirectionOutput);
+static inline void pinMode(uint8_t pin, int mode) {
+  uint8_t bv = _BV(pin & 0xf);
+  if (mode == PinDirectionOutput) {
+    _SFR_IO8((pin >> 4) + 1) |= bv;
+  } else {
+    _SFR_IO8((pin >> 4) + 1) &= ~bv;
+    _SFR_IO8((pin >> 4) + 2) &= ~bv;
  }
+}

-  // ex: digitalWrite(B0, PinLevelHigh);
-  static inline void digitalWrite(uint8_t pin, int mode) {
-    uint8_t bv = _BV(pin & 0xf);
-    if (mode == PinLevelHigh) {
-      _SFR_IO8((pin >> 4) + 2) |= bv;
-    } else {
-      _SFR_IO8((pin >> 4) + 2) &= ~bv;
-    }
+// ex: digitalWrite(B0, PinLevelHigh);
+static inline void digitalWrite(uint8_t pin, int mode) {
+  uint8_t bv = _BV(pin & 0xf);
+  if (mode == PinLevelHigh) {
+    _SFR_IO8((pin >> 4) + 2) |= bv;
+  } else {
+    _SFR_IO8((pin >> 4) + 2) &= ~bv;
  }
+}

-  // Return true if the pin is HIGH
-  // digitalRead(B0)
-  static inline bool digitalRead(uint8_t pin) {
-    return _SFR_IO8(pin >> 4) & _BV(pin & 0xf);
-  }
-
-#endif
+// Return true if the pin is HIGH
+// digitalRead(B0)
+static inline bool digitalRead(uint8_t pin) {
+  return _SFR_IO8(pin >> 4) & _BV(pin & 0xf);
+}
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -41,7 +41,6 @@
 #include <stdlib.h>
 #include "print.h"
 #include "send_string_keycodes.h"
-#include "pincontrol.h"

 extern uint32_t default_layer_state;
Author	SHA1	Message	Date
Jack Humbert	db7767c387	merge	2017-10-27 10:40:49 -04:00
Jack Humbert	8f9ba77f72	add port shortcuts	2017-10-27 00:30:22 -04:00
Ethan Madden	8c56d51219	making qmk a bit more agnostic if any of this ever works...	2017-10-26 21:24:55 -07:00
Ethan Madden	724fdd414a	travis was upset because a board didn't have a default keymap	2017-10-26 21:24:55 -07:00
Ethan Madden	f6291fb927	added bfake support as a subproject also moved existing bmini stuff to a subproject fixed columns minor keymap update making this a subproject remove old stuff got subproject stuff figured out	2017-10-26 21:24:55 -07:00
Ethan Madden	ba132db308	making qmk a bit more agnostic if any of this ever works...	2017-10-26 15:16:27 -07:00
Ethan Madden	34b0029b1e	Merge branch 'master' of https://github.com/qmk/qmk_firmware into ps2avrgb	2017-10-26 09:52:35 -07:00
Ethan Madden	2d9a383e0b	travis was upset because a board didn't have a default keymap	2017-10-23 11:16:38 -07:00
Ethan Madden	8a3f0ec83f	added bfake support as a subproject also moved existing bmini stuff to a subproject fixed columns minor keymap update making this a subproject remove old stuff got subproject stuff figured out	2017-10-20 14:49:22 -07:00