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.

Sign up for GitHub

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

Jump to bottom

Amended Some Pins - Macro V2 #14824

Merged
merged 41 commits into from
Oct 16, 2021
Merged

Amended Some Pins - Macro V2 #14824

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
fa635c4
KiwiKeebs v.10 QMK
ashkwil Aug 18, 2020
b201e08
Merge remote-tracking branch 'upstream'
ashkwil Aug 18, 2020
d686ff5
Rename files and folder structure for QMK pull request
ashkwil Aug 18, 2020
f5d2e72
Merge branch 'master' of https://github.com/AKiwi92/qmk_firmware
ashkwil Aug 18, 2020
d395a33
Deleted unused files
ashkwil Aug 18, 2020
0f3bb7e
Added starter keymap
ashkwil Aug 18, 2020
e518c54
Changes to make pull request compliant
ashkwil Aug 18, 2020
266a8b1
Removed lines for PR error
ashkwil Aug 18, 2020
9a1ceb8
Error fix in json for PR
ashkwil Aug 18, 2020
e20b8e1
Update keyboards/kiwikeebsmacro/kiwikeebsmacro.h
AKiwi92 Aug 19, 2020
1562b90
Update keyboards/kiwikeebsmacro/readme.md
AKiwi92 Aug 19, 2020
7b9420b
Update keyboards/kiwikeebsmacro/keymaps/default/readme.md
AKiwi92 Aug 19, 2020
acf3f58
Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
66486ea
Update keyboards/kiwikeebsmacro/info.json
AKiwi92 Aug 19, 2020
34ddbac
Update keyboards/kiwikeebsmacro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
a50d283
Update keyboards/kiwikeebsmacro/config.h
AKiwi92 Aug 19, 2020
8dd6be2
Changed structure to allow for future boards
ashkwil Aug 19, 2020
25a18f7
Update keyboards/kiwikeebs/macro/config.h
AKiwi92 Aug 19, 2020
9106d0a
Update keyboards/kiwikeebs/macro/info.json
AKiwi92 Aug 19, 2020
84ede3e
Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
1c5b47d
Update keyboards/kiwikeebs/macro/keymaps/default/keymap.c
AKiwi92 Aug 19, 2020
4df87ad
Amended rotarty to use kb instead of user
ashkwil Aug 20, 2020
b7f2be2
Updated structure after pull request commits
ashkwil Aug 20, 2020
b4945a8
Update keyboards/kiwikeebs/macro/config.h
AKiwi92 Aug 24, 2020
739d1ee
Update keyboards/kiwikeebs/macro/info.json
AKiwi92 Aug 24, 2020
abb406d
Updated KiwiKeebs macro V1 for VIA support. Also Included new KiwiKee…
AKiwi92 Jul 8, 2021
af74b15
Merge branch 'master' into master
AKiwi92 Jul 13, 2021
cdf9652
Added readmes
AKiwi92 Jul 13, 2021
c449d1d
Update keyboards/kiwikeebs/macro-v2/config.h
AKiwi92 Jul 13, 2021
8617b38
Update keyboards/kiwikeebs/macro/config.h
AKiwi92 Jul 13, 2021
6bb0877
Update keyboards/kiwikeebs/macro/info.json
AKiwi92 Jul 13, 2021
3bfabf7
Updated read me files
AKiwi92 Jul 13, 2021
7e466d8
Updated read me files - make command
AKiwi92 Jul 13, 2021
ae9897e
Renamed files/folders to remove - and .
ashkwil Jul 23, 2021
9b4bd45
fauxpark changes
AKiwi92 Jul 30, 2021
787ba5d
Update keyboards/kiwikeebs/macro_v2/macro_v2.c
AKiwi92 Aug 10, 2021
9aed5ef
Added empty layers to keymap
AKiwi92 Aug 28, 2021
5ff3c7a
Update keyboards/kiwikeebs/macro_v2/info.json
AKiwi92 Sep 5, 2021
c4444fb
Amended pin numbers for macro v2
AKiwi92 Oct 14, 2021
c84578e
Merge branch 'master' into master
AKiwi92 Oct 14, 2021
8bbaa72
Update keyboards/kiwikeebs/macro_v2/rules.mk
AKiwi92 Oct 15, 2021
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
Changed structure to allow for future boards
  • Loading branch information
@ashkwil
ashkwil committed Aug 19, 2020
commit 8dd6be2c47a11c03aa37b1591c06b8e664aa811b
0 keyboards/kiwikeebsmacro/config.h → keyboards/kiwikeebs/macro/config.h
View file
Open in desktop
File renamed without changes.
0 keyboards/kiwikeebsmacro/info.json → keyboards/kiwikeebs/macro/info.json
View file
Open in desktop
File renamed without changes.
0 ...s/kiwikeebsmacro/keymaps/default/keymap.c → .../kiwikeebs/macro/keymaps/default/keymap.c
View file
Open in desktop
File renamed without changes.
0 .../kiwikeebsmacro/keymaps/default/readme.md → ...kiwikeebs/macro/keymaps/default/readme.md
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion keyboards/kiwikeebsmacro/kiwikeebsmacro.c → keyboards/kiwikeebs/macro/macro.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#include "kiwikeebsmacro.h"
#include "macro.h"

void encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
Expand Down
0 keyboards/kiwikeebsmacro/kiwikeebsmacro.h → keyboards/kiwikeebs/macro/macro.h
View file
Open in desktop
File renamed without changes.
0 keyboards/kiwikeebsmacro/readme.md → keyboards/kiwikeebs/macro/readme.md
View file
Open in desktop
File renamed without changes.
0 keyboards/kiwikeebsmacro/rules.mk → keyboards/kiwikeebs/macro/rules.mk
View file
Open in desktop
File renamed without changes.