Re: [mh] Any other PRs out there/Need help submitting second PR
Giles Godart-Brown <[email protected]> Sun, 9 Jun 2024 21:24:42 +0100
| Newsgroups | gmane.comp.misc.misterhouse.user |
|---|---|
| Message-ID | <[email protected]> |
--===============6582161614920027493==
Content-Type: multipart/alternative; boundary=Apple-Mail-4DBB71F1-A449-4F84-81BB-963D098858D5
Content-Transfer-Encoding: 7bit
--Apple-Mail-4DBB71F1-A449-4F84-81BB-963D098858D5
Content-Type: text/plain;
charset=utf-8
Content-Transfer-Encoding: quoted-printable
Hollie
I=E2=80=99ve not submitted this, but I=E2=80=99ve made some changes to the t=
asmota html module.
Here is the reasoning.
I have a number of devices that are unplugged for part of the year e.g. heat=
ing radiators and Christmas tree lights.
In order to accommodate this I have added {on_off_line} to all http devices=
, this has 3 states, Online, Unplugged , and Offline.=20
MH only attempts to change the state of online devices, thus avoiding timeou=
ts in the main loop.
Giles
> On 9 Jun 2024, at 15:28, H Plato <[email protected]> wrote:
>=20
> =EF=BB=BFJust an update on this. With Dave=E2=80=99s awesome HA_Item modul=
e and help, I=E2=80=99ve managed to migrate my razberry, yeelight, shluter a=
nd my venstar modules to home assistant. I still have my eto calcuations/ope=
n sprinkler, tasmota power and nanoleaf left to do. I=E2=80=99ve been really=
impressed with Dave=E2=80=99s HA_Item work, and think this approach will al=
low us to leverage the logic of MH and the device support of HA for the futu=
re.
>=20
> If I can get all my device=E2=80=99s moved over and some run time in the s=
ummer, this would be a great state for a MH release.
>=20
> I still use festival for a local voice engine, but have found piper, which=
has a lot of promise. Right now I have an old old old linux 2.4 VM that run=
s an old version of festival in =E2=80=99server mode=E2=80=99, and a wav fil=
e is picked up and played on the speakers attached to a Delta410. If anyone h=
as something similar and is using piper, I=E2=80=99d be interested in hearin=
g about it.
>=20
> Again, I encourage everyone to update when they have a chance so we can al=
so address any issues or bugs.
>=20
>> On Apr 1, 2024, at 8:18=E2=80=AFAM, Lieven Hollevoet <[email protected]> wro=
te:
>>=20
>> Hey Brian,
>>=20
>> The most efficient way to do is is to checkout the master branch, create a=
new branch for PR#2, apply the change for PR#2, commit it to the branch for=
PR#2.=20
>>=20
>> If you then create a pull request for the branch you created for PR#2 it w=
ill only contain that change and not the one for PR#1.
>>=20
>> The reason you see both changes is because you applied the change for PR#=
2 to the same branch of PR#1.=20
>>=20
>> Basic idea: different pull request =3D different branch on which you appl=
y the change.
>>=20
>> Hope this helps, if it doesn=E2=80=99t please send me a link to the branc=
h you are working on and we can take a look together.
>>=20
>> Best regards,
>> Lieven.
>>=20
>>> Op 31 mrt. 2024, om 21:41 heeft [email protected] het volg=
ende geschreven:
>>>=20
>>> On 3/29/24 08:22, H Plato wrote:
>>>> My ask is that if there are any code updates out there that folks want t=
o include, to put in a pull request so we can capture them. Also, if anyone c=
an update to master for any testing, that would be great as well.
>>> Can anybody help me with GitHub? One of my pull requests is trying to su=
ck in irrelevant changes from another.
>>>=20
>>> So I fixed a minor detail in the MH master branch and submitted a PR (ca=
ll it "PR#1"). Now I have code in a much different and unrelated area that I=
also want to submit ("PR#2). But since PR#1 hasn't been committed upstream y=
et, PR#2 is trying to also include PR#1 as part of the pull request. PR#1 af=
fected one file. PR#2 should affect two other files, but is trying to includ=
e all three. How do I send H Plato a PR#2 that doesn't include files from PR=
#1?
>>>=20
>>> -Brian M
>>>=20
>>> ________________________________________________________
>>> To unsubscribe from this list, go to: https://lists.sourceforge.net/list=
s/listinfo/misterhouse-users
>>>=20
>>=20
>> ________________________________________________________
>> To unsubscribe from this list, go to: https://lists.sourceforge.net/lists=
/listinfo/misterhouse-users
>>=20
>=20
> ________________________________________________________
> To unsubscribe from this list, go to: https://lists.sourceforge.net/lists/=
listinfo/misterhouse-users
>=20
--Apple-Mail-4DBB71F1-A449-4F84-81BB-963D098858D5
Content-Type: text/html;
charset=utf-8
Content-Transfer-Encoding: quoted-printable
<html><head><meta http-equiv=3D"content-type" content=3D"text/html; charset=3D=
utf-8"></head><body dir=3D"auto"><div dir=3D"ltr"></div><div dir=3D"ltr">Hol=
lie</div><div dir=3D"ltr">I=E2=80=99ve not submitted this, but I=E2=80=99ve m=
ade some changes to the tasmota html module.</div><div dir=3D"ltr"><br></div=
><div dir=3D"ltr">Here is the reasoning.</div><div dir=3D"ltr"><br></div><di=
v dir=3D"ltr">I have a number of devices that are unplugged for part of the y=
ear e.g. heating radiators and Christmas tree lights.</div><div dir=3D"ltr">=
<br></div><div dir=3D"ltr">In order to accommodate this I have added {on_off=
_line} to all http devices, this has 3 states, Online, Unplugged , and=
Offline. </div><div dir=3D"ltr">MH only attempts to change the state o=
f online devices, thus avoiding timeouts in the main loop.</div><div dir=3D"=
ltr"><br></div><div dir=3D"ltr">Giles<br><blockquote type=3D"cite">On 9 Jun 2=
024, at 15:28, H Plato <[email protected]> wrote:<br><br></blockquote><=
/div><blockquote type=3D"cite"><div dir=3D"ltr">=EF=BB=BF<meta http-equiv=3D=
"content-type" content=3D"text/html; charset=3Dutf-8">Just an update on this=
. With Dave=E2=80=99s awesome HA_Item module and help, I=E2=80=99ve managed t=
o migrate my razberry, yeelight, shluter and my venstar modules to home assi=
stant. I still have my eto calcuations/open sprinkler, tasmota power and nan=
oleaf left to do. I=E2=80=99ve been really impressed with Dave=E2=80=99s HA_=
Item work, and think this approach will allow us to leverage the logic of MH=
and the device support of HA for the future.<div><br></div><div>If I can ge=
t all my device=E2=80=99s moved over and some run time in the summer, this w=
ould be a great state for a MH release.</div><div><br></div><div>I still use=
festival for a local voice engine, but have found piper, which has a lot of=
promise. Right now I have an old old old linux 2.4 VM that runs an old vers=
ion of festival in =E2=80=99server mode=E2=80=99, and a wav file is picked u=
p and played on the speakers attached to a Delta410. If anyone has something=
similar and is using piper, I=E2=80=99d be interested in hearing about it.<=
/div><div><br></div><div>Again, I encourage everyone to update when they hav=
e a chance so we can also address any issues or bugs.<br id=3D"lineBreakAtBe=
ginningOfMessage"><div><br><blockquote type=3D"cite"><div>On Apr 1, 2024, at=
8:18=E2=80=AFAM, Lieven Hollevoet <[email protected]> wrote:</div><br cl=
ass=3D"Apple-interchange-newline"><div><meta http-equiv=3D"content-type" con=
tent=3D"text/html; charset=3Dutf-8"><div style=3D"overflow-wrap: break-word;=
-webkit-nbsp-mode: space; line-break: after-white-space;">Hey Brian,<div><b=
r></div><div>The most efficient way to do is is to checkout the master branc=
h, create a new branch for PR#2, apply the change for PR#2, commit it to the=
branch for PR#2. </div><div><br></div><div>If you then create a pull r=
equest for the branch you created for PR#2 it will only contain that change a=
nd not the one for PR#1.</div><div><br></div><div>The reason you see both ch=
anges is because you applied the change for PR#2 to the same branch of PR#1.=
</div><div><br></div><div>Basic idea: different pull request =3D diffe=
rent branch on which you apply the change.</div><div><br></div><div>Hope thi=
s helps, if it doesn=E2=80=99t please send me a link to the branch you are w=
orking on and we can take a look together.</div><div><br></div><div>Best reg=
ards,</div><div> Lieven.<br><div><br><blockquote type=3D"cite"><div>Op 3=
1 mrt. 2024, om 21:41 heeft [email protected] het volgende ges=
chreven:</div><br class=3D"Apple-interchange-newline"><div>
=20
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-8"=
>
=20
<div>
<div class=3D"moz-cite-prefix">On 3/29/24 08:22, H Plato wrote:<br>
</div>
<blockquote type=3D"cite" cite=3D"mid:E9484477-C76F-4EDB-B55B-345EB2F64E=
[email protected]">
<pre class=3D"moz-quote-pre" wrap=3D"">My ask is that if there are any=
code updates out there that folks want to include, to put in a pull request=
so we can capture them. Also, if anyone can update to master for any testin=
g, that would be great as well.
</pre>
</blockquote><p>Can anybody help me with GitHub? One of my pull requests=
is
trying to suck in irrelevant changes from another.<br>
</p><p>So I fixed a minor detail in the MH master branch and submitted a=
PR (call it "PR#1"). Now I have code in a much different and
unrelated area that I also want to submit ("PR#2). But since PR#1
hasn't been committed upstream yet, PR#2 is trying to also include
PR#1 as part of the pull request. PR#1 affected one file. PR#2
should affect two other files, but is trying to include all three.
How do I send H Plato a PR#2 that doesn't include files from PR#1?</p>=
<p> &=
nbsp; -Brian M<br>
</p>
</div>
________________________________________________________<br>To unsubscribe f=
rom this list, go to: https://lists.sourceforge.net/lists/listinfo/misterhou=
se-users<br><br></div></blockquote></div><br></div></div>___________________=
_____________________________________<br>To unsubscribe from this list, go t=
o: https://lists.sourceforge.net/lists/listinfo/misterhouse-users<br><br></d=
iv></blockquote></div><br></div><span>______________________________________=
__________________</span><br><span>To unsubscribe from this list, go to: htt=
ps://lists.sourceforge.net/lists/listinfo/misterhouse-users</span><br><span>=
</span><br></div></blockquote></body></html>=
--Apple-Mail-4DBB71F1-A449-4F84-81BB-963D098858D5--
--===============6582161614920027493==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--===============6582161614920027493==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
________________________________________________________
To unsubscribe from this list, go to: https://lists.sourceforge.net/lists/listinfo/misterhouse-users
--===============6582161614920027493==--