~ruther/qmk_firmware

8cd6cfcb77b5e90c1ad77486171049c436183175 — Daniel H Klein 6 years ago 918a52d
[Keyboard] Unigo66 beta pcb added, bug fixes for flashing (#5108)

* UniGo66 keyboard added

* UniGo66 keyboard added

* case correction of unigo66 files

* create sirius folder

* Update keyboards/sirius/unigo66/rules.mk

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/danielhklein/keymap.c

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/default/config.h

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* Update keyboards/sirius/unigo66/keymaps/danielhklein/config.h

Co-Authored-By: danielhklein <danielklein@utexas.edu>

* debugging

* correct keymap to layout

* readme

* remove common config

* suggested changes to config.h

* default keymap cleanup

* bug fixes

* beta user pcb added, flashing fixed

* syntax fix

* updated info.json

* fix spelling

* fix readme
D keyboards/sirius/unigo66/README.md => keyboards/sirius/unigo66/README.md +0 -17
@@ 1,17 0,0 @@
# UniGo66

![UniGo66](https://i.imgur.com/ZKlcncg.png)

The UniGo66 is an ergonomic wireless keyboard designed by Sirius and manufactured by ALF Studios. 

Join ALF Studios on [Discord](https://discord.gg/GJ8bdM)

Make example:

	make sirius/unigo66: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).

To get the U2U into DFU flashing mode, insert the U2U into the computer and press the button in the red circle shown below

![U2U](https://i.imgur.com/WKwgDjZ.png)
\ No newline at end of file

M keyboards/sirius/unigo66/config.h => keyboards/sirius/unigo66/config.h +3 -4
@@ 20,14 20,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
#define CUSTOM_MATRIX 2

/* USB Device descriptor parameter */
#define VENDOR_ID       0x5369
#define PRODUCT_ID      0x005B
#define DEVICE_VER      0x0814
#define VENDOR_ID       0xFEED
#define PRODUCT_ID      0x1001
#define DEVICE_VER      0x1901
#define MANUFACTURER    Sirius
#define PRODUCT         UniGo66
#define DESCRIPTION     UniGo66 Wireless Split keyboard


/* size of virtual matrix */
#define MATRIX_ROWS 16
#define MATRIX_COLS 16

M keyboards/sirius/unigo66/info.json => keyboards/sirius/unigo66/info.json +71 -1
@@ 76,6 76,76 @@
                {"label":"Space", "x":10.5, "y":5},
                {"label":"Space", "x":10.5, "y":6}
            ]
        },
        "LAYOUT_beta_pcb": {
            "layout": [
                {"label":"Esc", "x":0, "y":0, "w":1.5},
                {"label":"1", "x":1.5, "y":0},
                {"label":"2", "x":2.5, "y":0},
                {"label":"3", "x":3.5, "y":0},
                {"label":"4", "x":4.5, "y":0},
                {"label":"5", "x":5.5, "y":0},
                {"label":"-", "x":6.5, "y":0},
                {"label":"=", "x":9.5, "y":0},
                {"label":"6", "x":10.5, "y":0},
                {"label":"7", "x":11.5, "y":0},
                {"label":"8", "x":12.5, "y":0},
                {"label":"9", "x":13.5, "y":0},
                {"label":"0", "x":14.5, "y":0},
                {"label":"Bspc", "x":15.5, "y":0, "w":1.5},
                {"label":"Tab", "x":0, "y":1, "w":1.5},
                {"label":"Q", "x":1.5, "y":1},
                {"label":"W", "x":2.5, "y":1},
                {"label":"E", "x":3.5, "y":1},
                {"label":"R", "x":4.5, "y":1},
                {"label":"T", "x":5.5, "y":1},
                {"label":"PgUp", "x":6.5, "y":1, "h":1.5},
                {"label":"[", "x":9.5, "y":1, "h":1.5},
                {"label":"Y", "x":10.5, "y":1},
                {"label":"U", "x":11.5, "y":1},
                {"label":"I", "x":12.5, "y":1},
                {"label":"O", "x":13.5, "y":1},
                {"label":"P", "x":14.5, "y":1},
                {"label":"\\", "x":15.5, "y":1, "w":1.5},
                {"label":"Caps", "x":0, "y":2, "w":1.5},
                {"label":"A", "x":1.5, "y":2},
                {"label":"S", "x":2.5, "y":2},
                {"label":"D", "x":3.5, "y":2},
                {"label":"F", "x":4.5, "y":2},
                {"label":"G", "x":5.5, "y":2},
                {"label":"PgDn", "x":6.5, "y":2.5, "h":1.5},
                {"label":"]", "x":9.5, "y":2.5, "h":1.5},
                {"label":"H", "x":10.5, "y":2},
                {"label":"J", "x":11.5, "y":2},
                {"label":"K", "x":12.5, "y":2},
                {"label":"L", "x":13.5, "y":2},
                {"label":";", "x":14.5, "y":2},
                {"label":"Enter", "x":15.5, "y":2, "w":1.5},
                {"label":"Shift", "x":0, "y":3, "w":1.5},
                {"label":"Z", "x":1.5, "y":3},
                {"label":"X", "x":2.5, "y":3},
                {"label":"C", "x":3.5, "y":3},
                {"label":"V", "x":4.5, "y":3},
                {"label":"B", "x":5.5, "y":3},
                {"label":"N", "x":10.5, "y":3},
                {"label":"M", "x":11.5, "y":3},
                {"label":",", "x":12.5, "y":3},
                {"label":".", "x":13.5, "y":3},
                {"label":"Up", "x":14.5, "y":3},
                {"label":"Shift", "x":15.5, "y":3, "w":1.5},
                {"label":"Ctrl", "x":0.5, "y":4},
                {"label":"Super", "x":1.5, "y":4},
                {"label":"Alt", "x":2.5, "y":4},
                {"label":"Left", "x":13.5, "y":4},
                {"label":"Down", "x":14.5, "y":4},
                {"label":"Right", "x":15.5, "y":4},
                {"label":"Space", "x":5.5, "y":5, "H":2},
                {"label":"Ins", "x":6.5, "y":5},
                {"label":"Del", "x":6.5, "y":6},
                {"label":"Home", "x":9.5, "y":5},
                {"label":"End", "x":9.5, "y":6},
                {"label":"Space", "x":10.5, "y":5, "H":2}
            ]
        }
    }
}
}
\ No newline at end of file

M keyboards/sirius/unigo66/main.c => keyboards/sirius/unigo66/main.c +1 -8
@@ 78,19 78,12 @@ int main(void)
     */
    sei();

/* Some keyboards bootup quickly and cannot be initialized with this startup wait.
/* Some keyboards bootup quickly and cannot be initialized with this startup wait.*/
    // wait for startup of sendchar routine
    while (USB_DeviceState != DEVICE_STATE_Configured) ;
    if (debug_enable) {
        _delay_ms(1000);
    }
*/

    /* wait for USB startup to get ready for debug output */
    uint8_t timeout = 255;  // timeout when USB is not available(Bluetooth)
    while (timeout-- && USB_DeviceState != DEVICE_STATE_Configured) {
    _delay_ms(4);
    }

    debug("init: done\n");


M keyboards/sirius/unigo66/readme.md => keyboards/sirius/unigo66/readme.md +1 -1
@@ 14,4 14,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to

To get the U2U into DFU flashing mode, insert the U2U into the computer and press the button in the red circle shown below

![U2U](https://i.imgur.com/WKwgDjZ.png)
\ No newline at end of file
![U2U](https://i.imgur.com/WKwgDjZ.png)

M keyboards/sirius/unigo66/rules.mk => keyboards/sirius/unigo66/rules.mk +3 -2
@@ 15,7 15,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
# Build Options
#   comment out to disable the options.
#
# BOOTMAGIC_ENABLE	= yes	# Virtual DIP switch configuration(+1000)
BOOTMAGIC_ENABLE	= lite	# 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)


@@ 26,4 26,5 @@ EXTRAKEY_ENABLE		= yes	# Audio control and System control(+450)
USB_HID_ENABLE = yes

CUSTOM_MATRIX = yes
SRC = custom_matrix.cpp
SRC += custom_matrix.cpp\
	main.c

M keyboards/sirius/unigo66/unigo66.h => keyboards/sirius/unigo66/unigo66.h +19 -1
@@ 120,4 120,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    KE1,KC_NO,K1D,K1B,K06,K19,K05,K11,K10,K36,K37,KC_NO,    KC_NO,KE5,      K52,      KC_NO,KC_NO,KC_NO,KC_NO, KC_NO,KC_NO, \
    KE0,KE3,KE2,KC_NO,KC_NO,    K2C,    KC_NO,KC_NO,KC_NO,KE6,KC_NO,KC_NO,KE4,  K50,K51,K4F,  KC_NO,      KC_NO,KC_NO, KC_NO,KC_NO  \
)
#endif

#define LAYOUT_beta_pcb( \
  K1E, K1F, K30, K2F, K45, K3B, KE6,          KE2, K3A, K39, K14, K04, K09, K07, \
  K29, K15, K3C, K3D, K3E, K3F, K58,          K50, K2C, K11, K05, K55, K10, K06, \
  K31, K5F, K5E, K61, K2A, K38,                    K4C, K57, K53, K5B, K5A, K08, \
  K35, K5D, K17, K1B, K1A, K52, K56,          K51, K4D, K23, K1C, K13, K2E, K0C, \
  K5C, K0A, K0F,                                                  K36, K0E, K37, \
                           KE4, K49,          K4B, KE0,                          \
                                KE5,          KE1\
) LAYOUT_all( \
            KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,                          \
    K29,    K3A,K3B,K3C,K3D,K3E,K3F,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,K45,                 KC_NO,KC_NO,KC_NO,  KC_NO, KC_NO, KC_NO, KC_NO,  KC_NO, \
    K35,K1E,K1F,KC_NO,KC_NO,KC_NO,K23,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,K2E,KC_NO, K2A,    K49,KC_NO,K4B,  K53,KC_NO,K55,K56,     KC_NO, KC_NO,  \
    KC_NO,K14,K1A,K08,K15,K17,K1C,KC_NO,K0C,KC_NO,K13,K2F,K30,       K31,              K4C,K4D,KC_NO,  K5F,KC_NO,K61,K57,     KC_NO, KC_NO,  \
    K39,K04,KC_NO,K07,K09,K0A,KC_NO,KC_NO,K0E,K0F,KC_NO,KC_NO,    KC_NO,    KC_NO,                     K5C,K5D,K5E,KC_NO,     KC_NO, KC_NO,  \
    KE1,KC_NO, KC_NO,K1B,K06,KC_NO,K05,K11,K10,K36,K37,K38, KC_NO, KE5,                   K52,         KC_NO,K5A,K5B,KC_NO,   KC_NO, KC_NO,  \
    KE0,KC_NO,KE2,KC_NO,KC_NO,K2C,KC_NO,KC_NO,KC_NO,KE6,KC_NO,KC_NO, KE4,             K50,K51,KC_NO,   KC_NO,    KC_NO,K58,   KC_NO, KC_NO   \
)
#endif
\ No newline at end of file