~ruther/qmk_firmware

02104270ede94f68b999d9a8fe5e6c02dd8bb2e0 — QMK Bot 3 years ago c397720 + 773124e
Merge remote-tracking branch 'origin/master' into develop
M keyboards/converter/a1200/keymaps/default/keymap.c => keyboards/converter/a1200/keymaps/default/keymap.c +2 -2
@@ 21,8 21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
	
	 KC_GRV,  KC_1,    KC_2,  KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,   KC_MINS, KC_EQL, KC_BSLS, KC_BSPC,    KC_DEL, MO(1),                      KC_LPRN, KC_RPRN, KC_PSLS, KC_PAST, 
	 KC_TAB,           KC_Q,  KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_LBRC, KC_RBRC,                                                KC_P7,   KC_P8,   KC_P9,   KC_PMNS, 
	 KC_LCTL, KC_CAPS, KC_A,  KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_NO, KC_ENT,             KC_UP,                       KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
     KC_LSFT, KC_NO,   KC_Z,  KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,       KC_RSFT,             KC_LEFT, KC_DOWN, KC_RGHT,            KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
	 KC_LCTL, KC_CAPS, KC_A,  KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_NUHS,KC_ENT,             KC_UP,                       KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
     KC_LSFT, KC_NUBS, KC_Z,  KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,       KC_RSFT,             KC_LEFT, KC_DOWN, KC_RGHT,            KC_P1,   KC_P2,   KC_P3,   KC_PENT, 
	          KC_LALT, KC_LGUI,                KC_SPC,                       KC_RGUI, KC_RALT,                                                               KC_P0,            KC_PDOT
	),
	

A keyboards/converter/a1200/mistress1200/config.h => keyboards/converter/a1200/mistress1200/config.h +61 -0
@@ 0,0 1,61 @@
/*
Copyright 2021 8bits4ever

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 <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID       0xFFFF
#define PRODUCT_ID      0x0000
#define DEVICE_VER      0x0001
#define MANUFACTURER    8bits4ever
#define PRODUCT         MiSTress1200

/* key matrix size */
#define MATRIX_ROWS 8
#define MATRIX_COLS 16

/*
 * 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 { F7, F6, F5, F4, F1, F0, B1, B3 }
#define MATRIX_COL_PINS { D0, D1, C7, D6, B7, B6, B5, B4, E6, D7, C6, D4, B2, D5, D3, D2 }
#define UNUSED_PINS

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION ROW2COL

#define LED_CAPS_LOCK_PIN B0
#define LED_PIN_ON_STATE 0

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


/* disable action features */
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT


A keyboards/converter/a1200/mistress1200/rules.mk => keyboards/converter/a1200/mistress1200/rules.mk +19 -0
@@ 0,0 1,19 @@
# MCU name
MCU = atmega16u4

# Bootloader selection
BOOTLOADER = atmel-dfu

# Build Options
#   change yes to no to disable
#
BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
MOUSEKEY_ENABLE = no        # Mouse keys
EXTRAKEY_ENABLE = no       # Audio control and System control
CONSOLE_ENABLE = no         # Console for debug
COMMAND_ENABLE = no        # Commands for debug and configuration
NKRO_ENABLE = no           # Enable N-Key Rollover
BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
AUDIO_ENABLE = no           # Audio output
LTO_ENABLE = yes

M keyboards/converter/a1200/readme.md => keyboards/converter/a1200/readme.md +8 -3
@@ 3,12 3,12 @@
Modification of the Model-M 101 membrane adapter (converter/modelm101) to work with Amiga 1200 keyboard (and possibly Amiga 500/600 too). 
The adapter allows using the original Amiga keyboard as a USB input device, either with a desktop PC or a R-Pi/FPGA board hosted inside the Amiga case.

Available for two micros: AT90USB1286 (Teensy 2++ board), and ATmega32u4 (MiSS-1200 FPGA board).
Available for three micros: AT90USB1286 (Teensy 2++ board), Atmega32u4 (MiSS-1200 FPGA board), and Atmega16u4 (MiSTress-1200 conversion kit).

A small PCB adapter is needed for connecting the keyboard membrane to the Teensy 2.0++ board. A very simple example of such a board is available here:
https://github.com/8bits4ever/A1200-Keyboard-Adapter

The MiSS-1200 FPGA board features a dedicated connector for the Amiga 1200 membrane keyboard.
The MiSS-1200 FPGA board and MiSTress-1200 conversion kit both feature a dedicated connector for the Amiga 1200 membrane keyboard.

Files have been modified in accordance to the Amiga keyboard layout and features. A second layer has been implemented (momentary toggle "Help" key) to access unexistent keys (like F11 and F12). This is a work in progress.



@@ 25,7 25,7 @@ Status LEDs: CapsLock +5V
Pins:        B6       5V    
```  

Pins assignment MiSS-1200 board (ATmega32u4):
Pins assignment MiSS-1200 board (ATmega32u4) and MiSTress-1200 (Atmega16u4):
```  
Columns: 1  2  3  4  5  6  7  8  9  10 11 12 13 14 15 16  
Pins:    D0 D1 C7 D6 B7 B6 B5 B4 E6 D7 C6 D4 B2 D5 D3 D2 


@@ 51,5 51,10 @@ Or:

    make converter/a1200/miss1200:default

Or:

    make converter/a1200/mistress1200:default    
    


See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).