From ffd8ff642d4257fa588d9f42144d923bd570bbbd Mon Sep 17 00:00:00 2001 From: Alexander Tulloh Date: Mon, 11 Jan 2021 14:13:47 +1100 Subject: [Keyboard] Oddball keyboard and optical sensor update (#10450) * Add oddballl v2 - add CPI options - add scroll support - add click-and-drag support - PMW3360 implementation - ADNS9800 improvements * Set default make directory * Update readme with PMW config * Change bootloader * Update unused pins on v2 * Remove diode switch * Move bootloader selection to keyboard version level * Change default keyboard folder to v1 * Move sensor selection to keymap * Remove PK debounce * Change to only send mouse report on change * Change CPI function cpi type * Remove EEPROM state check * Update CPI to only change on key down * Fix incorrect F8 in keymap * Add v2.1 with more convenient controller pinout * Add keyboard readmes * Update keyboards/oddball/pmw/pmw3360_srom_0x04.h Remove direct AVR reference Co-authored-by: Ryan * Remove direct AVR reference Co-authored-by: Ryan Co-authored-by: Alexander Tulloh Co-authored-by: Ryan --- keyboards/oddball/v2/config.h | 31 +++++++++++++++++++++++++++++++ keyboards/oddball/v2/readme.md | 12 ++++++++++++ keyboards/oddball/v2/rules.mk | 2 ++ keyboards/oddball/v2/v2.c | 17 +++++++++++++++++ keyboards/oddball/v2/v2.h | 19 +++++++++++++++++++ 5 files changed, 81 insertions(+) create mode 100644 keyboards/oddball/v2/config.h create mode 100644 keyboards/oddball/v2/readme.md create mode 100644 keyboards/oddball/v2/rules.mk create mode 100644 keyboards/oddball/v2/v2.c create mode 100644 keyboards/oddball/v2/v2.h (limited to 'keyboards/oddball/v2') diff --git a/keyboards/oddball/v2/config.h b/keyboards/oddball/v2/config.h new file mode 100644 index 0000000000..9ba3bb8dfb --- /dev/null +++ b/keyboards/oddball/v2/config.h @@ -0,0 +1,31 @@ +/* Copyright 2020 Alexander Tulloh + * + * 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 Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +/* + * Keyboard Matrix Assignments + * + * Change this to how you wired your keyboard + * COLS: AVR pins used for columns, left to right + * ROWS: AVR pins used for rows, top to bottom + * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) + * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) + * + */ +#define MATRIX_ROW_PINS { D4, E6, D7, C6 } +#define MATRIX_COL_PINS { B7, B5, B4, F5, F6, F7 } +#define UNUSED_PINS { D3, D5, C7, F1, F0, B6, F4 } diff --git a/keyboards/oddball/v2/readme.md b/keyboards/oddball/v2/readme.md new file mode 100644 index 0000000000..98f02a1f00 --- /dev/null +++ b/keyboards/oddball/v2/readme.md @@ -0,0 +1,12 @@ +# Oddball v2 + +Make examples for this keyboard (after setting up your build environment): + +``` +# with ADNS sensor +make oddball/v2:default +``` +``` +# with PMW sensor +make oddball/v2:pmw3360 +``` diff --git a/keyboards/oddball/v2/rules.mk b/keyboards/oddball/v2/rules.mk new file mode 100644 index 0000000000..94a167143c --- /dev/null +++ b/keyboards/oddball/v2/rules.mk @@ -0,0 +1,2 @@ +# Elite C +BOOTLOADER = qmk-dfu diff --git a/keyboards/oddball/v2/v2.c b/keyboards/oddball/v2/v2.c new file mode 100644 index 0000000000..319592b53d --- /dev/null +++ b/keyboards/oddball/v2/v2.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Alexander Tulloh + * + * 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 Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "v2.h" diff --git a/keyboards/oddball/v2/v2.h b/keyboards/oddball/v2/v2.h new file mode 100644 index 0000000000..08df4a7975 --- /dev/null +++ b/keyboards/oddball/v2/v2.h @@ -0,0 +1,19 @@ +/* Copyright 2020 Alexander Tulloh + * + * 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 Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "oddball.h" -- cgit v1.2.1