summaryrefslogtreecommitdiff
path: root/keyboards/maxipad
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/maxipad')
-rw-r--r--keyboards/maxipad/Makefile80
-rw-r--r--keyboards/maxipad/config.h6
-rw-r--r--keyboards/maxipad/keymaps/default/keymap.c5
-rw-r--r--keyboards/maxipad/readme.md18
4 files changed, 108 insertions, 1 deletions
diff --git a/keyboards/maxipad/Makefile b/keyboards/maxipad/Makefile
index 4e2a6f00fd..c65665142a 100644
--- a/keyboards/maxipad/Makefile
+++ b/keyboards/maxipad/Makefile
@@ -1,3 +1,81 @@
+<<<<<<< HEAD
ifndef MAKEFILE_INCLUDED
include ../../Makefile
-endif \ No newline at end of file
+endif
+=======
+
+
+# MCU name
+#MCU = at90usb1287
+MCU = atmega32u4
+
+# Processor frequency.
+# This will define a symbol, F_CPU, in all source code files equal to the
+# processor frequency in Hz. You can then use this symbol in your source code to
+# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+# automatically to create a 32-bit value in your source code.
+#
+# This will be an integer division of F_USB below, as it is sourced by
+# F_USB after it has run through any CPU prescalers. Note that this value
+# does not *change* the processor frequency - it should merely be updated to
+# reflect the processor speed set externally so that the code can use accurate
+# software delays.
+F_CPU = 16000000
+
+
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+
+# Input clock frequency.
+# This will define a symbol, F_USB, in all source code files equal to the
+# input clock frequency (before any prescaling is performed) in Hz. This value may
+# differ from F_CPU if prescaling is used on the latter, and is required as the
+# raw input clock is fed directly to the PLL sections of the AVR for high speed
+# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+# at the end, this will be done automatically to create a 32-bit value in your
+# source code.
+#
+# If no clock division is performed on the input clock inside the AVR (via the
+# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+
+
+# Boot Section Size in *bytes*
+# Teensy halfKay 512
+# Teensy++ halfKay 1024
+# Atmel DFU loader 4096
+# LUFA bootloader 4096
+# USBaspLoader 2048
+OPT_DEFS += -DBOOTLOADER_SIZE=512
+
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
+CONSOLE_ENABLE ?= yes # Console for debug(+400)
+COMMAND_ENABLE ?= yes # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE ?= no # USB Nkey Rollover
+BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE ?= no # MIDI controls
+UNICODE_ENABLE ?= no # Unicode
+BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE ?= no # Audio output on port C6
+
+ifndef QUANTUM_DIR
+ include ../../Makefile
+endif
+
+
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
diff --git a/keyboards/maxipad/config.h b/keyboards/maxipad/config.h
index 2462a5cfda..4a942aae94 100644
--- a/keyboards/maxipad/config.h
+++ b/keyboards/maxipad/config.h
@@ -24,9 +24,15 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x6060
#define DEVICE_VER 0x0001
+<<<<<<< HEAD
#define MANUFACTURER You
#define PRODUCT maxipad
#define DESCRIPTION A custom keyboard
+=======
+#define MANUFACTURER Wootpatoot
+#define PRODUCT maxipad
+#define DESCRIPTION g8ming keeb
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/maxipad/keymaps/default/keymap.c b/keyboards/maxipad/keymaps/default/keymap.c
index 8a9bc4f0d4..5e3a594ccd 100644
--- a/keyboards/maxipad/keymaps/default/keymap.c
+++ b/keyboards/maxipad/keymaps/default/keymap.c
@@ -10,8 +10,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = KEYMAP(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, \
+<<<<<<< HEAD
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, \
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, \
+=======
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS \
),
diff --git a/keyboards/maxipad/readme.md b/keyboards/maxipad/readme.md
index e722b66022..1971ce1f36 100644
--- a/keyboards/maxipad/readme.md
+++ b/keyboards/maxipad/readme.md
@@ -3,7 +3,11 @@ maxipad keyboard firmware
## Quantum MK Firmware
+<<<<<<< HEAD
For the full Quantum feature list, see [the parent readme](/).
+=======
+For the full Quantum feature list, see [the parent readme.md](/doc/readme.md).
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
## Building
@@ -13,12 +17,17 @@ Depending on which keymap you would like to use, you will have to compile slight
### Default
+<<<<<<< HEAD
To build with the default keymap, simply run `make default`.
+=======
+To build with the default keymap, simply run `make`.
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df
### Other Keymaps
Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create a folder with the name of your keymap in the keymaps folder, and see keymap documentation (you can find in top readme.md) and existant keymap files.
+<<<<<<< HEAD
To build the firmware binary hex file with a keymap just do `make` with a keymap like this:
```
@@ -26,3 +35,12 @@ $ make [default|jack|<name>]
```
Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder.
+=======
+To build the firmware binary hex file with a keymap just do `make` with `keymap` option like:
+
+```
+$ make keymap=[default|jack|<name>]
+```
+
+Keymaps follow the format **__keymap.c__** and are stored in folders in the `keymaps` folder, eg `keymaps/my_keymap/`
+>>>>>>> bce6e52391da7c5f620c96a91857940f0dee19df