Skip to content
This repository was archived by the owner on Oct 12, 2023. It is now read-only.

Add adjustable brightness #2

Open
Stanley1551 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add adjustable brightness #2

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
30 changes: 22 additions & 8 deletions src/MagicHome/Light.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ public async Task RefreshAsync()
{
await SendAsync(0x81, 0x8a, 0x8b); // Send instruction to retrieve data later
var result = await ReadAsync();

var resultAsHex = result.Select(r => r.ToString("X")).ToArray(); // Convert to hex

// Populate properties
Expand Down Expand Up @@ -234,7 +234,7 @@ public static IEnumerable<byte> CalculateChecksum(IReadOnlyList<byte> bytes)
var packet = new List<byte>();
byte checksum = 0;

checksum = (byte) bytes.Sum(b => b); // checksum = 'sum of all byte elements in array'
checksum = (byte)bytes.Sum(b => b); // checksum = 'sum of all byte elements in array'
checksum &= 0xFF; // checksum = checksum AND 255

packet.AddRange(bytes); // First things first, add our bytes
Expand All @@ -253,8 +253,8 @@ public static IEnumerable<byte> CalculateChecksum(IReadOnlyList<byte> bytes)
/// <returns></returns>
public async Task SetPowerAsync(bool isOn)
{
var packet = isOn ? new byte[] {0x71, 0x23, 0x0f} : new byte[] {0x71, 0x24, 0x0f};
var packet = isOn ? new byte[] { 0x71, 0x23, 0x0f } : new byte[] { 0x71, 0x24, 0x0f };

await SendAsync(packet);
IsOn = isOn;
}
Expand All @@ -277,10 +277,19 @@ public async Task SetPowerAsync(bool isOn)
/// </summary>
/// <param name="color"></param>
/// <returns></returns>
public async Task SetColorAsync(Color color)
public async Task SetColorAsync(Color color, int brightness = 100)
{
await SendAsync(0x41,
color.R, color.G, color.B,
if (brightness > 100 || brightness < 0)
{
brightness = 100;
}

byte r = GetByteFromInt((int)Math.Round((double)color.R / 100 * brightness));
byte g = GetByteFromInt((int)Math.Round((double)color.G / 100 * brightness));
byte b = GetByteFromInt((int)Math.Round((double)color.B / 100 * brightness));

await SendAsync(0x41,
r, g, b,
0x00, 0x00, 0x0f);

Color = color;
Expand Down Expand Up @@ -312,7 +321,7 @@ private static LightMode DetermineLightMode(string hex)
case "60":
return LightMode.Custom;
case "2a":
case "2b":
case "2b":
case "2c":
case "2d":
case "2e":
Expand Down Expand Up @@ -345,6 +354,11 @@ private static Color DetermineColor(LightMode mode, byte[] data)
return Color.Transparent;
}
}

private static byte GetByteFromInt(int number)
{
return BitConverter.GetBytes(number)[0];
}
#endregion

#region Interface Implementations
Expand Down