1
0
Fork 0
Commit graph

183 commits

Author SHA1 Message Date
Drashna Jaelre
bcdd7735c8 Add error message if config not detected 2018-08-11 13:18:36 -07:00
Drashna Jaelre
99cb107b71 Add 32 bit MINGW support .... 2018-08-11 13:18:36 -07:00
Drashna Jaelre
9c8f8bd3bc Fix minor typo in qmk_install.sh for MSYS/MINGW64 detection 2018-08-11 13:18:36 -07:00
Jack Humbert
ac46378ac6
Update ISP flashing guide with pre-compiled binary (#3217)
* update flashing guide with pre-compiled binary

* Add files via upload

* Update isp_flashing_guide.md

* update file and instructions

* update instructions
2018-08-02 23:07:33 -04:00
Taylor Gonzalez
bb4af7deee Fix qmk_install.sh to properly target MSYS (#3455)
* qmk_install fix for windows users.

* Updated wildcard to caputre both MSYS and MINGW64 in qmk_install

* added OR to windows qmk_install
2018-08-02 14:43:51 -07:00
zjpxshade
7f0a205232 Added gentoo to installer (#3272)
* Added gentoo installer

* Remove comments

* Remove comments

* Updating the layout

* Revert "Remove comments"

This reverts commit e348afa41a470d4b8f1865d92b85acd32ab14074.

* Revert "Updating the layout"

This reverts commit 181822d195f722f4981825ded7dd85fa268c3c56.

* Undo erroneous revert
2018-07-15 14:14:47 -04:00
Evan Travers
0d5a8b048a Instruct macos users to use avr-gcc@7 (#3337)
If you run `brew install avr-gcc`, you get a version that has
compatibility issues with LUFA. I updated the getting started guide for
osx, the qmk_install setup script, and added a section to the FAQ for
folks like me who accidentally updated avr-gcc past 7.
2018-07-07 17:37:37 -07:00
MechMerlin
5346cb2d20 Support both AVR and ps2avrGB targets for new_project script (#2811)
* Stopping point at creating targets for new_project script

* Add second argument for target

* Add the ps2avrgb target

* consider the case where the firmware type target is not valid

* fix template files to be more generic

* Code cleanup

* Change variable name to be more descriptive

* make avr the default

* forgot to put the template files in

* Take out useless comments

* add usage info
2018-05-10 00:36:40 -04:00
Mikkel Jeppesen
00596d55e3 Added propper support for Lets split vitamins (#2559)
* Added support for the upcomming Lets_split vitamins included

* Updated readme

* Corrected header of readme

* Enabled RGB

* Broke everything

* broke some more shit

* Revert "broke some more shit"

This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1.

* Revert "Broke everything"

This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7.

* Fixed USB detection, and RGB on slave

* started modifying readme, to use msys2

* Added support for the upcomming Lets_split vitamins included

* Updated readme

* Corrected header of readme

* Enabled RGB

* Broke everything

* broke some more shit

* Revert "broke some more shit"

This reverts commit 6ad68e6269cc0d04c16564ce9598dfd3db1e23c1.

* Revert "Broke everything"

This reverts commit feeee4e40db15a726f2292b6a9406ef45c1e54a7.

* Fixed USB detection, and RGB on slave

* started modifying readme, to use msys2

* Updated readme to reflect use of msys2 Added avrdude to msys path

* added avrdude option to msys installer

* Removed extra installation of avrdude

* Renamed to vitamins_included and implemented drashnas changes

* Fixed include guard

* Fixed some includes, and added avrdude target to docs.

* Fixed default keyboard
2018-05-09 09:14:30 -07:00
Florens Pauwels
ddb1c83695 Added archlinux support to linux_install.sh 2018-05-02 11:44:22 -04:00
Kenneth Aloysius
d3c6da7aff Updated personal keymaps, fixed Let's Split default keymap, updated JJ40 README (#2704)
* Add M6-A keymap

* Update XD60 keymap

* Update XD60 keymap readme

* Update JJ40 and Let's Split keymaps

* Add readme for M6-A

* Fix typo, update JJ40 README

* Update jj40 readme

* Cleanup jj40 keymap

* Revert Let's Split QWERTY layer to default before #2010

* Update numpad layers

* Fix: Let's Split keymap getting stuck mods due to having keycodes assigned on the Raise layer

* Keep ASCII art consistent with keymap
2018-04-19 09:28:55 -07:00
U-LANDSRAAD\drashna
c31f7ff91b Hopefully fix Travis Auto-Incrementation
This reverts the changes in #2491, so that Travis will hopefully return to automatic incrementing.
But this includes the layout and userspace excepts, as well.
2018-03-29 18:18:50 -04:00
Jack Humbert
ae7284edb8 rename api docs to internals 2018-03-26 11:43:37 -07:00
skullY
c4f9b8f297 make new_project.sh work correctly on osx too 2018-03-25 13:20:30 -04:00
U-LANDSRAAD\drashna
e72cad44fa Add Layouts to exclusion 2018-03-25 13:19:14 -04:00
U-LANDSRAAD\drashna
f67950df27 Ignore users folder for Travis tagging 2018-03-25 13:19:14 -04:00
skullY
70cf46d4f1 fix the moxygen invocation 2018-03-23 22:42:08 -07:00
skullydazed
7c9d5ace14 Generate API docs from source code comments (#2491)
* Generate api docs from source code

* Add a bunch of doxygen comments

* more doxygen comments

* Add the in-progress api docs

* script to generate docs from travis

* Add doc generation to the travis job

* make travis_docs.sh commit the work it does

* make sure the docs script exits cleanly
2018-03-22 02:50:38 -04:00
Shayne Holmes
b6db61b922 Fix logic in macos install
Also fix mixed spaces/tabs
2018-03-16 20:08:21 -07:00
Jon Nall
0b82d08e8d Fixed exit status check for brew 2018-03-09 20:10:44 -08:00
skullydazed
08e48eb6f5
Add a newbie guide for people completely new to QMK (#2480) 2018-03-06 14:37:48 -08:00
Danny
524053e3c0 Remap msys2 usb, fix USB port detection (#2301)
* Add AVRDUDE to MSYS2 setup

* Remap detected USB port in MSYS2 to COM port
2018-02-28 16:40:43 -05:00
Drashna Jaelre
9cfcd49406 Re-add Flip Installer (#2355)
* Re-add Flip Installer

Found the update URL for it.
http://www.microchip.com/developmenttools/productdetails.aspx?partno=flip

* Comment out JRE installer version
2018-02-06 23:21:03 -05:00
skullydazed
9aaa491bc0 Add stm32 to drivers.txt 2018-02-05 08:54:49 -08:00
Sam Perman
f0f991dd89 update sed to work on mac
See https://stackoverflow.com/questions/19456518/invalid-command-code-despite-escaping-periods-using-sed
2018-01-28 12:23:28 -05:00
Thomas Järvstrand
d837ab586a Make new_project.sh a bit more robust 2018-01-25 00:59:35 -05:00
skullY
e956c11bc9 Update the urls for atmel tools 2018-01-03 10:00:40 -08:00
Jason Rosenman
8910f9b87e Marked util/atmega32a_program.py as executable so that programming script works. 2017-12-19 10:51:37 -05:00
Jack Humbert
b669d115c2 adds planck light keyboard 2017-11-20 23:37:38 -05:00
Jack Humbert
1d703a476a update build script to not delete files 2017-11-17 14:09:27 -05:00
Jack Humbert
f2c32b3ea4
Splits up ps2avrGB boards into their own folders (#2014)
* move underglow led count from parent to child

* Added pearl support

* Added personal keymap for pearl

* start splitting up ps2avrGB boards

* clean up ps2avrgb boards

* Move keycodes to their own section

* Clarify `KC_PWR` vs `KC_POWER`. Fixes #1994.

*  Cleaned uppersonal userspace and keymaps (#1998)

* Cleanup of keymaps

* Remove Tap Dance from Orthodox keymap

* Cleaned up userspace and keymaps

* Added sample (template)userspace files to my folder

* Document the Teensy hardware reset problem

* add mfluid keymap to atreus62

* Update hand_wire.md

Change "Resin" to "Rosin"

* Add keyboard: mt40 (#2001)

* add keyboard: chinese planck clone

* rename chinese_planck to mt40

* add image for the mt40 board

* lets_split: Fix matrix_init for ROW2COL

Signed-off-by: Marian Rusu <rusumarian91@gmail.com>

* Add Keymap for Whitefox Truefox layout

* Add keyboard: ACR60 (#1999)

* base acr60 keyboard folder created

* mitch acr60 keymap updates, documentation

* latest keymap updates

* slight modifications to layer switching

* Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997)

* importing 42 key dvorak layout

* added comment for build instructions

* adding atreus dvorak 42 key layout

* added readme

* add readme

* build instructions

* additional MEH shortcuts

* added shifted symbols on symbols layer

* working extra symbols on COMBINED layer

* bring atreus layout inline with the ergodox one

* add necessary macros

* working ls macro

* added more shell macros

* added screen rename / screen number macros

* add ctrl-a key in shell-nav to use screen more easily

* added shell screen layer

* assign screen switching macros to screen layer

* define all screen switching macros

* more screen-related shortcuts added on shell screen layer

* change shell nav bottom right row to match base layer (backspace / delete)

* remove some mappings on SHELL_NAV layer as they are now in the screen layer

* added more screen macros

* changes to COMBINED layer (pipe on the right) and modified shell nav

* moved pipe/backslash to then right

* documented SHELL_SCREEN layer

* put backspace/delete on SHELL_NAV layer

* add an explicit lisence file for github to pickup

* Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962)

* First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware

* Fix terminus_mini & nyquist/DivergeJM readme files

Previously an outdated copy of the default readme. Updated to match the  Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout)

* Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles

* Updated rules.mk

Inadvertantly removed important code from the rules.mk in previous commit. This has been restored.

Also disabled Tap_Dance in both rules.mk files

* Moved terminus_mini to handwired

Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired.

* New Frosty Flake layout for QFR TKL

Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality.

* README fix & keymap update for 3 keyboards

Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM.

Added TAPPING_TERM =  150 to config.h for all keyboards

Switched LT(LOWER) and LAlt on the mod row for ortholinear boards.

* Update readme for QFR_JM to include make instructions

* Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"

This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing
changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf.

* Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware""

This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93.

* Added QWERTY support to the QFR_JM

Implemented variable default base layer from the Planck default keymap.

* Update README to reflect QWERTY support

* Nyquist:DivergeJM - Update RESET location

Add a reset button to both hands, accessible when halves are disconnected.

* Typo fix

* Update DivergeJM

Switched master to Left hand,
Moved Reset key to a different location

* Added macros to send R pointer & dplyr pipe

Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work.

* Added ADJUST -> QWERTY, DVORAK, COLEMAK

Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer.

Updated ReadMe files accordingly.

* Fix base layout diagram for Terminus_Mini

Remove split from diagram

* Changed the R operators to SEND_STRING, rather than keypress macros

* Added Dvorak to the QFR_JM keymap

* fixed duplicate row in Nyquist keymap

* Fix readme - LAlt location on mouse layer

* Set EE_HANDS to allow either Nyquist hand to work as master.

* Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM

"<-" to " <- "
"%>%" to " %>% "

Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order.

* Update bottom alpha row to output symbols on LOWER

This row now outputs the following (z -> /) when in the LOWER layer:
 <-
 %>%
{
[
`
|
]
}
.
/

* Updated readme files for QFR_JM, terminus_mini & DivergeJM

QFR_JM readme reflects correct LOWER bottom row symbol output,
terminus_mini & DivergeJM reflect correct command line make instructions.

* Add media keys to QFR_JM LOWER - Replicate QFR default functionality

* Fix issue with Mouse layering

Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key.

* Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM

* Add "KC_MAKE" to userspace example

* QMK DFU bootloader generation (#2009)

* adds :bootloader target

* update planck and preonic revisions

* remove references to .h files for planck

* update preonic keymap

* only add keyboard.h files that exist

* add production target

* hook things up with the new lufa variables

* update rules for planck/preonic

* back backlight key turn of status led when pressed

* add manufacturer/product strings to bootloader

* fix push script

* Added support for let's split kailh socket version (#2010)

* Added support for socket version of the let's split

* renamed files

* socket-version-works

* fix up lets_split keymaps

* fix up lets_split keymaps

* shrink preonic by a bit

* fix lets_split keyboards

* update travis script

* update travis script

* update version silencing
2017-11-17 11:40:34 -05:00
Jack Humbert
a8466df62d update travis script 2017-11-14 22:31:34 -05:00
Jack Humbert
cb64a886e9 update travis script 2017-11-14 22:14:59 -05:00
Jack Humbert
b702c08825 fix push script 2017-11-14 16:47:34 -05:00
QMK Bot
004826e1b8 convert to unix line-endings [skip ci] 2017-11-02 00:51:41 +00:00
Jack Humbert
f445a7f971 adds .hex for teensy 2.0 using B0 as reset 2017-11-01 20:42:03 -04:00
Jack Humbert
12b2e0ac73 hack to force new tag 2017-10-15 20:04:23 -04:00
Jack Humbert
115e49b2af only build default keymaps 2017-10-15 16:18:28 -04:00
Jack Humbert
800ec55dfc Make arguments redo, subproject elimination (#1784)
* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* redo make args to use colons, better folder structuring system [skip ci]

* don't put spaces after statements - hard lessons in makefile development

* fix-up some other rules.mk

* give travis a chance

* reset KEYMAPS variable

* start converting keyboards to new system

* try making all with travis

* start to update readmes and keyboards

* look in keyboard directories for board.mk

* update visualizer rules

* fix up some other keyboards/keymaps

* fix arm board ld includes

* fix board rules

* fix up remaining keyboards

* reset layout variable

* reset keyboard_layouts

* fix remainging keymaps/boards

* update readmes, docs

* add note to makefile error

* update readmes

* remove planck keymap warnings

* update references and docs

* test out tarvis build stages

* don't use stages for now

* don't use stages for now
2017-10-14 11:32:19 -10:00
keisuke333
66f45c9e2e Fix teensy path 2017-10-13 05:22:13 -10:00
keisuke333
109b2ae0bd Fix missing teensy path 2017-10-10 07:16:22 -10:00
Rob Rogers
7bcf3e2781 Wording changes for the WSL install script 2017-09-15 21:59:56 -04:00
Jack Humbert
4b0c6dc50d update travis script 2017-08-24 08:07:37 -04:00
Jack Humbert
437c86c9c1 update build script 2017-08-23 15:44:25 -04:00
Jack Humbert
e719f5b0b5 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-08-22 10:08:44 -04:00
Jack Humbert
9da308a0cd move to compiled [skip ci] 2017-08-22 10:07:32 -04:00
keisuke333
47cd5b5622 Fix avoid certificate errors that occur during '2-setup-environment-win.bat' 2017-08-22 09:09:51 -04:00
Jack Humbert
dd8cedc361 update travis script 2017-08-22 08:56:39 -04:00
Jack Humbert
11d27cec1e attempt to fix line-ending travis stuff 2017-08-21 23:39:06 -04:00
Jack Humbert
c3c07eff51 update building for .hex, secrets moving 2017-08-21 21:57:46 -04:00
Jack Humbert
fa6bcfd10c make travis convert line-endings and push a skippable commit 2017-08-20 14:22:18 -04:00
Jack Humbert
1254e76e29 stop compiling ez after build, rework ssh ids 2017-08-20 14:04:35 -04:00
ThreeFx
8341068299 Correct if-statement 2017-08-20 11:17:19 -04:00
ThreeFx
a553dcba5a Added gentoo support for dependency script 2017-08-20 11:17:19 -04:00
Fred Sundvik
5a25d50168 Add more dependencies, everything can be compiled now 2017-07-11 18:51:52 +03:00
Fred Sundvik
5c3fd67198 Add tools to the path 2017-07-11 17:55:03 +03:00
Fred Sundvik
0d9e7f635e Extract flip 2017-07-11 17:32:58 +03:00
Fred Sundvik
76bd0d3e18 Install arm toolchain 2017-07-11 17:18:24 +03:00
Fred Sundvik
b8c363099b Download and extract avr tools 2017-07-11 16:44:46 +03:00
Fred Sundvik
b85ce4ce22 Fix overlong lines, and a few spelling errors 2017-07-11 16:26:29 +03:00
Fred Sundvik
d47db637ed Use home directory for download on msys2 2017-07-11 16:11:37 +03:00
Fred Sundvik
32fc4da4a7 Install unzip 2017-07-10 18:16:35 +03:00
Fred Sundvik
861087096b Add symlinks only on WSL 2017-07-10 18:05:32 +03:00
Fred Sundvik
7bedf8f4f2 Fix launch of qmk_driver_installer on msys2 2017-07-10 17:51:59 +03:00
Fred Sundvik
a2d3fc98b8 Initial structure for shared msys2 and wsl installation 2017-07-10 17:31:58 +03:00
Jack Humbert
fe47b36065 fix tag increment 2017-07-03 00:23:37 -04:00
Jack Humbert
ea134be36a fix up travis script 2017-07-02 23:38:20 -04:00
Jack Humbert
2c65a17752 add other mcu bootloaders 2017-06-23 23:05:42 -04:00
Fred Sundvik
45d437ca04 Make only modified keymaps 2017-06-18 18:30:59 +03:00
Fred Sundvik
a15510b57b Always build everything on master 2017-06-18 17:03:05 +03:00
Fred Sundvik
5acc0e54aa Make all subprojects when a keymap is modified 2017-06-18 16:44:51 +03:00
Jack Humbert
9ecfc23292 make qmk bot do the hard work 2017-05-30 12:49:26 -04:00
Jack Humbert
7eccbfe737 exclude PRs 2017-05-30 11:46:25 -04:00
Jack Humbert
0c351fa98b no master needed on push maybe 2017-05-29 12:49:25 -04:00
Jack Humbert
bd39e91f78 Merge branch 'master' of https://github.com/qmk/qmk_firmware 2017-05-29 12:15:03 -04:00
Jack Humbert
44832127d7 push to git url 2017-05-29 12:14:49 -04:00
Jack Humbert
cecf783e14 Merge pull request #1337 from fredizzimo/wsl_setup
Add script for setting up Windows Subsystem for Linux
2017-05-29 11:56:53 -04:00
Jack Humbert
ae6b803ad6 more than one en-file, and actually ignore docs 2017-05-29 10:54:46 -04:00
Jack Humbert
71feac5717 ignore docs, fix tag/hex pushing 2017-05-28 16:16:56 -04:00
Fred Sundvik
999b35c7f8 Create a symlink to qmk if requested 2017-05-28 21:38:14 +03:00
Fred Sundvik
ec720ac1ea Add activate_wsl to .bashrc 2017-05-28 21:30:55 +03:00
Fred Sundvik
fa4a492677 Fix symlink creation 2017-05-28 21:30:55 +03:00
Fred Sundvik
3e4f2f5590 Use unzip instead of 7zip 2017-05-28 21:30:55 +03:00
Fred Sundvik
3d3999d863 Actually install flip instead of just extracting 2017-05-28 21:30:55 +03:00
Fred Sundvik
b8899b48b4 Make symlink to utils and export programmer variables 2017-05-28 21:30:55 +03:00
Fred Sundvik
9c582fc797 Add install dependencies 2017-05-28 21:30:55 +03:00
Fred Sundvik
477bd4b948 Add prompt for re-downloading the utils 2017-05-28 21:30:55 +03:00
Fred Sundvik
c2096bb515 Add driver installation 2017-05-28 21:30:55 +03:00
Fred Sundvik
aa26464480 Add checks for cloning to the right dir 2017-05-28 21:30:55 +03:00
Fred Sundvik
28a4e90565 Download windows flashing utils and driver_installer 2017-05-28 21:30:55 +03:00
Jack Humbert
8da442f411 update travis script 2017-05-17 20:27:07 -04:00
stites
a9959783c0 Add freebsd support in "util/install_dependencies.sh"
A simple addition to the `install_dependencies` script which remaps the debian dependencies to their freebsd package-names. After a recursive clone and using gmake, I can successfully build all firmware from the root directory (minus some warnings generated by gcc-4.9.4 which I can procure on request). however there is a problem running tests.
2017-03-07 13:12:10 -05:00
Jack Humbert
1ac5dc9e52 fix travis and reduce warnings 2017-02-16 11:37:46 -05:00
Jack Humbert
15dc540cac ignore PRs in versioning 2017-02-16 10:06:02 -05:00
Jack Humbert
bfc33a56d7 don't try to build the readme 2017-02-11 11:39:57 -05:00
Jack Humbert
ad1327cd00 accept numbers in travis build 2017-02-07 20:51:50 -05:00
Jack Humbert
de659486f5 pass through travis errors 2017-02-07 12:36:25 -05:00
Jack Humbert
616b8604b0 variable scope fix for travis 2017-02-07 11:53:43 -05:00
Jack Humbert
6a92cc2897 correctly assign bash variable 2017-02-07 02:00:07 -05:00
Jack Humbert
19d63ad72c try building only keyboards needed 2017-02-07 01:35:10 -05:00