Skip to content

Commit

Permalink
Merge pull request #20 from jimmyeao/master
Browse files Browse the repository at this point in the history
master to dev
  • Loading branch information
jimmyeao authored Feb 1, 2024
2 parents 28badf7 + a7c7012 commit 3c01db3
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 34 deletions.
36 changes: 36 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: jimmyeao

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

** Logs - (please complete the following information) **
- THFHA Logs
- Windows Application logs from event viewer

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion API/MqttClientWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ public static List<string> GetEntityNames(string deviceId)
$"sensor.{deviceId}_issharing",
$"sensor.{deviceId}_hasunreadmessages",
$"switch.{deviceId}_isbackgroundblurred"
// Add more entities based on your application's functionality

};

return entityNames;
Expand Down
32 changes: 2 additions & 30 deletions MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -294,17 +294,7 @@ public MainWindow()
#endregion Public Constructors

#region Public Methods
//public static List<string> GetEntityNames()
//{
// // Example: return a list of entity names based on the sensors and switches
// return new List<string>
// {
// "Teams Mute Switch",
// "Teams Video Switch",
// "Teams Hand Raised Sensor",
// // Add more entities as per your application's functionality
// };
//}

public async Task InitializeConnections()
{
await InitializeMQTTConnection();
Expand Down Expand Up @@ -904,25 +894,7 @@ private async Task PublishConfigurations(MeetingUpdate meetingUpdate, AppSetting

}

//private async Task PublishDiscoveryMessages()
//{
// var muteSwitchConfig = new
// {
// name = "Teams Mute",
// unique_id = "TEAMS2HA_mute",
// state_topic = "TEAMS2HA/TEAMS/mute",
// command_topic = "TEAMS2HA/TEAMS/mute/set",
// payload_on = "true",
// payload_off = "false",
// device = new { identifiers = new[] { "TEAMS2HA" }, name = "Teams Integration", manufacturer = "Your Company" }
// };

// string muteConfigTopic = "homeassistant/switch/TEAMS2HA/mute/config";
// await mqttClientWrapper.PublishAsync(muteConfigTopic, JsonConvert.SerializeObject(muteSwitchConfig));

// // Repeat for other entities like video
//}


private bool SaveSettings()
{
var settings = AppSettings.Instance;
Expand Down
4 changes: 2 additions & 2 deletions TEAMS2HA.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<TargetFramework>net7.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>
<AssemblyVersion>1.1.0.231</AssemblyVersion>
<FileVersion>1.1.0.231</FileVersion>
<AssemblyVersion>1.1.0.245</AssemblyVersion>
<FileVersion>1.1.0.245</FileVersion>
<ApplicationIcon>Assets\Square150x150Logo.scale-200.ico</ApplicationIcon>
<Title>Teams2HA</Title>
<PackageIcon>Square150x150Logo.scale-200.png</PackageIcon>
Expand Down
6 changes: 5 additions & 1 deletion TEAMS2HA.sln
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.7.34302.85
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TEAMS2HA", "TEAMS2HA.csproj", "{38D15280-C54C-403A-9676-DA1FFB23BB70}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TEAMS2HA", "TEAMS2HA.csproj", "{38D15280-C54C-403A-9676-DA1FFB23BB70}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup Project", "..\Setup Project\Setup Project.vdproj", "{8E191643-154A-48CB-8D16-448699150869}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -15,6 +17,8 @@ Global
{38D15280-C54C-403A-9676-DA1FFB23BB70}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38D15280-C54C-403A-9676-DA1FFB23BB70}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38D15280-C54C-403A-9676-DA1FFB23BB70}.Release|Any CPU.Build.0 = Release|Any CPU
{8E191643-154A-48CB-8D16-448699150869}.Debug|Any CPU.ActiveCfg = Debug
{8E191643-154A-48CB-8D16-448699150869}.Release|Any CPU.ActiveCfg = Release
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down

0 comments on commit 3c01db3

Please sign in to comment.