Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model f labs f62 #21193

Open
wants to merge 31 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
26b0526
fetch of upstearm
matthew-wolf-n4mtt Jun 9, 2023
aea1b35
initial stuff for f62
matthew-wolf-n4mtt Jun 9, 2023
240d8a7
forgotten items
matthew-wolf-n4mtt Jun 9, 2023
edbe9ab
added copyright
matthew-wolf-n4mtt Jun 9, 2023
8ef8e6e
revert submodule changes
matthew-wolf-n4mtt Jun 9, 2023
8989f16
simple removal
matthew-wolf-n4mtt Jul 5, 2023
db3a0c5
restore f62 via keymap config.h
matthew-wolf-n4mtt Jul 5, 2023
95c3f4a
picture image hosting
matthew-wolf-n4mtt Jul 5, 2023
7fac33a
post qmk migrate
matthew-wolf-n4mtt Jul 5, 2023
d1af7b1
remove ../../post_config.h
matthew-wolf-n4mtt Jul 6, 2023
684a3dc
Remove extra via layer
matthew-wolf-n4mtt Jul 6, 2023
1eb680b
correct image link
matthew-wolf-n4mtt Jul 6, 2023
867d79b
2nd set of updates for F62 pull
matthew-wolf-n4mtt Jul 15, 2023
cc0c8de
F62 wcass config.h and rules.mk update
matthew-wolf-n4mtt Aug 5, 2023
3648b62
F62 - removed wcass.h
matthew-wolf-n4mtt Sep 24, 2023
74930d9
F62: BootMagic conf cleanup
matthew-wolf-n4mtt Sep 24, 2023
c95d992
F62: Move Haptic enable to rules.mk
matthew-wolf-n4mtt Sep 24, 2023
eec663a
F62: Does the CI build like "HAPTIC_DRIVER = solenoid" in lower case?
matthew-wolf-n4mtt Sep 24, 2023
7d58907
F62: Comments removed, keymap formating
matthew-wolf-n4mtt Sep 25, 2023
7367ed3
qmk format-c
matthew-wolf-n4mtt Nov 24, 2023
e0b03ea
Merge branch 'master' into model_f_labs
matthew-wolf-n4mtt Dec 1, 2023
41f2eb9
Update source location in rules.mk
matthew-wolf-n4mtt Dec 5, 2023
5c46bb1
Merge branch 'master' into model_f_labs
matthew-wolf-n4mtt Dec 5, 2023
e8143c9
Clean up of make system files
matthew-wolf-n4mtt Dec 10, 2023
a0f23ff
fix haptic / solenoid
matthew-wolf-n4mtt Dec 18, 2023
e176cc6
restore correct haptic driver
matthew-wolf-n4mtt Dec 21, 2023
f591531
Merge remote-tracking branch 'origin/master' into model_f_labs
matthew-wolf-n4mtt Dec 21, 2023
ea28ab5
util header cleaning
matthew-wolf-n4mtt Dec 27, 2023
43af4f2
Second reviewer info.json clean up.
matthew-wolf-n4mtt Jan 1, 2024
fbc343d
Community Layout Names
matthew-wolf-n4mtt Jan 7, 2024
9f0b6d7
Boot loader details added to readme.md
matthew-wolf-n4mtt Mar 16, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
post qmk migrate
  • Loading branch information
matthew-wolf-n4mtt committed Jul 5, 2023
commit 7fac33afa5237f4d8a52485e03a0988fec6232a0
6 changes: 0 additions & 6 deletions keyboards/model_f_labs/f62/wcass/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
*/
#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
Expand Down Expand Up @@ -118,8 +114,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// assignments are disabled by default.
// Instead the more common Num Lock and Caps Lock are assigned the following
// way by default, and this can be used in combination with the solenoid:
#define LED_NUM_LOCK_PIN B4
#define LED_CAPS_LOCK_PIN B5

// Uncomment below if the leds are on when the pin is driving zero:
//#define LED_NUM_LOCK_ACTIVE_LOW
Expand Down
36 changes: 27 additions & 9 deletions keyboards/model_f_labs/f62/wcass/info.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,28 @@
{
"keyboard_name": "Reproduction IBM F62 Keyboard",
"manufacturer": "Model F Labs",
"url": "https://www.modelfkeyboards.com/",
"usb": {
"vid": "0x1209",
"pid": "0x6262",
"device_version": "0.0.1"
}
}
"manufacturer": "Model F Labs",
"keyboard_name": "Reproduction IBM F62 Keyboard",
"bootloader": "atmel-dfu",
"bootmagic": {
"enabled": false
},
"build": {
"lto": true
},
"indicators": {
"caps_lock": "B5",
"num_lock": "B4"
},
"mouse_key": {
"enabled": true
},
"processor": "atmega32u2",
"split": {
"soft_serial_pin": "D0"
},
drashna marked this conversation as resolved.
Show resolved Hide resolved
"url": "https://www.modelfkeyboards.com/",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

already defined in info.json of directory above

Suggested change
"url": "https://www.modelfkeyboards.com/",

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed

"usb": {
"device_version": "0.0.1",
"pid": "0x6262",
"vid": "0x1209"
}
}
5 changes: 0 additions & 5 deletions keyboards/model_f_labs/f62/wcass/rules.mk
drashna marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.

# MCU name
MCU = atmega32u2

# Bootloader selection
# Teensy halfkay
Expand All @@ -25,13 +24,10 @@ MCU = atmega32u2
# QMK DFU qmk-dfu
# ATmega32A bootloadHID
# ATmega328P USBasp
BOOTLOADER = atmel-dfu

# Build Options
# change yes to no to disable
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = no # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
Expand All @@ -47,7 +43,6 @@ AUDIO_ENABLE = no # Audio output on port C6
FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
HD44780_ENABLE = no # Enable support for HD44780 based LCDs
RAW_ENABLE = yes
LTO_ENABLE = yes # Link Time Optimization - reduces file size
HAPTIC_ENABLE = yes
HAPTIC_DRIVER = SOLENOID

Expand Down