Re: [mh] Any other PRs out there/Need help submitting second PR

Giles Godart-Brown <[email protected]> Sun, 9 Jun 2024 21:54:41 +0100
Newsgroups gmane.comp.misc.misterhouse.user
Message-ID <[email protected]>
--===============8597898049144353333==
Content-Type: multipart/alternative; boundary=Apple-Mail-92DFEA7D-4104-4D99-AA84-A7F34C28A608
Content-Transfer-Encoding: 7bit


--Apple-Mail-92DFEA7D-4104-4D99-AA84-A7F34C28A608
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">I u=
se the mqtt LWT messages to set online or offline, and a web page to set unp=
lugged</div><div dir=3D"ltr"><br></div><div dir=3D"ltr">G</div><div dir=3D"l=
tr"><br><blockquote type=3D"cite">On 9 Jun 2024, at 21:50, misterhouse-ng1@s=
ilverflash.net wrote:<br><br></blockquote></div><blockquote type=3D"cite"><d=
iv dir=3D"ltr">=EF=BB=BF

 =20
    <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3DUTF-8"=
>
 =20
 =20
    <div class=3D"moz-cite-prefix">Good idea! We need that for all
      devices. I have about 5 ApplianceLinc's that stay plugged in all
      year even though I only use them during the holidays, just so they
      don't hang the main loop. The alternative would be to remove them
      from the .mht file, but then I also have to pull all the program
      code that refers to them, and that is too much trouble. Maybe your
      on_off_line code should go in some lower level module, so it would
      apply more widely.<br>
    </div>
    <div class=3D"moz-cite-prefix"><br>
    </div>
    <div class=3D"moz-cite-prefix">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp=
;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nb=
sp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -Brian M.<br>
    </div>
    <div class=3D"moz-cite-prefix"><br>
    </div>
    <div class=3D"moz-cite-prefix">On 6/9/24 13:24, Giles Godart-Brown
      wrote:<br>
    </div>
    <blockquote type=3D"cite" cite=3D"mid:79B1ECC2-E66B-450B-90DB-0AA4B145A3=
[email protected]">
      <meta http-equiv=3D"content-type" content=3D"text/html; charset=3DUTF-=
8">
      <div dir=3D"ltr">Hollie</div>
      <div dir=3D"ltr">I=E2=80=99ve not submitted this, but I=E2=80=99ve mad=
e 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>
      <div dir=3D"ltr">I have a number of devices that are unplugged for
        part of the year 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} &nbsp;to all http devices, this has 3 states, Online,
        Unplugged , and Offline.&nbsp;</div>
      <div dir=3D"ltr">MH only attempts to change the state of 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 2024, at 15:28, H Plato
          <a class=3D"moz-txt-link-rfc2396E" href=3D"mailto:[email protected]=
">&lt;[email protected]&gt;</a> 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=3D=
UTF-8">
          Just an update on this. With Dave=E2=80=99s awesome HA_Item module=
 and
          help, I=E2=80=99ve managed to migrate my razberry, yeelight, shlut=
er
          and my venstar modules to home assistant. I still have my eto
          calcuations/open 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 allow us to leverage the logic of MH
          and the device support of HA for the future.
          <div><br>
          </div>
          <div>If I can get all my device=E2=80=99s moved over and some run t=
ime
            in the summer, this would be a great state for a MH release.</di=
v>
          <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 version of
            festival in =E2=80=99server mode=E2=80=99, and a wav file is pic=
ked up and
            played on the speakers attached to a Delta410. If anyone has
            something similar and is using piper, I=E2=80=99d be interested i=
n
            hearing about it.</div>
          <div><br>
          </div>
          <div>Again, I encourage everyone to update when they have a
            chance so we can also address any issues or bugs.<br id=3D"lineB=
reakAtBeginningOfMessage">
            <div><br>
              <blockquote type=3D"cite">
                <div>On Apr 1, 2024, at 8:18=E2=80=AFAM, Lieven Hollevoet
                  <a class=3D"moz-txt-link-rfc2396E" href=3D"mailto:lieven@l=
ika.be">&lt;[email protected]&gt;</a> wrote:</div>
                <br class=3D"Apple-interchange-newline">
                <div>
                  <meta http-equiv=3D"content-type" content=3D"text/html; ch=
arset=3DUTF-8">
                  <div style=3D"overflow-wrap: break-word; -webkit-nbsp-mode=
: space; line-break: after-white-space;">Hey
                    Brian,
                    <div><br>
                    </div>
                    <div>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.&nbsp;</div>
                    <div><br>
                    </div>
                    <div>If you then create a pull request for the
                      branch you created for PR#2 it will only contain
                      that change and not the one for PR#1.</div>
                    <div><br>
                    </div>
                    <div>The reason you see both changes is because you
                      applied the change for PR#2 to the same branch of
                      PR#1.&nbsp;</div>
                    <div><br>
                    </div>
                    <div>Basic idea: different pull request =3D different
                      branch on which you apply the change.</div>
                    <div><br>
                    </div>
                    <div>Hope this helps, if it doesn=E2=80=99t please send m=
e a
                      link to the branch you are working on and we can
                      take a look together.</div>
                    <div><br>
                    </div>
                    <div>Best regards,</div>
                    <div>&nbsp;Lieven.<br>
                      <div><br>
                        <blockquote type=3D"cite">
                          <div>Op 31 mrt. 2024, om 21:41 heeft
                            <a class=3D"moz-txt-link-abbreviated" href=3D"ma=
ilto:[email protected]">[email protected]</a> he=
t volgende
                            geschreven:</div>
                          <br class=3D"Apple-interchange-newline">
                          <div>
                            <meta http-equiv=3D"Content-Type" content=3D"tex=
t/html; charset=3DUTF-8">
                            <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=
[email protected]">
                                <pre class=3D"moz-quote-pre" wrap=3D"">My as=
k 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 updat=
e to master for any testing, 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;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&=
nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; -Brian M<br>
                              </p>
                            </div>
________________________________________________________<br>
                            To unsubscribe from this list, go to:
                            <a class=3D"moz-txt-link-freetext" href=3D"https=
://lists.sourceforge.net/lists/listinfo/misterhouse-users">https://lists.sou=
rceforge.net/lists/listinfo/misterhouse-users</a><br>
                            <br>
                          </div>
                        </blockquote>
                      </div>
                      <br>
                    </div>
                  </div>
________________________________________________________<br>
                  To unsubscribe from this list, go to:
                  <a class=3D"moz-txt-link-freetext" href=3D"https://lists.s=
ourceforge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.n=
et/lists/listinfo/misterhouse-users</a><br>
                  <br>
                </div>
              </blockquote>
            </div>
            <br>
          </div>
          <span>________________________________________________________</sp=
an><br>
          <span>To unsubscribe from this list, go to:
            <a class=3D"moz-txt-link-freetext" href=3D"https://lists.sourcef=
orge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.net/lis=
ts/listinfo/misterhouse-users</a></span><br>
          <span></span><br>
        </div>
      </blockquote>
      <br>
      <fieldset class=3D"moz-mime-attachment-header"></fieldset>
      <br>
      <fieldset class=3D"moz-mime-attachment-header"></fieldset>
      <pre class=3D"moz-quote-pre" wrap=3D"">_______________________________=
_________________________
To unsubscribe from this list, go to: <a class=3D"moz-txt-link-freetext" hre=
f=3D"https://lists.sourceforge.net/lists/listinfo/misterhouse-users">https:/=
/lists.sourceforge.net/lists/listinfo/misterhouse-users</a>

</pre>
    </blockquote>
    <p><br>
    </p>
 =20

<span>________________________________________________________</span><br><sp=
an>To unsubscribe from this list, go to: https://lists.sourceforge.net/lists=
/listinfo/misterhouse-users</span><br><span></span><br></div></blockquote></=
body></html>=

--Apple-Mail-92DFEA7D-4104-4D99-AA84-A7F34C28A608--


--===============8597898049144353333==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline


--===============8597898049144353333==
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


--===============8597898049144353333==--