alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move hardware plugins to kaleidoscope::device

Browse Source 
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 <algernon@keyboard.io>
pull/710/head
Gergely Nagy 5 years ago
parent 97d35f432a
commit b233867d9f
No known key found for this signature in database
GPG Key ID: AC1E90BAC433F68F
29 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File

4
src/Kaleidoscope-Hardware-EZ-ErgoDox.h
Unescape View File

@ -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"

2
src/Kaleidoscope-Hardware-KBDFans-KBD4x.h
Unescape View File

@ -20,4 +20,4 @@
#define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1
#include "kaleidoscope/hardware/kbdfans/KBD4x.h"
#include "kaleidoscope/device/kbdfans/KBD4x.h"

4
src/Kaleidoscope-Hardware-Model01.h
Unescape View File

@ -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"

4
src/Kaleidoscope-Hardware-OLKB-Planck.h
Unescape View File

@ -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"

4
src/Kaleidoscope-Hardware-SOFTHRUF-Splitography.h
Unescape View File

@ -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"

4
src/Kaleidoscope-Hardware-Technomancy-Atreus.h
Unescape View File

@ -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"

2
src/Kaleidoscope-Hardware-Technomancy-Atreus2.h
Unescape View File

@ -20,4 +20,4 @@
#define KALEIDOSCOPE_WITH_ATMEGA_KEYBOARD 1
#include "kaleidoscope/hardware/technomancy/Atreus2.h"
#include "kaleidoscope/device/technomancy/Atreus2.h"

4
src/kaleidoscope/hardware/ATMegaKeyboard.cpp → src/kaleidoscope/device/ATMegaKeyboard.cpp
Unescape View File

@ -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;

4
src/kaleidoscope/hardware/ATMegaKeyboard.h → src/kaleidoscope/device/ATMegaKeyboard.h
Unescape View File

@ -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 <avr/wdt.h>
@ -134,7 +134,7 @@ struct cRGB {
}
namespace kaleidoscope {
namespace hardware {
namespace device {
class ATMegaKeyboard : public kaleidoscope::Hardware {
public:
ATMegaKeyboard(void) {}

0
src/kaleidoscope/hardware/avr/pins_and_ports.h → src/kaleidoscope/device/avr/pins_and_ports.h
Unescape View File

8
src/kaleidoscope/hardware/ez/ErgoDox.cpp → src/kaleidoscope/device/ez/ErgoDox.cpp
Unescape View File

@ -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 <Kaleidoscope.h>
#include <KeyboardioHID.h>
#include <avr/wdt.h>
#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

12
src/kaleidoscope/hardware/ez/ErgoDox.h → src/kaleidoscope/device/ez/ErgoDox.h
Unescape View File

@ -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 <Arduino.h>
#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

10
src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.cpp → src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.cpp
Unescape View File

@ -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 <avr/wdt.h>
#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() {

4
src/kaleidoscope/hardware/ez/ErgoDox/ErgoDoxScanner.h → src/kaleidoscope/device/ez/ErgoDox/ErgoDoxScanner.h
Unescape View File

@ -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 <Arduino.h>
namespace kaleidoscope {
namespace hardware {
namespace device {
namespace ez {
class ErgoDoxScanner {

2
src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.cpp → src/kaleidoscope/device/ez/ErgoDox/i2cmaster.cpp
Unescape View File

@ -12,7 +12,7 @@
#include <inttypes.h>
#include <compat/twi.h>
#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 */

0
src/kaleidoscope/hardware/ez/ErgoDox/i2cmaster.h → src/kaleidoscope/device/ez/ErgoDox/i2cmaster.h
Unescape View File

4
src/kaleidoscope/hardware/kbdfans/KBD4x.cpp → src/kaleidoscope/device/kbdfans/KBD4x.cpp
Unescape View File

@ -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

14
src/kaleidoscope/hardware/kbdfans/KBD4x.h → src/kaleidoscope/device/kbdfans/KBD4x.h
Unescape View File

@ -20,18 +20,18 @@
#ifdef ARDUINO_AVR_KBD4X
#include <Arduino.h>
#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

0
src/kaleidoscope/hardware/key_indexes.h → src/kaleidoscope/device/key_indexes.h
Unescape View File

2
src/kaleidoscope/hardware/keyboardio/Model01.cpp → src/kaleidoscope/device/keyboardio/Model01.cpp
Unescape View File

@ -23,7 +23,7 @@
#include <avr/wdt.h>
namespace kaleidoscope {
namespace hardware {
namespace device {
namespace keyboardio {
KeyboardioScanner Model01::leftHand(0);

8
src/kaleidoscope/hardware/keyboardio/Model01.h → src/kaleidoscope/device/keyboardio/Model01.h
Unescape View File

@ -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 <Arduino.h>
#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, \

6
src/kaleidoscope/hardware/olkb/Planck.cpp → src/kaleidoscope/device/olkb/Planck.cpp
Unescape View File

@ -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 <avr/wdt.h>
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

16
src/kaleidoscope/hardware/olkb/Planck.h → src/kaleidoscope/device/olkb/Planck.h
Unescape View File

@ -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 <Arduino.h>
#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

6
src/kaleidoscope/hardware/softhruf/Splitography.cpp → src/kaleidoscope/device/softhruf/Splitography.cpp
Unescape View File

@ -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 <avr/wdt.h>
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

16
src/kaleidoscope/hardware/softhruf/Splitography.h → src/kaleidoscope/device/softhruf/Splitography.h
Unescape View File

@ -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 <Arduino.h>
#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

6
src/kaleidoscope/hardware/technomancy/Atreus.cpp → src/kaleidoscope/device/technomancy/Atreus.cpp
Unescape View File

@ -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 <avr/wdt.h>
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

14
src/kaleidoscope/hardware/technomancy/Atreus.h → src/kaleidoscope/device/technomancy/Atreus.h
Unescape View File

@ -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 <Arduino.h>
#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

4
src/kaleidoscope/hardware/technomancy/Atreus2.cpp → src/kaleidoscope/device/technomancy/Atreus2.cpp
Unescape View File

@ -22,7 +22,7 @@
#include <avr/wdt.h>
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

12
src/kaleidoscope/hardware/technomancy/Atreus2.h → src/kaleidoscope/device/technomancy/Atreus2.h
Unescape View File

@ -21,17 +21,17 @@
#ifdef ARDUINO_AVR_ATREUS2
#include <Arduino.h>
#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
Write Preview
Loading…
Cancel
Save