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

Cleanup helix rules options #6952

Merged
merged 26 commits into from
Oct 16, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5dac20c
add temporary test shell-spript
mtei Sep 18, 2019
1a8461a
Use LINK_TIME_OPTIMIZATION_ENABLE instead of Link_Time_Optimization
mtei Sep 25, 2019
16cd01f
Helix config.h use '#pragma once'
mtei Sep 25, 2019
5a717ba
Helix helix.h,rev?/rev?.h,pico/pico.h use '#pragma once'
mtei Sep 25, 2019
05093bf
Use drivers/avr/pro_micro.h instead of keyboards/helix/pro_micro.h
mtei Sep 25, 2019
37bca31
remove keyboards/helix/{rev2|pico}/serial_config.h
mtei Sep 25, 2019
fbcd471
'HELIX_ROWS' macro is now referenced only in rev1/config.h and rev2/c…
mtei Sep 25, 2019
303c3b9
The contents of helix/rules.mk were distributed to subdirectories.
mtei Sep 26, 2019
dc8cd57
helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_dri…
mtei Sep 26, 2019
b553e50
Simplified 'helix/pico/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATUR…
mtei Sep 26, 2019
7f5fc45
Simplified 'helix/rev2/keymap/*/rules.mk' using KEYBOARD_LOCAL_FEATUR…
mtei Sep 26, 2019
ec3dbfc
Added helix keyboard build NEW method.
mtei Sep 26, 2019
ec49f63
add temporary test shell-spript
mtei Sep 26, 2019
a53f20c
test end remove test script. Revert "add temporary test shell-spript"
mtei Sep 26, 2019
466951b
test end remove test script. Revert "add temporary test shell-spript"
mtei Sep 26, 2019
2b20720
Extended the 'HELIX=' option. add keyword 'verbose', 'no_ani'.
mtei Sep 27, 2019
96d1cc3
update keyboards/helix/{rev2,pico}/keymaps/default/readme.md
mtei Sep 27, 2019
ca4c0be
rename KEYBOARD_TOP_DIR to HELIX_TOP_DIR in rules.mk
mtei Sep 28, 2019
6ec7ed8
update keyboards/helix/{rev2,pico}/keymaps/default/readme_jp.md
mtei Sep 28, 2019
1fd87b2
Merge pull request #20 from mtei/cleanup-helix-rules-options
MakotoKurauchi Oct 7, 2019
2087800
rm keyboards/helix/pico/oled/rules.mk
mtei Oct 7, 2019
3eb8f1b
Merge pull request #21 from mtei/cleanup-helix-rules-options
MakotoKurauchi Oct 8, 2019
5ca0492
update helix's readmes. All the ':avrdude' was replaced with ':flash'.
mtei Oct 8, 2019
2d44fdd
Merge pull request #22 from mtei/cleanup-helix-rules-options
MakotoKurauchi Oct 8, 2019
4dd70fd
remove F_CPU, ARCH, F_USB, INTERRUPT_CONTROL_ENDPOINT from helix/rule…
mtei Oct 14, 2019
c5133be
Merge pull request #23 from mtei/cleanup-helix-rules-options
MakotoKurauchi Oct 15, 2019
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
remove keyboards/helix/{rev2|pico}/serial_config.h
No change in build result.
  • Loading branch information
mtei committed Sep 25, 2019
commit 37bca3103c8c206f24c31ca6c5947cdbc15ee779
2 changes: 0 additions & 2 deletions keyboards/helix/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// -include keyboards/helix/rev?/keymaps/MAPNAME/config.h
// XXXX.c

#include <serial_config.h>

// GCC include search path in qmk_firmare/keyboards/helix/
// #include "..." search starts here:
// #include <...> search starts here:
Expand Down
5 changes: 5 additions & 0 deletions keyboards/helix/pico/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL
//#define USE_MATRIX_I2C

/* Soft Serial defines */
#define SOFT_SERIAL_PIN D2
#define SERIAL_SLAVE_BUFFER_LENGTH ((MATRIX_ROWS)/2)
#define SERIAL_MASTER_BUFFER_LENGTH ((MATRIX_ROWS)/2)

/* Select hand configuration */
#define MASTER_LEFT
// #define MASTER_RIGHT
Expand Down
9 changes: 0 additions & 9 deletions keyboards/helix/pico/serial_config.h

This file was deleted.

2 changes: 2 additions & 0 deletions keyboards/helix/rev1/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PRODUCT Helix Alpha
#define DESCRIPTION A split keyboard for the cheap makers

#include <serial_config.h>

#define HELIX_ROWS 5

/* key matrix size */
Expand Down
4 changes: 4 additions & 0 deletions keyboards/helix/rev2/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL
//#define USE_MATRIX_I2C

/* Soft Serial defines */
#define SOFT_SERIAL_PIN D2
#define SERIAL_USE_MULTI_TRANSACTION

/* Select hand configuration */
#define MASTER_LEFT
// #define MASTER_RIGHT
Expand Down
8 changes: 0 additions & 8 deletions keyboards/helix/rev2/serial_config.h

This file was deleted.