Skip to content

Updates for the WLQS #176

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

Merged
blackboxembedded merged 1 commit into from
Jan 19, 2025
Merged

Updates for the WLQS #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions WunderLINQ.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
7E96D79221E78B7B00C6AB5F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7E96D79121E78B7B00C6AB5F /* Security.framework */; };
7E9DDA9B278DE8A2006C6D12 /* WLQ.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E9DDA9A278DE8A2006C6D12 /* WLQ.swift */; };
7E9DDA9F278DFFD4006C6D12 /* WLQ_N.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E9DDA9E278DFFD4006C6D12 /* WLQ_N.swift */; };
7E9DDAA1278E2403006C6D12 /* WLQ_C.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E9DDAA0278E2403006C6D12 /* WLQ_C.swift */; };
7E9DDAA1278E2403006C6D12 /* WLQ_S.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E9DDAA0278E2403006C6D12 /* WLQ_S.swift */; };
7EA4784E1F40B154000CEDDC /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EA4784D1F40B154000CEDDC /* AppDelegate.swift */; };
7EA478551F40B154000CEDDC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7EA478541F40B154000CEDDC /* Assets.xcassets */; };
7EA478581F40B154000CEDDC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7EA478561F40B154000CEDDC /* LaunchScreen.storyboard */; };
Expand Down Expand Up @@ -235,7 +235,7 @@
7E96D79121E78B7B00C6AB5F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
7E9DDA9A278DE8A2006C6D12 /* WLQ.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WLQ.swift; sourceTree = "<group>"; };
7E9DDA9E278DFFD4006C6D12 /* WLQ_N.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WLQ_N.swift; sourceTree = "<group>"; };
7E9DDAA0278E2403006C6D12 /* WLQ_C.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WLQ_C.swift; sourceTree = "<group>"; };
7E9DDAA0278E2403006C6D12 /* WLQ_S.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WLQ_S.swift; sourceTree = "<group>"; };
7EA4784A1F40B154000CEDDC /* WunderLINQ.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WunderLINQ.app; sourceTree = BUILT_PRODUCTS_DIR; };
7EA4784D1F40B154000CEDDC /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
7EA478541F40B154000CEDDC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
Expand Down Expand Up @@ -538,7 +538,7 @@
7E6987DC20F8F83500B4781D /* Faults.swift */,
7E9DDA9A278DE8A2006C6D12 /* WLQ.swift */,
7E9DDA9E278DFFD4006C6D12 /* WLQ_N.swift */,
7E9DDAA0278E2403006C6D12 /* WLQ_C.swift */,
7E9DDAA0278E2403006C6D12 /* WLQ_S.swift */,
D834BC3E2CB4C154002884B7 /* WLQ_X.swift */,
);
path = WLQ;
Expand Down Expand Up @@ -811,7 +811,7 @@
7E8AD3D926141BA10089F590 /* ADVDashboard.swift in Sources */,
D80365FE2B377FCD00F48637 /* SoundManager.swift in Sources */,
7E7DE00928986B1B0009663C /* ZoomAndSnapFlowLayout.swift in Sources */,
7E9DDAA1278E2403006C6D12 /* WLQ_C.swift in Sources */,
7E9DDAA1278E2403006C6D12 /* WLQ_S.swift in Sources */,
7EA4BCC721B8C9150084F6EA /* TasksCollectionViewController.swift in Sources */,
7E62BB6F21FE3DEB00FDB10E /* MainCollectionViewCell.swift in Sources */,
7E25396321CD94A30008D34E /* BLE.swift in Sources */,
Expand Down
10 changes: 5 additions & 5 deletions WunderLINQ/HWSettingsActionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class HWSettingsActionViewController: UIViewController, UIPickerViewDataSource,


@IBAction func savePressed(_ sender: Any) {
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_C_DEFINES.KEYMODE){ // Mode
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_S_DEFINES.KEYMODE){ // Mode
if (wlqData.getKeyMode() != self.typePicker.selectedRow(inComponent: 0)){
setHWMode(mode: UInt8(self.typePicker.selectedRow(inComponent: 0)))
}
Expand Down Expand Up @@ -141,7 +141,7 @@ class HWSettingsActionViewController: UIViewController, UIPickerViewDataSource,
keyPicker.delegate = self
keyPicker.dataSource = self

if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_C_DEFINES.KEYMODE){ // KEYMODE
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_S_DEFINES.KEYMODE){ // KEYMODE
typePicker.selectRow(Int(wlqData.getKeyMode()), inComponent: 0, animated: true)
keyPicker.isHidden = true
modifierMultiPicker.isHidden = true
Expand Down Expand Up @@ -226,7 +226,7 @@ class HWSettingsActionViewController: UIViewController, UIPickerViewDataSource,

func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
if pickerView == typePicker {
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_C_DEFINES.KEYMODE){ // KEYMODE
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_S_DEFINES.KEYMODE){ // KEYMODE
return keymodesPickerData.count
} else if(actionID == WLQ_N_DEFINES.USB){ // USB
return usbPickerData.count
Expand Down Expand Up @@ -255,7 +255,7 @@ class HWSettingsActionViewController: UIViewController, UIPickerViewDataSource,

func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
if (pickerView == typePicker) {
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_C_DEFINES.KEYMODE){ // KEYMODE
if(actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_S_DEFINES.KEYMODE){ // KEYMODE
return keymodesPickerData[row]
} else if(actionID == WLQ_N_DEFINES.USB){ // USB
return usbPickerData[row]
Expand Down Expand Up @@ -285,7 +285,7 @@ class HWSettingsActionViewController: UIViewController, UIPickerViewDataSource,

func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
if pickerView == typePicker {
if (actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_C_DEFINES.KEYMODE){ // KEYMODE
if (actionID == WLQ_N_DEFINES.KEYMODE || actionID == WLQ_X_DEFINES.KEYMODE || actionID == WLQ_S_DEFINES.KEYMODE){ // KEYMODE
if (wlqData.getKeyMode() != row) {
saveButton.isHidden = false
} else {
Expand Down
60 changes: 21 additions & 39 deletions WunderLINQ/HWSettingsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class HWSettingsViewController: UIViewController, UITableViewDelegate, UITableVi
performSegue(withIdentifier: "hwSettingsToSettingsAction", sender: [])
}
} else {
if (self.actionID[indexPath.row] == WLQ_N_DEFINES.KEYMODE || self.actionID[indexPath.row] == WLQ_C_DEFINES.KEYMODE){
if (self.actionID[indexPath.row] == WLQ_N_DEFINES.KEYMODE || self.actionID[indexPath.row] == WLQ_S_DEFINES.KEYMODE){
selectedActionID = self.actionID[indexPath.row]
performSegue(withIdentifier: "hwSettingsToSettingsAction", sender: [])
}
Expand Down Expand Up @@ -336,57 +336,39 @@ class HWSettingsViewController: UIViewController, UITableViewDelegate, UITableVi
}
}
}
} else if (wlqData.gethardwareType() == wlqData.TYPE_C()){
} else if (wlqData.gethardwareType() == wlqData.TYPE_S()){
if (wlqData.getKeyMode() == wlqData.KEYMODE_DEFAULT() || wlqData.getKeyMode() == wlqData.KEYMODE_CUSTOM()
|| wlqData.getKeyMode() == wlqData.KEYMODE_MEDIA()) {

actionTableLabels = [NSLocalizedString("keymode_label", comment: ""), //KEYMODE
NSLocalizedString("full_scroll_up_label", comment: ""),
NSLocalizedString("full_scroll_down_label", comment: ""),
NSLocalizedString("full_toggle_right_label", comment: ""),
NSLocalizedString("full_toggle_right_long_label", comment: ""),
NSLocalizedString("full_toggle_left_label", comment: ""),
NSLocalizedString("full_toggle_left_long_label", comment: ""),
NSLocalizedString("full_rocker1_up_label", comment: ""),
NSLocalizedString("full_rocker1_up_long_label", comment: ""),
NSLocalizedString("full_rocker1_down_label", comment: ""),
NSLocalizedString("full_rocker1_down_long_label", comment: ""),
NSLocalizedString("full_rocker2_up_label", comment: ""),
NSLocalizedString("full_rocker2_up_long_label", comment: ""),
NSLocalizedString("full_rocker2_down_label", comment: ""),
NSLocalizedString("full_rocker2_down_long_label", comment: "")]
NSLocalizedString("full_rocker2_down_label", comment: "")]

actionTableMappingLabels = [wlqData.getActionValue(action: WLQ_C_DEFINES.KEYMODE),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelScrollUp),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelScrollDown),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelToggleRight),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelToggleRightLongPress),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelToggleLeft),
wlqData.getActionValue(action: WLQ_C_DEFINES.wheelToggleLeftLongPress),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker1Up),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker1UpLongPress),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker1Down),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker1DownLongPress),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker2Up),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker2UpLongPress),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker2Down),
wlqData.getActionValue(action: WLQ_C_DEFINES.rocker2DownLongPress)]
actionTableMappingLabels = [wlqData.getActionValue(action: WLQ_S_DEFINES.KEYMODE),
wlqData.getActionValue(action: WLQ_S_DEFINES.wheelScrollUp),
wlqData.getActionValue(action: WLQ_S_DEFINES.wheelScrollDown),
wlqData.getActionValue(action: WLQ_S_DEFINES.wheelToggleRight),
wlqData.getActionValue(action: WLQ_S_DEFINES.wheelToggleLeft),
wlqData.getActionValue(action: WLQ_S_DEFINES.rocker1Up),
wlqData.getActionValue(action: WLQ_S_DEFINES.rocker1Down),
wlqData.getActionValue(action: WLQ_S_DEFINES.rocker2Up),
wlqData.getActionValue(action: WLQ_S_DEFINES.rocker2Down)]

actionID = [WLQ_C_DEFINES.KEYMODE,
WLQ_C_DEFINES.wheelScrollUp,
WLQ_C_DEFINES.wheelScrollDown,
WLQ_C_DEFINES.wheelToggleRight,
WLQ_C_DEFINES.wheelToggleRightLongPress,
WLQ_C_DEFINES.wheelToggleLeft,
WLQ_C_DEFINES.wheelToggleLeftLongPress,
WLQ_C_DEFINES.rocker1Up,
WLQ_C_DEFINES.rocker1UpLongPress,
WLQ_C_DEFINES.rocker1Down,
WLQ_C_DEFINES.rocker1DownLongPress,
WLQ_C_DEFINES.rocker2Up,
WLQ_C_DEFINES.rocker2UpLongPress,
WLQ_C_DEFINES.rocker2Down,
WLQ_C_DEFINES.rocker2DownLongPress]
actionID = [WLQ_S_DEFINES.KEYMODE,
WLQ_S_DEFINES.wheelScrollUp,
WLQ_S_DEFINES.wheelScrollDown,
WLQ_S_DEFINES.wheelToggleRight,
WLQ_S_DEFINES.wheelToggleLeft,
WLQ_S_DEFINES.rocker1Up,
WLQ_S_DEFINES.rocker1Down,
WLQ_S_DEFINES.rocker2Up,
WLQ_S_DEFINES.rocker2Down]

if (wlqData.getKeyMode() == wlqData.KEYMODE_CUSTOM()){
menuBtn.isHidden = true
Expand Down
2 changes: 1 addition & 1 deletion WunderLINQ/MainCollectionViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ class MainCollectionViewController: UIViewController, UICollectionViewDataSource
peripheral.readValue(for: commandCharacteristic!)
}
} else if characteristic.uuid == CBUUID(string: Device.WunderLINQCCommandCharacteristicUUID) {
wlqData = WLQ_C()
wlqData = WLQ_S()
// Enable the message notifications
os_log("MainCollectionViewController: COMMAND INTERFACE FOUND")
commandCharacteristic = characteristic
Expand Down
2 changes: 1 addition & 1 deletion WunderLINQ/hardware/WLQ/WLQ.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class WLQ {
func TYPE_X() -> Int{
return 2
}
func TYPE_C() -> Int{
func TYPE_S() -> Int{
return 3
}
func KEYMODE_DEFAULT() -> UInt8{
Expand Down
Loading
Loading