Skip to content

Commit

Permalink
revert changes for testing pointing fork
Browse files Browse the repository at this point in the history
  • Loading branch information
AlaaSaadAbdo authored Aug 16, 2024
1 parent 809174e commit 0eec7ed
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 35 deletions.
36 changes: 18 additions & 18 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
include:
- board: nice_nano_v2
shield: settings_reset
# - board: nice_nano_v2
# shield: wizza_left
# - board: nice_nano_v2
# shield: wizza_right
# - board: nice_nano_v2
# shield: wizzav2_left
# - board: nice_nano_v2
# shield: wizzav2_right
# - board: nice_nano_v2
# shield: wizzades_left
# - board: nice_nano_v2
# shield: wizzades_right
# - board: nice_nano_v2
# shield: asfoora
- board: nice_nano_v2
shield: wizza_left
- board: nice_nano_v2
shield: wizza_right
- board: nice_nano_v2
shield: wizzav2_left
- board: nice_nano_v2
shield: wizzav2_right
- board: nice_nano_v2
shield: wizzades_left
- board: nice_nano_v2
shield: wizzades_right
- board: nice_nano_v2
shield: asfoora
- board: nice_nano_v2
shield: wasfoora
snippet: zmk-usb-logging
- board: nice_nano_v2
shield: ghazal nice_view
snippet: zmk-usb-logging
# - board: seeeduino_xiao_ble
# shield: rommana_left rgbled_widget
# - board: seeeduino_xiao_ble
# shield: rommana_right rgbled_widget
- board: seeeduino_xiao_ble
shield: rommana_left rgbled_widget
- board: seeeduino_xiao_ble
shield: rommana_right rgbled_widget
6 changes: 1 addition & 5 deletions config/boards/shields/wasfoora/wasfoora.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,4 @@ CONFIG_ZMK_IDLE_SLEEP_TIMEOUT=1800000
# Better compatibility with iPadOS
CONFIG_ZMK_HID_CONSUMER_REPORT_USAGES_BASIC=y

CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=20

CONFIG_ZMK_BLE_EXPERIMENTAL_FEATURES=y
CONFIG_INPUT=y
CONFIG_ZMK_MOUSE=y
CONFIG_ZMK_COMBO_MAX_COMBOS_PER_KEY=20
4 changes: 0 additions & 4 deletions config/boards/shields/wasfoora/wasfoora.keymap
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
#define WASFOORA

#include <dt-bindings/zmk/mouse.h>
#include <behaviors/mouse_keys.dtsi>
#include <dt-bindings/zmk/ext_power.h>

#include "../../../base30.keymap"

6 changes: 0 additions & 6 deletions config/combos30.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,7 @@ COMBO(OUTBLE, &out OUT_BLE, 15 23 24, ALPHA_ALL)
COMBO(softoff, &soft_off, 0 1 2 3, ALPHA_ALL)

/* GHAZAL trackball combos */

#ifdef WASFOORA
COMBO(L_LCLICK_HR_WASFOORA, &mkp LCLK, 12 13, ALPHA_ALL)
#endif

#ifdef GHAZAL

/* Left hand mouse */
COMBO(L_LCLICK_HR, &mkp LCLK, 12 13, ALPHA_ALL SCROLL SNIPE)
COMBO(L_RCLICK_HR, &mkp RCLK, 12 11, ALPHA_ALL SCROLL SNIPE)
Expand Down
4 changes: 2 additions & 2 deletions config/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ manifest:
projects:
- name: zmk
remote: petejohanson
# revision: dbbeb701aee215fbd5f5e9faecc778b745d4cf87 #pmw3610 trackball issue
revision: feat/pointers-move-scroll
revision: dbbeb701aee215fbd5f5e9faecc778b745d4cf87 #pmw3610 trackball issue
# revision: feat/pointers-move-scroll
import: app/west.yml
- name: chiptuner-zmk-module
remote: petejohanson
Expand Down

0 comments on commit 0eec7ed

Please sign in to comment.