Permalink
Browse files

Correction gestion de la commande DIM

  • Loading branch information...
perarem committed Nov 30, 2017
1 parent 1a9f003 commit b2f314405df8edb11393a6e81836de331df5d499
Showing with 47 additions and 13 deletions.
  1. BIN DEBUG/Drivers/Driver_RFLink.dll
  2. +27 −6 Drivers_autonomes/Driver_RFLink/Driver_RFLink.vb
  3. +20 −7 HoMIDoM.sln
BIN +512 Bytes (100%) DEBUG/Drivers/Driver_RFLink.dll
Binary file not shown.
@@ -521,8 +521,15 @@ Public Class Driver_RFLink
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;" & Command & ";"
Case "DIM"
If Not IsNothing(Parametre1) Then
Parametre1 = Hex(Parametre1)
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
If Parametre1 > 15 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;ON;"
' WriteRetourSend(Objet.Adresse1, "", Command)
ElseIf Parametre1 = 0 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;OFF;"
' WriteRetourSend(Objet.Adresse1, "", Command)
Else
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
End If
Else
WriteLog("ERR: DIM Il manque un parametre pour (" & Objet.Name & ")")
Exit Sub
@@ -556,8 +563,15 @@ Public Class Driver_RFLink
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Command & ";"
Case "DIM"
If Not IsNothing(Parametre1) Then
Parametre1 = Hex(Parametre1)
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
If Parametre1 > 15 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;ON;"
' WriteRetourSend(Objet.Adresse1, "", Command)
ElseIf Parametre1 = 0 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;OFF;"
' WriteRetourSend(Objet.Adresse1, "", Command)
Else
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
End If
Else
WriteLog("ERR: DIM Il manque un parametre pour (" & Objet.Name & ")")
Exit Sub
@@ -603,8 +617,15 @@ Public Class Driver_RFLink
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Command & ";"
Case "DIM"
If Not IsNothing(Parametre1) Then
Parametre1 = Hex(Parametre1)
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
If Parametre1 > 15 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;ON;"
' WriteRetourSend(Objet.Adresse1, "", Command)
ElseIf Parametre1 = 0 Then
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";0;OFF;"
' WriteRetourSend(Objet.Adresse1, "", Command)
Else
RFLinkCommand = "10;" & Objet.Adresse2 & ";" & RFAdresse(0) & ";" & RFAdresse(1) & ";" & Parametre1 & ";"
End If
Else
WriteLog("ERR: DIM Il manque un parametre pour (" & Objet.Name & ")")
Exit Sub
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Driver_Foobar", "Drivers\Driver_Foobar\Driver_Foobar.vbproj", "{62C5EA60-2FE8-4F56-BC66-BE2D7B14CA5B}"
EndProject
@@ -126,6 +126,8 @@ Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Driver_MyFox", "Drivers_aut
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Driver_VMC", "Drivers_autonomes\Driver_VMC\Driver_VMC.vbproj", "{2CC567BC-F20A-4CE1-BD0C-F4EF1B723B2F}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Driver_RFLink2", "Drivers_autonomes\Driver_RFLink2\Driver_RFLink2.vbproj", "{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -686,11 +688,22 @@ Global
{2CC567BC-F20A-4CE1-BD0C-F4EF1B723B2F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2CC567BC-F20A-4CE1-BD0C-F4EF1B723B2F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2CC567BC-F20A-4CE1-BD0C-F4EF1B723B2F}.Release|x86.ActiveCfg = Release|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Debug|x86.ActiveCfg = Debug|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Release|Any CPU.Build.0 = Release|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{62C5EA60-2FE8-4F56-BC66-BE2D7B14CA5B} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{B1154B53-619A-4878-8915-9A98904EEEF5} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{E45EDD1D-4BED-4782-9050-D42EF782C28E} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{B0602976-1274-4BDB-8158-9A655821E14D} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
@@ -731,7 +744,6 @@ Global
{7E92B3E9-0C1F-4FD0-BCB8-21A298735F5E} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{FD7B7D66-9812-4583-81D5-C4A51C84C2B0} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{41C380BE-0028-4453-B69F-F1B709D5D391} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{62C5EA60-2FE8-4F56-BC66-BE2D7B14CA5B} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{66D5DC1D-246B-49DA-9856-4ED68966D3C7} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{25D01A09-60A9-4D63-B18F-CF54D158897C} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{8E61A745-C86C-4EF1-BDDF-F849CA47F52E} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
@@ -741,12 +753,13 @@ Global
{793C295F-3626-4452-BD47-4B814C1BB44C} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{FB81937A-A05A-4F07-AD6A-F643B241D7BE} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{2CC567BC-F20A-4CE1-BD0C-F4EF1B723B2F} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
{8B8BE416-4335-4937-BBDF-E92DC91AB0E4} = {A84FBDA1-CBD9-45E0-A3CC-7C0E7842D533}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
BuildVersion_UpdateAssemblyVersion = True
BuildVersion_UpdateFileVersion = True
BuildVersion_BuildVersioningStyle = None.None.Increment.None
BuildVersion_UseGlobalSettings = True
BuildVersion_IncrementBeforeBuild = True
BuildVersion_UseGlobalSettings = True
BuildVersion_BuildVersioningStyle = None.None.Increment.None
BuildVersion_UpdateFileVersion = True
BuildVersion_UpdateAssemblyVersion = True
EndGlobalSection
EndGlobal

0 comments on commit b2f3144

Please sign in to comment.