Organizing my keyboards (plaid, tartan, ergoinu) #8537

hsgw · 2020-03-23T10:36:23Z

Description

Putting Plaid, tartan, and ergoinu in "dm9records" directory.
Preparing for my own keymap editor.

Types of Changes

Issues Fixed or Closed by This PR

Checklist

My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation accordingly.
I have read the CONTRIBUTING document.
I have added tests to cover my changes.
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

hsgw · 2020-03-23T12:45:39Z

I I believe build errors on travis-ci are due to keymap specific code for other keyboard.

drashna · 2020-03-24T00:44:21Z

Correct. Build errors are due to community layouts that don't properly support the board. They are fine, as all the default keymaps appear to pass.

mtei · 2020-03-24T08:01:37Z

keyboards/dm9records/ergoinu/rules.mk needs to be changed.

 % make dm9records/ergoinu:default
QMK Firmware 0.8.71
Makefile:560: keyboards/ergoinu/rules.mk: No such file or directory
 % make dm9records/ergoinu:default_jis
QMK Firmware 0.8.71
Makefile:560: keyboards/ergoinu/rules.mk: No such file or directory

 % vi keyboards/dm9records/ergoinu/rules.mk

 % git diff | cat
diff --git a/keyboards/dm9records/ergoinu/rules.mk b/keyboards/dm9records/ergoinu/rules.mk
index 6f5debe00..7ccbedf61 100644
--- a/keyboards/dm9records/ergoinu/rules.mk
+++ b/keyboards/dm9records/ergoinu/rules.mk
@@ -35,7 +35,7 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
 SRC += matrix.c serial.c split_util.c
 
-DEFAULT_FOLDER = ergoinu
+### DEFAULT_FOLDER = ergoinu
 
 # ergoinu configs
 DISABLE_PROMICRO_LEDs = yes

 % make dm9records/ergoinu:default
.....
 * The firmware size is fine - 18858/28672 (65%, 9814 bytes free)
 % make dm9records/ergoinu:default_jis
....
 * The firmware size is fine - 18858/28672 (65%, 9814 bytes free)

hsgw · 2020-03-24T08:10:24Z

I fixed! Thanks.

mtei

Looks good to me.

noroadsleft · 2020-03-25T06:34:14Z

As this touches user keymaps, we'll need clearance from @brickbots and @CaninoDev (thehalfdeafchef) before this is merged; otherwise it's a future branch change.

hsgw · 2020-03-25T07:24:29Z

OK, I'll be awaiting approval from keymap owners for a while.
But I don't modify keymaps, only move directory.

coquizen · 2020-03-25T12:08:06Z

Will I need to make changes to make this go through?

hsgw · 2020-03-25T12:44:47Z

Will I need to make changed to make this go through?

You don't need to do anything👍
But the build command will be changed as below after this is merged.

make dm9records/[keyboard]:[keymap]

coquizen · 2020-03-25T13:02:28Z

Approved.

brickbots · 2020-03-25T19:39:42Z

Approved! Thanks for all of your work on these boards @hsgw. This is still one of my favorite boards to type on 💯

hsgw · 2020-03-26T17:07:11Z

I fixed conflict.
I'm sure that this is ready to merge.

hsgw · 2020-03-31T09:38:26Z

I fixed conflict again.
I think this is ready to merge.

mtei · 2020-04-01T10:03:08Z

Looks Good To Me.

make dm9records/ergoinu:all
no problem.
make dm9records/tartan:all
layouts/community/60_iso/unxmaal/config.h problem
make dm9records/plaid:all
./layouts/community/planck_mit/guidoism/config.h:24: error: "USB_MAX_POWER_CONSUMPTION" redefined [-Werror]
./layouts/community/ortho_4x12/bakingpy/rules.mk problem?
./layouts/community/ortho_4x12/juno/rules.mk problem?
./layouts/community/ortho_4x12/junonum/rules.mk problem?
./layouts/community/ortho_4x12/xyverz/rules.mk problem?

hsgw · 2020-04-01T11:50:16Z

Looks Good To Me.

make dm9records/ergoinu:all
no problem.

make dm9records/tartan:all
layouts/community/60_iso/unxmaal/config.h problem

make dm9records/plaid:all
./layouts/community/planck_mit/guidoism/config.h:24: error: "USB_MAX_POWER_CONSUMPTION" redefined [-Werror]
./layouts/community/ortho_4x12/bakingpy/rules.mk problem?
./layouts/community/ortho_4x12/juno/rules.mk problem?
./layouts/community/ortho_4x12/junonum/rules.mk problem?
./layouts/community/ortho_4x12/xyverz/rules.mk problem?

I'm sure these errors are due to community layout for other keyboard.
same as Travis error.

mtei · 2020-04-01T12:53:19Z

I'm sure these errors are due to community layout for other keyboard.
same as Travis error.

I agree with you. That's not your problem.

mtei · 2020-04-01T12:57:07Z

For your infomation. / ご参考まで。

About `make dm9records/plaid:guidoism`

いま、以下のコンパイルはエラーを引き起こします。
Now, the following compilation will cause an error:

make dm9records/plaid:guidoism
.....
Compiling: keyboards/dm9records/plaid/plaid.c  In file included from <command-line>:
./layouts/community/planck_mit/guidoism/config.h:24: error: "USB_MAX_POWER_CONSUMPTION" redefined [-Werror]
 #define USB_MAX_POWER_CONSUMPTION 50
 
In file included from <command-line>:
./keyboards/dm9records/plaid/config.h:52: note: this is the location of the previous definition
 #define USB_MAX_POWER_CONSUMPTION 100
 
cc1: all warnings being treated as errors
 [ERRORS]
 | 
 | 
 | 
make[1]: *** [.build/obj_dm9records_plaid_guidoism/keyboards/dm9records/plaid/plaid.o] Error 1

これは、以下のようにすると容易に避けることができます。
This can be easily avoided by doing the following:

diff --git a/keyboards/dm9records/plaid/config.h b/keyboards/dm9records/plaid/config.h
index 4d7bedee5..5602f3f7b 100644
--- a/keyboards/dm9records/plaid/config.h
+++ b/keyboards/dm9records/plaid/config.h
@@ -49,7 +49,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-#define USB_MAX_POWER_CONSUMPTION 100
+// #define USB_MAX_POWER_CONSUMPTION 100 // move to post_config.h
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
diff --git a/keyboards/dm9records/plaid/post_config.h b/keyboards/dm9records/plaid/post_config.h
new file mode 100644
index 000000000..879edd3d5
--- /dev/null
+++ b/keyboards/dm9records/plaid/post_config.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#ifndef USB_MAX_POWER_CONSUMPTION
+    #define USB_MAX_POWER_CONSUMPTION 100
+#endif

fauxpark · 2020-04-01T14:15:23Z

The usbconfig.h files for these boards can be deleted.

hsgw · 2020-04-01T14:30:14Z

Thanks! I deleted them.

noroadsleft · 2020-05-03T01:42:25Z

Sending this through the future branch to take advantage of some QMK-side workflow advantages. These changes will land in mainline May 30.

Thanks!

* organize my keyboards (plaid, tartan, ergoinu) * update info.json * fix ergoinu rules.mk * remove usbconfig.h

* Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968) * Convert V-USB usbdrv to a submodule (#8321) * Unify Tap Hold functions and documentation (#8348) * Changing board names to prevent confusion (#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (#8499) * Move spaceman keyboards (#8830) * Migrate miscellaneous `fn_actions` entries (#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (#8537) * Refactor Lily58 to use split_common (#6260) * Refactor zinc to use split_common (#7114) * Add a message if bin/qmk doesn't work (#9000) * Fix conflicting types for 'tfp_printf' (#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480) * Refactor and updates to TKC1800 code (#8472) * Switch to qmk forks for everything (#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484) * Audio enable corrections (2/3) (#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582) * Audio enable corrections (Part 4) (#8974) * Fix typo from PR7114 (#9171) * Augment future branch Changelogs (#8978) * Revert "Branch point for 2020 May 30 Breaking Change"

* Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (qmk#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (qmk#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (qmk#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (qmk#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (qmk#8968) * Convert V-USB usbdrv to a submodule (qmk#8321) * Unify Tap Hold functions and documentation (qmk#8348) * Changing board names to prevent confusion (qmk#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (qmk#8499) * Move spaceman keyboards (qmk#8830) * Migrate miscellaneous `fn_actions` entries (qmk#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (qmk#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537) * Refactor Lily58 to use split_common (qmk#6260) * Refactor zinc to use split_common (qmk#7114) * Add a message if bin/qmk doesn't work (qmk#9000) * Fix conflicting types for 'tfp_printf' (qmk#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (qmk#6480) * Refactor and updates to TKC1800 code (qmk#8472) * Switch to qmk forks for everything (qmk#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (qmk#8484) * Audio enable corrections (2/3) (qmk#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (qmk#8582) * Audio enable corrections (Part 4) (qmk#8974) * Fix typo from PR7114 (qmk#9171) * Augment future branch Changelogs (qmk#8978) * Revert "Branch point for 2020 May 30 Breaking Change"

mtei added the keyboard label Mar 23, 2020

drashna approved these changes Mar 24, 2020

View reviewed changes

drashna requested a review from a team March 24, 2020 00:44

noroadsleft self-requested a review March 24, 2020 08:19

mtei approved these changes Mar 24, 2020

View reviewed changes

noroadsleft added the breaking_change Changes that need to wait for a version increment label Mar 25, 2020

noroadsleft removed the breaking_change Changes that need to wait for a version increment label Mar 25, 2020

noroadsleft approved these changes Mar 25, 2020

View reviewed changes

hsgw force-pushed the organize_my_keyboards branch from 02173e9 to 64132b9 Compare March 26, 2020 13:58

hsgw added 3 commits March 31, 2020 15:10

organize my keyboards (plaid, tartan, ergoinu)

5f7fc54

update info.json

16c63fd

fix ergoinu rules.mk

59b1f99

hsgw force-pushed the organize_my_keyboards branch from 64132b9 to 59b1f99 Compare March 31, 2020 06:19

mtei requested review from mtei and a team March 31, 2020 11:37

mtei approved these changes Apr 1, 2020

View reviewed changes

remove usbconfig.h

43170cc

noroadsleft added breaking_change Changes that need to wait for a version increment future_2020q2 labels May 3, 2020

noroadsleft changed the base branch from master to future May 3, 2020 01:41

noroadsleft merged commit 5bfc6d8 into qmk:future May 3, 2020

hsgw deleted the organize_my_keyboards branch May 3, 2020 06:44

noroadsleft pushed a commit that referenced this pull request May 15, 2020

Organizing my keyboards (plaid, tartan, ergoinu) (#8537)

041a90d

* organize my keyboards (plaid, tartan, ergoinu) * update info.json * fix ergoinu rules.mk * remove usbconfig.h

noroadsleft pushed a commit to noroadsleft/qmk_firmware that referenced this pull request May 22, 2020

Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

8545dae

* organize my keyboards (plaid, tartan, ergoinu) * update info.json * fix ergoinu rules.mk * remove usbconfig.h

noroadsleft pushed a commit to noroadsleft/qmk_firmware that referenced this pull request May 28, 2020

Organizing my keyboards (plaid, tartan, ergoinu) (qmk#8537)

922c144

* organize my keyboards (plaid, tartan, ergoinu) * update info.json * fix ergoinu rules.mk * remove usbconfig.h

peepeetee mentioned this pull request Jan 2, 2022

Scoping and tracking for board relocations within QMK #15696

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Organizing my keyboards (plaid, tartan, ergoinu) #8537

Organizing my keyboards (plaid, tartan, ergoinu) #8537

hsgw commented Mar 23, 2020

hsgw commented Mar 23, 2020 •

edited

Loading

drashna commented Mar 24, 2020

mtei commented Mar 24, 2020

hsgw commented Mar 24, 2020

mtei left a comment

noroadsleft commented Mar 25, 2020

hsgw commented Mar 25, 2020

coquizen commented Mar 25, 2020 •

edited

Loading

hsgw commented Mar 25, 2020

coquizen commented Mar 25, 2020

brickbots commented Mar 25, 2020

hsgw commented Mar 26, 2020 •

edited

Loading

hsgw commented Mar 31, 2020

mtei commented Apr 1, 2020

hsgw commented Apr 1, 2020

mtei commented Apr 1, 2020

mtei commented Apr 1, 2020

fauxpark commented Apr 1, 2020

hsgw commented Apr 1, 2020

noroadsleft commented May 3, 2020

Organizing my keyboards (plaid, tartan, ergoinu) #8537

Organizing my keyboards (plaid, tartan, ergoinu) #8537

Conversation

hsgw commented Mar 23, 2020

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

hsgw commented Mar 23, 2020 • edited Loading

drashna commented Mar 24, 2020

mtei commented Mar 24, 2020

hsgw commented Mar 24, 2020

mtei left a comment

Choose a reason for hiding this comment

noroadsleft commented Mar 25, 2020

hsgw commented Mar 25, 2020

coquizen commented Mar 25, 2020 • edited Loading

hsgw commented Mar 25, 2020

coquizen commented Mar 25, 2020

brickbots commented Mar 25, 2020

hsgw commented Mar 26, 2020 • edited Loading

hsgw commented Mar 31, 2020

mtei commented Apr 1, 2020

hsgw commented Apr 1, 2020

mtei commented Apr 1, 2020

mtei commented Apr 1, 2020

For your infomation. / ご参考まで。

About make dm9records/plaid:guidoism

fauxpark commented Apr 1, 2020

hsgw commented Apr 1, 2020

noroadsleft commented May 3, 2020

hsgw commented Mar 23, 2020 •

edited

Loading

coquizen commented Mar 25, 2020 •

edited

Loading

hsgw commented Mar 26, 2020 •

edited

Loading

About `make dm9records/plaid:guidoism`