Physical LED count

PoomSmart · PoomSmart · commit 4f60274f8760 · 2024-01-24T21:52:59.000+07:00
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 TARGET := iphone:clang:latest:11.0
 INSTALL_TARGET_PROCESSES = TrollLEDs
 ARCHS = arm64
-PACKAGE_VERSION = 1.5.0
+PACKAGE_VERSION = 1.6.0
 
 include $(THEOS)/makefiles/common.mk
 
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@
 
 Quad-LEDs devices are devices with four programmatically configurable flashlight LEDs, two white and two amber. This includes the devices such as iPhone 11 and iPad Pro 3rd generation.
 
+### Sliders
+
 There are four sliders in the app:
 
 1. `Cool LED 0` - The brightness of the first white LED
@@ -26,6 +28,18 @@ Each slider can be adjusted independently. The more the value, the more brightne
 
 Devices with four physical LEDs such as iPad Pro 3rd generation will get the maximum brightness of the LEDs when all sliders are set to 100%. However, devices with two physical LEDs such as iPhone 11 will get the maximum brightness of the LEDs when `Cool LED 0` and `Warm LED 0` are set to 100%, while the others are set to 0%. The `Cool LED 1` and `Warm LED 1` sliders only act as a low brightness mode for their `LED 0` equivalent.
 
+### Physical LED Count
+
+Despite being categorized as a quad-LEDs device, it may have only two physical LEDs. TrollLEDs allows you to explicitly set the physical LED count in the app (There is no good way to automatically detect the physical LED count, yet).
+
+If the value is set to `Dual`:
+
+1. The app shortcut `Amber On` will maximize the `Warm LED 0` slider only
+2. The app shortcut `White On` will maximize the `Cool LED 0` slider only
+3. The app shortcut `All On` will maximize the `Cool LED 0` and `Warm LED 0` sliders only
+
+If the value is set to `Quad`, the app shortcuts will maximize all related sliders.
+
 ## Usage (Dual-LEDs Devices)
 
 Dual-LEDs devices are devices with two programmatically configurable flashlight LEDs, such as iPhone 5s and iPhone SE 1st generation.
diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -44,9 +44,9 @@
         <string>iPhoneOS</string>
     </array>
     <key>CFBundleShortVersionString</key>
-    <string>1.5.0</string>
+    <string>1.6.0</string>
     <key>CFBundleVersion</key>
-    <string>1.5.0</string>
+    <string>1.6.0</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>MinimumOSVersion</key>
diff --git a/TLDeviceManager.h b/TLDeviceManager.h
@@ -12,11 +12,9 @@
     OpaqueFigCaptureStreamRef streamRef;
     CMBaseObjectSetPropertyFunction streamSetProperty;
     BOOL legacyLEDs;
-    BOOL quadLEDs;
 }
 @property (nonatomic, strong) NSString *currentError;
 - (BOOL)isLegacyLEDs;
-- (BOOL)isQuadLEDs;
 - (BOOL)setupStream;
 - (void)releaseStream;
 - (void)initVendor;
diff --git a/TLDeviceManager.m b/TLDeviceManager.m
@@ -22,12 +22,9 @@ - (void)checkType {
     CFMutableDictionaryRef (*IOServiceMatching)(const char *name) = (CFMutableDictionaryRef (*)(const char *))dlsym(IOKit, "IOServiceMatching");
     mach_port_t (*IOServiceGetMatchingService)(mach_port_t masterPort, CFDictionaryRef matching) = (mach_port_t (*)(mach_port_t, CFDictionaryRef))dlsym(IOKit, "IOServiceGetMatchingService");
     kern_return_t (*IOObjectRelease)(mach_port_t object) = (kern_return_t (*)(mach_port_t))dlsym(IOKit, "IOObjectRelease");
-    mach_port_t h13 = IOServiceGetMatchingService(*kIOMasterPortDefault, IOServiceMatching("AppleH13CamIn"));
     mach_port_t h9 = IOServiceGetMatchingService(*kIOMasterPortDefault, IOServiceMatching("AppleH9CamIn"));
     mach_port_t h6 = IOServiceGetMatchingService(*kIOMasterPortDefault, IOServiceMatching("AppleH6CamIn"));
-    quadLEDs = h13;
     legacyLEDs = h9 || h6;
-    if (h13) IOObjectRelease(h13);
     if (h9) IOObjectRelease(h9);
     if (h6) IOObjectRelease(h6);
 }
@@ -109,10 +106,6 @@ - (BOOL)isLegacyLEDs {
     return legacyLEDs;
 }
 
-- (BOOL)isQuadLEDs {
-    return quadLEDs;
-}
-
 - (void)setNumberProperty:(CFStringRef)property value:(id)value {
     if (stream)
         [stream setProperty:property value:value];
diff --git a/TLRootViewController.m b/TLRootViewController.m
@@ -1,4 +1,6 @@
+#include <Foundation/Foundation.h>
 #import <objc/objc.h>
+#import <theos/IOSMacros.h>
 #import <UIKit/UIColor+Private.h>
 #import "TLRootViewController.h"
 
@@ -22,6 +24,10 @@ @interface TLRootViewController () {
 @property (nonatomic, strong) NSMutableArray <NSLayoutConstraint *> *lockSwitchConstraints;
 @property (nonatomic, strong) UILabel *lockSwitchLabel;
 @property (nonatomic, strong) NSMutableArray <NSLayoutConstraint *> *lockSwitchLabelConstraints;
+@property (nonatomic, strong) UISegmentedControl *ledCount;
+@property (nonatomic, strong) NSMutableArray <NSLayoutConstraint *> *ledCountConstraints;
+@property (nonatomic, strong) UILabel *ledCountLabel;
+@property (nonatomic, strong) NSMutableArray <NSLayoutConstraint *> *ledCountLabelConstraints;
 @end
 
 @implementation TLRootViewController
@@ -38,6 +44,8 @@ @implementation TLRootViewController
 @synthesize lockSwitchConstraints = _lockSwitchConstraints;
 @synthesize lockSwitchLabel = _lockSwitchLabel;
 @synthesize lockSwitchLabelConstraints = _lockSwitchLabelConstraints;
+@synthesize ledCount = _ledCount;
+@synthesize ledCountConstraints = _ledCountConstraints;
 
 - (instancetype)init {
     self = [super init];
@@ -62,9 +70,13 @@ - (void)releaseStream {
     [_deviceManager releaseStream];
 }
 
+- (BOOL)isQuadLEDs {
+    return [[NSUserDefaults standardUserDefaults] boolForKey:@"TLQuadLEDs"];
+}
+
 - (void)handleShortcutAction:(NSString *)shortcutType {
     BOOL legacy = [_deviceManager isLegacyLEDs];
-    BOOL quad = [_deviceManager isQuadLEDs];
+    BOOL quad = [self isQuadLEDs];
     if ([shortcutType isEqualToString:@"com.ps.TrollLEDs.AmberOn"]) {
         if (legacy) {
             LEDLevel = 100;
@@ -152,31 +164,16 @@ - (NSString *)switchLabel {
     return locked ? @"On: Only TrollLEDs can control the LEDs" : @"Off: Release the LEDs to other apps (this may take few seconds)";
 }
 
-- (void)viewDidLoad {
-    [super viewDidLoad];
-
-    NSString *currentError = _deviceManager.currentError;
-    if (currentError) {
-        [self printError:currentError];
-        return;
-    }
-    
-    BOOL isLegacyLEDs = [_deviceManager isLegacyLEDs];
-
+- (void)configureTableView {
     UITableView *tableView = (UITableView *)self.view;
     tableView.scrollEnabled = NO;
     tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
     tableView.backgroundColor = [UIColor blackColor];
+}
 
-    _sliders = [[NSMutableArray alloc] init];
-    _sliderConstraints = [[NSMutableArray alloc] init];
-    _sliderLabels = [[NSMutableArray alloc] init];
-    _sliderLabelConstraints = [[NSMutableArray alloc] init];
-    _sliderValueLabels = [[NSMutableArray alloc] init];
-    _sliderValueLabelConstraints = [[NSMutableArray alloc] init];
+- (void)configureLockSwitch {
     _lockSwitchConstraints = [[NSMutableArray alloc] init];
     _lockSwitchLabelConstraints = [[NSMutableArray alloc] init];
-    int sliderCount = isLegacyLEDs ? 2 : 4;
 
     _lockSwitch = [[UISwitch alloc] init];
     _lockSwitch.translatesAutoresizingMaskIntoConstraints = NO;
@@ -194,14 +191,44 @@ - (void)viewDidLoad {
     _lockSwitchLabel.font = [UIFont systemFontOfSize:14];
 
     [self.view addSubview:_lockSwitchLabel];
+}
+
+- (void)configureLEDCount {
+    _ledCountConstraints = [[NSMutableArray alloc] init];
+    _ledCountLabelConstraints = [[NSMutableArray alloc] init];
+
+    _ledCount = [[UISegmentedControl alloc] initWithItems:@[@"Dual", @"Quad"]];
+    _ledCount.translatesAutoresizingMaskIntoConstraints = NO;
+    _ledCount.selectedSegmentIndex = [self isQuadLEDs] ? 1 : 0;
+    [_ledCount addTarget:self action:@selector(ledCountChanged:) forControlEvents:UIControlEventValueChanged];
+
+    [self.view addSubview:_ledCount];
+
+    _ledCountLabel = [[UILabel alloc] init];
+    _ledCountLabel.translatesAutoresizingMaskIntoConstraints = NO;
+    _ledCountLabel.text = @"Physical LED Count";
+    _ledCountLabel.textColor = [UIColor systemGrayColor];
+    _ledCountLabel.textAlignment = NSTextAlignmentCenter;
+    _ledCountLabel.font = [UIFont systemFontOfSize:14];
+
+    [self.view addSubview:_ledCountLabel];
+}
+
+- (void)configureLEDSliders:(int)sliderCount maximumValue:(int)maximumValue {
+    _sliders = [[NSMutableArray alloc] init];
+    _sliderConstraints = [[NSMutableArray alloc] init];
+    _sliderLabels = [[NSMutableArray alloc] init];
+    _sliderLabelConstraints = [[NSMutableArray alloc] init];
+    _sliderValueLabels = [[NSMutableArray alloc] init];
+    _sliderValueLabelConstraints = [[NSMutableArray alloc] init];
 
     for (NSInteger i = 0; i < sliderCount; i++) {
         UIColor *color = [self color:i];
 
         UISlider *slider = [[UISlider alloc] init];
         slider.translatesAutoresizingMaskIntoConstraints = NO;
         slider.minimumValue = 0;
-        slider.maximumValue = isLegacyLEDs ? 100 : 255;
+        slider.maximumValue = maximumValue;
         slider.value = 0;
         slider.minimumTrackTintColor = color;
         slider.transform = CGAffineTransformMakeRotation(-M_PI_2);
@@ -242,6 +269,25 @@ - (void)viewDidLoad {
         [self.view addSubview:valueLabel];
         [_sliderValueLabels addObject:valueLabel];
     }
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    NSString *currentError = _deviceManager.currentError;
+    if (currentError) {
+        [self printError:currentError];
+        return;
+    }
+    
+    BOOL isLegacyLEDs = [_deviceManager isLegacyLEDs];
+    int sliderCount = isLegacyLEDs ? 2 : 4;
+
+    [self configureTableView];
+    [self configureLockSwitch];
+    if (!isLegacyLEDs)
+        [self configureLEDCount];
+    [self configureLEDSliders:sliderCount maximumValue:isLegacyLEDs ? 100 : 255];
 
     if (_shortcutAction) {
         [self handleShortcutAction:_shortcutAction];
@@ -252,36 +298,56 @@ - (void)viewDidLoad {
 - (void)viewWillLayoutSubviews {
     [super viewWillLayoutSubviews];
 
+    BOOL isLegacyLEDs = [_deviceManager isLegacyLEDs];
+
     [NSLayoutConstraint deactivateConstraints:_sliderConstraints];
     [NSLayoutConstraint deactivateConstraints:_sliderLabelConstraints];
     [NSLayoutConstraint deactivateConstraints:_sliderValueLabelConstraints];
     [NSLayoutConstraint deactivateConstraints:_lockSwitchConstraints];
     [NSLayoutConstraint deactivateConstraints:_lockSwitchLabelConstraints];
+
     [_sliderConstraints removeAllObjects];
     [_sliderLabelConstraints removeAllObjects];
     [_sliderValueLabelConstraints removeAllObjects];
     [_lockSwitchConstraints removeAllObjects];
     [_lockSwitchLabelConstraints removeAllObjects];
 
-    UISwitch *lockSwitch = _lockSwitch;
+    if (!isLegacyLEDs) {
+        [NSLayoutConstraint deactivateConstraints:_ledCountConstraints];
+        [NSLayoutConstraint deactivateConstraints:_ledCountLabelConstraints];
+        [_ledCountConstraints removeAllObjects];
+        [_ledCountLabelConstraints removeAllObjects];
+    }
 
-    NSLayoutConstraint *lockSwitchCenterX = [lockSwitch.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
-    NSLayoutConstraint *lockSwitchTop = [lockSwitch.topAnchor constraintEqualToAnchor:self.view.topAnchor constant:20];
+    NSLayoutConstraint *lockSwitchCenterX = [_lockSwitch.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
+    NSLayoutConstraint *lockSwitchTop = [_lockSwitch.topAnchor constraintEqualToAnchor:self.view.topAnchor constant:20];
 
     [_lockSwitchConstraints addObjectsFromArray:@[lockSwitchCenterX, lockSwitchTop]];
     [NSLayoutConstraint activateConstraints:_lockSwitchConstraints];
 
-    UILabel *lockSwitchLabel = _lockSwitchLabel;
-
-    NSLayoutConstraint *lockSwitchLabelCenterX = [lockSwitchLabel.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
-    NSLayoutConstraint *lockSwitchLabelTop = [lockSwitchLabel.topAnchor constraintEqualToAnchor:lockSwitch.bottomAnchor constant:10];
-    NSLayoutConstraint *lockSwitchLabelWidth = [lockSwitchLabel.widthAnchor constraintEqualToAnchor:self.view.widthAnchor multiplier:0.9];
+    NSLayoutConstraint *lockSwitchLabelCenterX = [_lockSwitchLabel.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
+    NSLayoutConstraint *lockSwitchLabelTop = [_lockSwitchLabel.topAnchor constraintEqualToAnchor:_lockSwitch.bottomAnchor constant:10];
+    NSLayoutConstraint *lockSwitchLabelWidth = [_lockSwitchLabel.widthAnchor constraintEqualToAnchor:self.view.widthAnchor multiplier:0.9];
 
     [_lockSwitchLabelConstraints addObjectsFromArray:@[lockSwitchLabelCenterX, lockSwitchLabelTop, lockSwitchLabelWidth]];
     [NSLayoutConstraint activateConstraints:_lockSwitchLabelConstraints];
 
+    if (!isLegacyLEDs) {
+        NSLayoutConstraint *ledCountCenterX = [_ledCount.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
+        NSLayoutConstraint *ledCountBottom = [_ledCount.bottomAnchor constraintEqualToAnchor:self.view.safeAreaLayoutGuide.bottomAnchor constant:-20];
+
+        [_ledCountConstraints addObjectsFromArray:@[ledCountCenterX, ledCountBottom]];
+        [NSLayoutConstraint activateConstraints:_ledCountConstraints];
+
+        NSLayoutConstraint *ledCountLabelCenterX = [_ledCountLabel.centerXAnchor constraintEqualToAnchor:self.view.centerXAnchor];
+        NSLayoutConstraint *ledCountLabelBottom = [_ledCountLabel.bottomAnchor constraintEqualToAnchor:_ledCount.topAnchor constant:-10];
+
+        [_ledCountLabelConstraints addObjectsFromArray:@[ledCountLabelCenterX, ledCountLabelBottom]];
+        [NSLayoutConstraint activateConstraints:_ledCountLabelConstraints];
+    }
+
     CGFloat sliderWidth = 30.0;
-    CGFloat sliderHeight = self.view.bounds.size.height * 0.4;
+    CGFloat sliderHeight = self.view.bounds.size.height * (IS_IPAD || isLegacyLEDs ? 0.4 : 0.3);
     CGFloat totalSlidersWidth = _sliders.count * sliderWidth;
     CGFloat spacing = (self.view.bounds.size.width - totalSlidersWidth) / (_sliders.count + 1);
 
@@ -315,6 +381,10 @@ - (void)viewWillLayoutSubviews {
     [NSLayoutConstraint activateConstraints:_sliderValueLabelConstraints];
 }
 
+- (void)ledCountChanged:(UISegmentedControl *)sender {
+    [[NSUserDefaults standardUserDefaults] setBool:sender.selectedSegmentIndex == 1 forKey:@"TLQuadLEDs"];
+}
+
 - (void)sliderValueTapped:(UITapGestureRecognizer *)sender {
     if (!locked) return;
     UILabel *label = (UILabel *)sender.view;
