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

Dev/upstream #33

Merged
merged 62 commits into from
Aug 2, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
d01659e
update
BlueTufa Jan 22, 2022
0b86d8c
Badger flashed Preonic
BlueTufa Jan 29, 2023
87e5ab9
Ketch layout
BlueTufa Mar 7, 2023
17ae24d
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
c111f71
IJ Debug command
BlueTufa Jun 16, 2023
ec6157c
ketch IJ debugging and other fixes
BlueTufa Jun 19, 2023
a19e7a5
Ketch cleanup
BlueTufa Jun 19, 2023
01b0693
Badger flashed Preonic
BlueTufa Jan 29, 2023
6156c6d
Ketch layout
BlueTufa Mar 7, 2023
3ff42e8
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
f1827fa
IJ Debug command
BlueTufa Jun 16, 2023
6f46f86
Badger flashed Preonic
BlueTufa Jan 29, 2023
3a2f09c
Ketch layout
BlueTufa Mar 7, 2023
c299cf1
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
d457395
IJ Debug command
BlueTufa Jun 16, 2023
1466041
Badger flashed Preonic
BlueTufa Jan 29, 2023
20247a3
Ketch layout
BlueTufa Mar 7, 2023
0317e0c
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
e6ab319
IJ Debug command
BlueTufa Jun 16, 2023
30fe5bb
Badger flashed Preonic
BlueTufa Jan 29, 2023
00ad7a0
Ketch layout
BlueTufa Mar 7, 2023
a9dab65
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
97ebc01
IJ Debug command
BlueTufa Jun 16, 2023
ed0f9f7
Badger flashed Preonic
BlueTufa Jan 29, 2023
46fb9c5
Ketch layout
BlueTufa Mar 7, 2023
4b098b1
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
bac840c
IJ Debug command
BlueTufa Jun 16, 2023
f250213
Badger flashed Preonic
BlueTufa Jan 29, 2023
51fd1ee
Ketch layout
BlueTufa Mar 7, 2023
e01cfd0
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
9f4d7ba
IJ Debug command
BlueTufa Jun 16, 2023
6658900
Badger flashed Preonic
BlueTufa Jan 29, 2023
452f468
Ketch layout
BlueTufa Mar 7, 2023
ab40698
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
067ccf8
IJ Debug command
BlueTufa Jun 16, 2023
98b8798
update
BlueTufa Jan 22, 2022
7ed78da
Badger flashed Preonic
BlueTufa Jan 29, 2023
e69a60f
Ketch layout
BlueTufa Mar 7, 2023
ea88e35
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
20f075f
Badger flashed Preonic
BlueTufa Jan 29, 2023
f610e8c
Ketch layout
BlueTufa Mar 7, 2023
b2a3c7a
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
c5cd358
Badger flashed Preonic
BlueTufa Jan 29, 2023
f0897e3
Ketch layout
BlueTufa Mar 7, 2023
90d3dfa
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
a7cb9e1
Badger flashed Preonic
BlueTufa Jan 29, 2023
c1ac7fc
Ketch layout
BlueTufa Mar 7, 2023
f58f7b4
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
6734fe5
Badger flashed Preonic
BlueTufa Jan 29, 2023
81e4b91
Ketch layout
BlueTufa Mar 7, 2023
70ed8c2
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
8938591
Badger flashed Preonic
BlueTufa Jan 29, 2023
01fd5b9
Ketch layout
BlueTufa Mar 7, 2023
c90c691
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
c170209
Badger flashed Preonic
BlueTufa Jan 29, 2023
2723238
Ketch layout
BlueTufa Mar 7, 2023
caede1f
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
3a4a4ae
Badger flashed Preonic
BlueTufa Jan 29, 2023
18bc58e
Ketch layout
BlueTufa Mar 7, 2023
d37c64b
DEV: PyCharm updates to pi60
BlueTufa Jun 13, 2023
d303e95
Merge branch 'dev/upstream' of https://github.com/BlueTufa/qmk_firmwa…
BlueTufa Aug 1, 2023
41edd4f
re-flash 1up
BlueTufa Aug 2, 2023
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
DEV: PyCharm updates to pi60
  • Loading branch information
BlueTufa committed Aug 1, 2023
commit 17ae24db33f9011ab74448f64c769763325c4ce3
2 changes: 1 addition & 1 deletion keyboards/1upkeyboards/pi60_hse/keymaps/badger/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "badger.h";
#include "badger.h"

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_60_ansi_split_bs_rshift(\
Expand Down
2 changes: 1 addition & 1 deletion users/badger/badger.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ enum CustomKeys {
#define IJ_DECL LGUI(KC_B)
#define IJ_REN LSFT(KC_F6)
#define IJ_USAG LALT(KC_F7)
#define IJ_RUN KC_F9
#define IJ_RUN LCTL(LALT(KC_D))
#define IJ_STEP KC_F8
#define IJ_INTO LSFT(KC_F7)
#define IJ_OUT LSFT(KC_F8)
Expand Down