From b233867d9fb1acc72570739c3e5a7c8b59ff12bc Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Tue, 5 Nov 2019 12:32:06 +0100 Subject: [PATCH] Move hardware plugins to kaleidoscope::device Move all the hardware plugins from the `kaleidoscope::hardware` namespace to `kaleidoscope::device`, in perparation for deeper changes to come later. This is merely a restructuring, there are no functional changes. The one breaking change is that `ATMegaKeyboard` moved too, and we do not provide any backward compatibility there. Signed-off-by: Gergely Nagy --- src/Kaleidoscope-Hardware-EZ-ErgoDox.h | 4 ++-- src/Kaleidoscope-Hardware-KBDFans-KBD4x.h | 2 +- src/Kaleidoscope-Hardware-Model01.h | 4 ++-- src/Kaleidoscope-Hardware-OLKB-Planck.h | 4 ++-- ...Kaleidoscope-Hardware-SOFTHRUF-Splitography.h | 4 ++-- src/Kaleidoscope-Hardware-Technomancy-Atreus.h | 4 ++-- src/Kaleidoscope-Hardware-Technomancy-Atreus2.h | 2 +- .../{hardware => device}/ATMegaKeyboard.cpp | 4 ++-- .../{hardware => device}/ATMegaKeyboard.h | 4 ++-- .../{hardware => device}/avr/pins_and_ports.h | 0 .../{hardware => device}/ez/ErgoDox.cpp | 8 ++++---- .../{hardware => device}/ez/ErgoDox.h | 12 ++++++------ .../ez/ErgoDox/ErgoDoxScanner.cpp | 10 +++++----- .../ez/ErgoDox/ErgoDoxScanner.h | 4 ++-- .../ez/ErgoDox/i2cmaster.cpp | 2 +- .../{hardware => device}/ez/ErgoDox/i2cmaster.h | 0 .../{hardware => device}/kbdfans/KBD4x.cpp | 4 ++-- .../{hardware => device}/kbdfans/KBD4x.h | 14 +++++++------- .../{hardware => device}/key_indexes.h | 0 .../{hardware => device}/keyboardio/Model01.cpp | 2 +- .../{hardware => device}/keyboardio/Model01.h | 8 ++++---- .../{hardware => device}/olkb/Planck.cpp | 6 +++--- .../{hardware => device}/olkb/Planck.h | 16 ++++++++-------- .../softhruf/Splitography.cpp | 6 +++--- .../{hardware => device}/softhruf/Splitography.h | 16 ++++++++-------- .../{hardware => device}/technomancy/Atreus.cpp | 6 +++--- .../{hardware => device}/technomancy/Atreus.h | 14 +++++++------- .../{hardware => device}/technomancy/Atreus2.cpp | 4 ++-- .../{hardware => device}/technomancy/Atreus2.h | 12 ++++++------ 29 files changed, 88 insertions(+), 88 deletions(-) rename src/kaleidoscope/{hardware => device}/ATMegaKeyboard.cpp (98%) rename src/kaleidoscope/{hardware => device}/ATMegaKeyboard.h (99%) rename src/kaleidoscope/{hardware => device}/avr/pins_and_ports.h (100%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox.cpp (96%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox.h (95%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox/ErgoDoxScanner.cpp (94%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox/ErgoDoxScanner.h (95%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox/i2cmaster.cpp (99%) rename src/kaleidoscope/{hardware => device}/ez/ErgoDox/i2cmaster.h (100%) rename src/kaleidoscope/{hardware => device}/kbdfans/KBD4x.cpp (94%) rename src/kaleidoscope/{hardware => device}/kbdfans/KBD4x.h (86%) rename src/kaleidoscope/{hardware => device}/key_indexes.h (100%) rename src/kaleidoscope/{hardware => device}/keyboardio/Model01.cpp (99%) rename src/kaleidoscope/{hardware => device}/keyboardio/Model01.h (97%) rename src/kaleidoscope/{hardware => device}/olkb/Planck.cpp (87%) rename src/kaleidoscope/{hardware => device}/olkb/Planck.h (84%) rename src/kaleidoscope/{hardware => device}/softhruf/Splitography.cpp (89%) rename src/kaleidoscope/{hardware => device}/softhruf/Splitography.h (89%) rename src/kaleidoscope/{hardware => device}/technomancy/Atreus.cpp (92%) rename src/kaleidoscope/{hardware => device}/technomancy/Atreus.h (92%) rename src/kaleidoscope/{hardware => device}/technomancy/Atreus2.cpp (91%) rename src/kaleidoscope/{hardware => device}/technomancy/Atreus2.h (91%) diff --git a/src/Kaleidoscope-Hardware-EZ-ErgoDox.h b/src/Kaleidoscope-Hardware-EZ-ErgoDox.h index d769aba9..b6e180be 100644 --- a/src/Kaleidoscope-Hardware-EZ-ErgoDox.h +++ b/src/Kaleidoscope-Hardware-EZ-ErgoDox.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-EZ-ErgoDox -- ErgoDox hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * 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 @@ -17,4 +17,4 @@ */ #pragma once -#include "kaleidoscope/hardware/ez/ErgoDox.h" +#include "kaleidoscope/device/ez/ErgoDox.h" diff --git a/src/Kaleidoscope-Hardware-KBDFans-KBD4x.h b/src/Kaleidoscope-Hardware-KBDFans-KBD4x.h index 4490cf97..2fbc0fce 100644 --- a/src/Kaleidoscope-Hardware-KBDFans-KBD4x.h +++ b/src/Kaleidoscope-Hardware-KBDFans-KBD4x.h @@ -20,4 +20,4 @@ #define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1 -#include "kaleidoscope/hardware/kbdfans/KBD4x.h" +#include "kaleidoscope/device/kbdfans/KBD4x.h" diff --git a/src/Kaleidoscope-Hardware-Model01.h b/src/Kaleidoscope-Hardware-Model01.h index b2ef4ff6..d7849de6 100644 --- a/src/Kaleidoscope-Hardware-Model01.h +++ b/src/Kaleidoscope-Hardware-Model01.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-Model01 -- Keyboard.io Model01 hardware support for Kaleidoscope - * Copyright (C) 2017-2018 Keyboard.io, Inc + * Copyright (C) 2017-2019 Keyboard.io, Inc * * 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 the Free Software @@ -17,4 +17,4 @@ #pragma once -#include "kaleidoscope/hardware/keyboardio/Model01.h" +#include "kaleidoscope/device/keyboardio/Model01.h" diff --git a/src/Kaleidoscope-Hardware-OLKB-Planck.h b/src/Kaleidoscope-Hardware-OLKB-Planck.h index cfbd49af..f18a1811 100644 --- a/src/Kaleidoscope-Hardware-OLKB-Planck.h +++ b/src/Kaleidoscope-Hardware-OLKB-Planck.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-OLKB-Planck -- OLKB Planck hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * 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 @@ -19,4 +19,4 @@ #pragma once #define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1 -#include "kaleidoscope/hardware/olkb/Planck.h" +#include "kaleidoscope/device/olkb/Planck.h" diff --git a/src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h b/src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h index e6f1447b..cd02b5f9 100644 --- a/src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h +++ b/src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-SOFTHRUF-Splitography -- Splitography hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * 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 @@ -19,4 +19,4 @@ #pragma once #define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1 -#include "kaleidoscope/hardware/softhruf/Splitography.h" +#include "kaleidoscope/device/softhruf/Splitography.h" diff --git a/src/Kaleidoscope-Hardware-Technomancy-Atreus.h b/src/Kaleidoscope-Hardware-Technomancy-Atreus.h index cf6f010e..c4958a7d 100644 --- a/src/Kaleidoscope-Hardware-Technomancy-Atreus.h +++ b/src/Kaleidoscope-Hardware-Technomancy-Atreus.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-Technomancy-Atreus -- Atreus hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * 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 @@ -26,4 +26,4 @@ #define KALEIDOSCOPE_HARDWARE_ATREUS_PINOUT_ASTAR 1 #endif -#include "kaleidoscope/hardware/technomancy/Atreus.h" +#include "kaleidoscope/device/technomancy/Atreus.h" diff --git a/src/Kaleidoscope-Hardware-Technomancy-Atreus2.h b/src/Kaleidoscope-Hardware-Technomancy-Atreus2.h index a9c29eb1..b6b67b67 100644 --- a/src/Kaleidoscope-Hardware-Technomancy-Atreus2.h +++ b/src/Kaleidoscope-Hardware-Technomancy-Atreus2.h @@ -20,4 +20,4 @@ #define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1 -#include "kaleidoscope/hardware/technomancy/Atreus2.h" +#include "kaleidoscope/device/technomancy/Atreus2.h" diff --git a/src/kaleidoscope/hardware/ATMegaKeyboard.cpp b/src/kaleidoscope/device/ATMegaKeyboard.cpp similarity index 98% rename from src/kaleidoscope/hardware/ATMegaKeyboard.cpp rename to src/kaleidoscope/device/ATMegaKeyboard.cpp index c6aac7d5..5a552a5e 100644 --- a/src/kaleidoscope/hardware/ATMegaKeyboard.cpp +++ b/src/kaleidoscope/device/ATMegaKeyboard.cpp @@ -19,10 +19,10 @@ #if KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { uint8_t ATMegaKeyboard::debounce = 3; diff --git a/src/kaleidoscope/hardware/ATMegaKeyboard.h b/src/kaleidoscope/device/ATMegaKeyboard.h similarity index 99% rename from src/kaleidoscope/hardware/ATMegaKeyboard.h rename to src/kaleidoscope/device/ATMegaKeyboard.h index 5637dce4..938af929 100644 --- a/src/kaleidoscope/hardware/ATMegaKeyboard.h +++ b/src/kaleidoscope/device/ATMegaKeyboard.h @@ -25,7 +25,7 @@ #include "kaleidoscope/MatrixAddr.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/avr/pins_and_ports.h" +#include "kaleidoscope/device/avr/pins_and_ports.h" #include @@ -134,7 +134,7 @@ struct cRGB { } namespace kaleidoscope { -namespace hardware { +namespace device { class ATMegaKeyboard : public kaleidoscope::Hardware { public: ATMegaKeyboard(void) {} diff --git a/src/kaleidoscope/hardware/avr/pins_and_ports.h b/src/kaleidoscope/device/avr/pins_and_ports.h similarity index 100% rename from src/kaleidoscope/hardware/avr/pins_and_ports.h rename to src/kaleidoscope/device/avr/pins_and_ports.h diff --git a/src/kaleidoscope/hardware/ez/ErgoDox.cpp b/src/kaleidoscope/device/ez/ErgoDox.cpp similarity index 96% rename from src/kaleidoscope/hardware/ez/ErgoDox.cpp rename to src/kaleidoscope/device/ez/ErgoDox.cpp index 77852f36..db3fc80b 100644 --- a/src/kaleidoscope/hardware/ez/ErgoDox.cpp +++ b/src/kaleidoscope/device/ez/ErgoDox.cpp @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-EZ-ErgoDox -- ErgoDox hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit 8cdb4a915) * (C) Jack Humbert, Erez Zukerman, Oleg Kostyuk @@ -29,10 +29,10 @@ #include #include #include -#include "kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h" +#include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace ez { ErgoDoxScanner ErgoDox::scanner_; @@ -264,6 +264,6 @@ uint8_t ErgoDox::pressedKeyswitchCount() { } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::ez::ErgoDox &ErgoDox = KeyboardHardware; +kaleidoscope::device::ez::ErgoDox &ErgoDox = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/ez/ErgoDox.h b/src/kaleidoscope/device/ez/ErgoDox.h similarity index 95% rename from src/kaleidoscope/hardware/ez/ErgoDox.h rename to src/kaleidoscope/device/ez/ErgoDox.h index 5e315d18..e6ebf3e5 100644 --- a/src/kaleidoscope/hardware/ez/ErgoDox.h +++ b/src/kaleidoscope/device/ez/ErgoDox.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-EZ-ErgoDox -- ErgoDox hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit 8cdb4a915) * (C) Jack Humbert, Erez Zukerman, Oleg Kostyuk @@ -29,9 +29,9 @@ #include -#include "kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h" +#include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h" -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::ez::ErgoDox +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::ez::ErgoDox #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" @@ -46,7 +46,7 @@ struct cRGB { #include "kaleidoscope/MatrixAddr.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace ez { class ErgoDox : public kaleidoscope::Hardware { @@ -156,8 +156,8 @@ class ErgoDox : public kaleidoscope::Hardware { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::ez::ErgoDox &ErgoDox; +extern kaleidoscope::device::ez::ErgoDox &ErgoDox; #endif diff --git a/src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.cpp b/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.cpp similarity index 94% rename from src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.cpp rename to src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.cpp index e7fcb9e3..660171c5 100644 --- a/src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.cpp +++ b/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.cpp @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-EZ-ErgoDox -- ErgoDox hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit 8cdb4a915) * (C) Jack Humbert, Erez Zukerman, Oleg Kostyuk @@ -25,10 +25,10 @@ #ifdef ARDUINO_AVR_ERGODOX -#include "kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h" +#include "kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h" #include -#include "kaleidoscope/hardware/avr/pins_and_ports.h" -#include "kaleidoscope/hardware/ez/ErgoDox/i2cmaster.h" +#include "kaleidoscope/device/avr/pins_and_ports.h" +#include "kaleidoscope/device/ez/ErgoDox/i2cmaster.h" #define I2C_ADDR 0b0100000 #define I2C_ADDR_WRITE ( (I2C_ADDR<<1) | I2C_WRITE ) @@ -43,7 +43,7 @@ #define OLATB 0x15 namespace kaleidoscope { -namespace hardware { +namespace device { namespace ez { uint8_t ErgoDoxScanner::initExpander() { diff --git a/src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h b/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h similarity index 95% rename from src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h rename to src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h index b5249655..77e74285 100644 --- a/src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h +++ b/src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-EZ-ErgoDox -- ErgoDox hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit 8cdb4a915) * (C) Jack Humbert, Erez Zukerman, Oleg Kostyuk @@ -30,7 +30,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace ez { class ErgoDoxScanner { diff --git a/src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.cpp b/src/kaleidoscope/device/ez/ErgoDox/i2cmaster.cpp similarity index 99% rename from src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.cpp rename to src/kaleidoscope/device/ez/ErgoDox/i2cmaster.cpp index 37ae1714..71400b84 100644 --- a/src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.cpp +++ b/src/kaleidoscope/device/ez/ErgoDox/i2cmaster.cpp @@ -12,7 +12,7 @@ #include #include -#include "kaleidoscope/hardware/ez/ErgoDox/i2cmaster.h" +#include "kaleidoscope/device/ez/ErgoDox/i2cmaster.h" /* define CPU frequency in Mhz here if not defined in Makefile */ diff --git a/src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.h b/src/kaleidoscope/device/ez/ErgoDox/i2cmaster.h similarity index 100% rename from src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.h rename to src/kaleidoscope/device/ez/ErgoDox/i2cmaster.h diff --git a/src/kaleidoscope/hardware/kbdfans/KBD4x.cpp b/src/kaleidoscope/device/kbdfans/KBD4x.cpp similarity index 94% rename from src/kaleidoscope/hardware/kbdfans/KBD4x.cpp rename to src/kaleidoscope/device/kbdfans/KBD4x.cpp index c6bf0507..5f776849 100644 --- a/src/kaleidoscope/hardware/kbdfans/KBD4x.cpp +++ b/src/kaleidoscope/device/kbdfans/KBD4x.cpp @@ -23,7 +23,7 @@ namespace kaleidoscope { -namespace hardware { +namespace device { namespace kbdfans { ATMEGA_KEYBOARD_DATA(KBD4x); @@ -57,6 +57,6 @@ void KBD4x::resetDevice() { } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::kbdfans::KBD4x &KBD4x = KeyboardHardware; +kaleidoscope::device::kbdfans::KBD4x &KBD4x = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/kbdfans/KBD4x.h b/src/kaleidoscope/device/kbdfans/KBD4x.h similarity index 86% rename from src/kaleidoscope/hardware/kbdfans/KBD4x.h rename to src/kaleidoscope/device/kbdfans/KBD4x.h index cd5dda9d..722e13a7 100644 --- a/src/kaleidoscope/hardware/kbdfans/KBD4x.h +++ b/src/kaleidoscope/device/kbdfans/KBD4x.h @@ -20,18 +20,18 @@ #ifdef ARDUINO_AVR_KBD4X #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::kbdfans::KBD4x +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::kbdfans::KBD4x #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/avr/pins_and_ports.h" +#include "kaleidoscope/device/avr/pins_and_ports.h" -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace kbdfans { -class KBD4x: public kaleidoscope::hardware::ATMegaKeyboard { +class KBD4x: public kaleidoscope::device::ATMegaKeyboard { public: KBD4x(void) { mcu_.disableJTAG(); @@ -67,8 +67,8 @@ class KBD4x: public kaleidoscope::hardware::ATMegaKeyboard { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::kbdfans::KBD4x &KBD4x; +extern kaleidoscope::device::kbdfans::KBD4x &KBD4x; #endif diff --git a/src/kaleidoscope/hardware/key_indexes.h b/src/kaleidoscope/device/key_indexes.h similarity index 100% rename from src/kaleidoscope/hardware/key_indexes.h rename to src/kaleidoscope/device/key_indexes.h diff --git a/src/kaleidoscope/hardware/keyboardio/Model01.cpp b/src/kaleidoscope/device/keyboardio/Model01.cpp similarity index 99% rename from src/kaleidoscope/hardware/keyboardio/Model01.cpp rename to src/kaleidoscope/device/keyboardio/Model01.cpp index 23ef0c00..917ec434 100644 --- a/src/kaleidoscope/hardware/keyboardio/Model01.cpp +++ b/src/kaleidoscope/device/keyboardio/Model01.cpp @@ -23,7 +23,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace keyboardio { KeyboardioScanner Model01::leftHand(0); diff --git a/src/kaleidoscope/hardware/keyboardio/Model01.h b/src/kaleidoscope/device/keyboardio/Model01.h similarity index 97% rename from src/kaleidoscope/hardware/keyboardio/Model01.h rename to src/kaleidoscope/device/keyboardio/Model01.h index 6ffeb7a2..47654935 100644 --- a/src/kaleidoscope/hardware/keyboardio/Model01.h +++ b/src/kaleidoscope/device/keyboardio/Model01.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-Model01 -- Keyboard.io Model01 hardware support for Kaleidoscope - * Copyright (C) 2017-2018 Keyboard.io, Inc + * Copyright (C) 2017-2019 Keyboard.io, Inc * * 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 the Free Software @@ -21,7 +21,7 @@ #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::keyboardio::Model01 +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::keyboardio::Model01 #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "KeyboardioScanner.h" @@ -33,7 +33,7 @@ #include "kaleidoscope/MatrixAddr.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace keyboardio { class Model01 : public kaleidoscope::Hardware { @@ -125,7 +125,7 @@ class Model01 : public kaleidoscope::Hardware { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" #define PER_KEY_DATA_STACKED(dflt, \ r0c0, r0c1, r0c2, r0c3, r0c4, r0c5, r0c6, \ diff --git a/src/kaleidoscope/hardware/olkb/Planck.cpp b/src/kaleidoscope/device/olkb/Planck.cpp similarity index 87% rename from src/kaleidoscope/hardware/olkb/Planck.cpp rename to src/kaleidoscope/device/olkb/Planck.cpp index 5597171f..697643fb 100644 --- a/src/kaleidoscope/hardware/olkb/Planck.cpp +++ b/src/kaleidoscope/device/olkb/Planck.cpp @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-OLKB-Planck -- Planck hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * This program is free software: you can redistribute it and/or modify * it under the terms of version 3 of the GNU General Public License as @@ -21,7 +21,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace olkb { ATMEGA_KEYBOARD_DATA(Planck); @@ -32,6 +32,6 @@ constexpr int8_t Planck::led_count; } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::olkb::Planck &Planck = KeyboardHardware; +kaleidoscope::device::olkb::Planck &Planck = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/olkb/Planck.h b/src/kaleidoscope/device/olkb/Planck.h similarity index 84% rename from src/kaleidoscope/hardware/olkb/Planck.h rename to src/kaleidoscope/device/olkb/Planck.h index 680527d6..ea9693fe 100644 --- a/src/kaleidoscope/hardware/olkb/Planck.h +++ b/src/kaleidoscope/device/olkb/Planck.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-OLKB-Planck -- Planck hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * This program is free software: you can redistribute it and/or modify * it under the terms of version 3 of the GNU General Public License as @@ -20,18 +20,18 @@ #ifdef ARDUINO_AVR_PLANCK #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::olkb::Planck +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::olkb::Planck #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/avr/pins_and_ports.h" +#include "kaleidoscope/device/avr/pins_and_ports.h" -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace olkb { -class Planck: public kaleidoscope::hardware::ATMegaKeyboard { +class Planck: public kaleidoscope::device::ATMegaKeyboard { public: Planck(void) {} @@ -63,8 +63,8 @@ class Planck: public kaleidoscope::hardware::ATMegaKeyboard { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::olkb::Planck &Planck; +extern kaleidoscope::device::olkb::Planck &Planck; #endif diff --git a/src/kaleidoscope/hardware/softhruf/Splitography.cpp b/src/kaleidoscope/device/softhruf/Splitography.cpp similarity index 89% rename from src/kaleidoscope/hardware/softhruf/Splitography.cpp rename to src/kaleidoscope/device/softhruf/Splitography.cpp index d646551e..74adcf17 100644 --- a/src/kaleidoscope/hardware/softhruf/Splitography.cpp +++ b/src/kaleidoscope/device/softhruf/Splitography.cpp @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-SOFTHRUF-Splitography -- Splitography hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit e9a67f8fd) and sdothum's fork (commit 8616b44) * (C) Jack Humbert, Jun Wako, Steven Hum, and others @@ -28,7 +28,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace softhruf { ATMEGA_KEYBOARD_DATA(Splitography); @@ -39,6 +39,6 @@ constexpr int8_t Splitography::led_count; } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::softhruf::Splitography &Splitography = KeyboardHardware; +kaleidoscope::device::softhruf::Splitography &Splitography = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/softhruf/Splitography.h b/src/kaleidoscope/device/softhruf/Splitography.h similarity index 89% rename from src/kaleidoscope/hardware/softhruf/Splitography.h rename to src/kaleidoscope/device/softhruf/Splitography.h index 0ab8f2cd..02bd05e0 100644 --- a/src/kaleidoscope/hardware/softhruf/Splitography.h +++ b/src/kaleidoscope/device/softhruf/Splitography.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-SOFTHRUF-Splitography -- Splitography hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit e9a67f8fd) and sdothum's fork (commit 8616b44) * (C) Jack Humbert, Jun Wako, Steven Hum, and others @@ -27,18 +27,18 @@ #ifdef ARDUINO_AVR_SPLITOGRAPHY #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::softhruf::Splitography +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::softhruf::Splitography #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/avr/pins_and_ports.h" +#include "kaleidoscope/device/avr/pins_and_ports.h" -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace softhruf { -class Splitography: public kaleidoscope::hardware::ATMegaKeyboard { +class Splitography: public kaleidoscope::device::ATMegaKeyboard { public: Splitography(void) { mcu_.disableJTAG(); @@ -88,8 +88,8 @@ class Splitography: public kaleidoscope::hardware::ATMegaKeyboard { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::softhruf::Splitography &Splitography; +extern kaleidoscope::device::softhruf::Splitography &Splitography; #endif diff --git a/src/kaleidoscope/hardware/technomancy/Atreus.cpp b/src/kaleidoscope/device/technomancy/Atreus.cpp similarity index 92% rename from src/kaleidoscope/hardware/technomancy/Atreus.cpp rename to src/kaleidoscope/device/technomancy/Atreus.cpp index 61a7c375..41195cfe 100644 --- a/src/kaleidoscope/hardware/technomancy/Atreus.cpp +++ b/src/kaleidoscope/device/technomancy/Atreus.cpp @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-Technomancy-Atreus -- Atreus hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit e9a67f8fd) * (C) Jack Humbert, Phil Hagelberg, and others @@ -30,7 +30,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace technomancy { ATMEGA_KEYBOARD_DATA(Atreus); @@ -77,6 +77,6 @@ void Atreus::resetDevice() { } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::technomancy::Atreus &Atreus = KeyboardHardware; +kaleidoscope::device::technomancy::Atreus &Atreus = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/technomancy/Atreus.h b/src/kaleidoscope/device/technomancy/Atreus.h similarity index 92% rename from src/kaleidoscope/hardware/technomancy/Atreus.h rename to src/kaleidoscope/device/technomancy/Atreus.h index 46900f68..7b3be9ec 100644 --- a/src/kaleidoscope/hardware/technomancy/Atreus.h +++ b/src/kaleidoscope/device/technomancy/Atreus.h @@ -1,6 +1,6 @@ /* -*- mode: c++ -*- * Kaleidoscope-Hardware-Technomancy-Atreus -- Atreus hardware support for Kaleidoscope - * Copyright (C) 2018 Keyboard.io, Inc + * Copyright (C) 2018, 2019 Keyboard.io, Inc * * Based on QMK (commit e9a67f8fd) * (C) Jack Humbert, Jun Wako, Phil Hagelberg, and others @@ -27,17 +27,17 @@ #ifdef ARDUINO_AVR_ATREUS #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::technomancy::Atreus +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::technomancy::Atreus #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace technomancy { -class Atreus: public kaleidoscope::hardware::ATMegaKeyboard { +class Atreus: public kaleidoscope::device::ATMegaKeyboard { friend class ATMegaKeyboard; public: Atreus(void) {} @@ -105,8 +105,8 @@ class Atreus: public kaleidoscope::hardware::ATMegaKeyboard { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::technomancy::Atreus &Atreus; +extern kaleidoscope::device::technomancy::Atreus &Atreus; #endif diff --git a/src/kaleidoscope/hardware/technomancy/Atreus2.cpp b/src/kaleidoscope/device/technomancy/Atreus2.cpp similarity index 91% rename from src/kaleidoscope/hardware/technomancy/Atreus2.cpp rename to src/kaleidoscope/device/technomancy/Atreus2.cpp index f7da0cf1..8198fe86 100644 --- a/src/kaleidoscope/hardware/technomancy/Atreus2.cpp +++ b/src/kaleidoscope/device/technomancy/Atreus2.cpp @@ -22,7 +22,7 @@ #include namespace kaleidoscope { -namespace hardware { +namespace device { namespace technomancy { ATMEGA_KEYBOARD_DATA(Atreus2); @@ -33,6 +33,6 @@ constexpr int8_t Atreus2::led_count; } HARDWARE_IMPLEMENTATION KeyboardHardware; -kaleidoscope::hardware::technomancy::Atreus2 &Atreus2 = KeyboardHardware; +kaleidoscope::device::technomancy::Atreus2 &Atreus2 = KeyboardHardware; #endif diff --git a/src/kaleidoscope/hardware/technomancy/Atreus2.h b/src/kaleidoscope/device/technomancy/Atreus2.h similarity index 91% rename from src/kaleidoscope/hardware/technomancy/Atreus2.h rename to src/kaleidoscope/device/technomancy/Atreus2.h index a61f6930..8c23fc37 100644 --- a/src/kaleidoscope/hardware/technomancy/Atreus2.h +++ b/src/kaleidoscope/device/technomancy/Atreus2.h @@ -21,17 +21,17 @@ #ifdef ARDUINO_AVR_ATREUS2 #include -#define HARDWARE_IMPLEMENTATION kaleidoscope::hardware::technomancy::Atreus2 +#define HARDWARE_IMPLEMENTATION kaleidoscope::device::technomancy::Atreus2 #include "Kaleidoscope-HIDAdaptor-KeyboardioHID.h" #include "kaleidoscope/macro_helpers.h" -#include "kaleidoscope/hardware/ATMegaKeyboard.h" +#include "kaleidoscope/device/ATMegaKeyboard.h" namespace kaleidoscope { -namespace hardware { +namespace device { namespace technomancy { -class Atreus2: public kaleidoscope::hardware::ATMegaKeyboard { +class Atreus2: public kaleidoscope::device::ATMegaKeyboard { friend class ATMegaKeyboard; public: Atreus2(void) {} @@ -82,8 +82,8 @@ class Atreus2: public kaleidoscope::hardware::ATMegaKeyboard { } } -#include "kaleidoscope/hardware/key_indexes.h" +#include "kaleidoscope/device/key_indexes.h" -extern kaleidoscope::hardware::technomancy::Atreus2 &Atreus2; +extern kaleidoscope::device::technomancy::Atreus2 &Atreus2; #endif