Re: [mh] Any other PRs out there/Need help submitting second PR
[email protected] Sun, 9 Jun 2024 13:33:51 -0700
| Newsgroups | gmane.comp.misc.misterhouse.user |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format.
--===============7587245547255388164==
Content-Type: multipart/alternative;
boundary="------------DR0uWUp9si2bl04PyulqsORX"
Content-Language: en-US
This is a multi-part message in MIME format.
--------------DR0uWUp9si2bl04PyulqsORX
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
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.
-Brian M.
On 6/9/24 13:24, Giles Godart-Brown wrote:
> Hollie
> I’ve not submitted this, but I’ve made some changes to the tasmota
> html module.
>
> Here is the reasoning.
>
> I have a number of devices that are unplugged for part of the year
> e.g. heating 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.
> MH only attempts to change the state of online devices, thus avoiding
> timeouts in the main loop.
>
> Giles
>> On 9 Jun 2024, at 15:28, H Plato <[email protected]> wrote:
>>
>> Just an update on this. With Dave’s awesome HA_Item module and
>> help, I’ve managed to migrate my razberry, yeelight, shluter and my
>> venstar modules to home assistant. I still have my eto
>> calcuations/open sprinkler, tasmota power and nanoleaf left to do.
>> I’ve been really impressed with Dave’s 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.
>>
>> If I can get all my device’s moved over and some run time in the
>> summer, this would be a great state for a MH release.
>>
>> 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 ’server mode’, and a wav
>> file is picked up and played on the speakers attached to a Delta410.
>> If anyone has something similar and is using piper, I’d be interested
>> in hearing about it.
>>
>> Again, I encourage everyone to update when they have a chance so we
>> can also address any issues or bugs.
>>
>>> On Apr 1, 2024, at 8:18 AM, Lieven Hollevoet <[email protected]> wrote:
>>>
>>> Hey Brian,
>>>
>>> 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.
>>>
>>> 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.
>>>
>>> The reason you see both changes is because you applied the change
>>> for PR#2 to the same branch of PR#1.
>>>
>>> Basic idea: different pull request = different branch on which you
>>> apply the change.
>>>
>>> Hope this helps, if it doesn’t please send me a link to the branch
>>> you are working on and we can take a look together.
>>>
>>> Best regards,
>>> Lieven.
>>>
>>>> Op 31 mrt. 2024, om 21:41 heeft [email protected] het
>>>> volgende geschreven:
>>>>
>>>> On 3/29/24 08:22, H Plato wrote:
>>>>> 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 testing, that would be great as well.
>>>>
>>>> Can anybody help me with GitHub? One of my pull requests is trying
>>>> to suck in irrelevant changes from another.
>>>>
>>>> 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?
>>>>
>>>> -Brian M
>>>>
>>>> ________________________________________________________
>>>> To unsubscribe from this list, go to:
>>>> https://lists.sourceforge.net/lists/listinfo/misterhouse-users
>>>>
>>>
>>> ________________________________________________________
>>> To unsubscribe from this list, go to:
>>> https://lists.sourceforge.net/lists/listinfo/misterhouse-users
>>>
>>
>> ________________________________________________________
>> To unsubscribe from this list, go to:
>> https://lists.sourceforge.net/lists/listinfo/misterhouse-users
>>
>
>
> ________________________________________________________
> To unsubscribe from this list, go to:https://lists.sourceforge.net/lists/listinfo/misterhouse-users
>
--------------DR0uWUp9si2bl04PyulqsORX
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: 8bit
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
<div class="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="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix"> -Brian M.<br>
</div>
<div class="moz-cite-prefix"><br>
</div>
<div class="moz-cite-prefix">On 6/9/24 13:24, Giles Godart-Brown
wrote:<br>
</div>
<blockquote type="cite"
cite="mid:[email protected]">
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<div dir="ltr">Hollie</div>
<div dir="ltr">I’ve not submitted this, but I’ve made some changes
to the tasmota html module.</div>
<div dir="ltr"><br>
</div>
<div dir="ltr">Here is the reasoning.</div>
<div dir="ltr"><br>
</div>
<div dir="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="ltr"><br>
</div>
<div dir="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="ltr">MH only attempts to change the state of online
devices, thus avoiding timeouts in the main loop.</div>
<div dir="ltr"><br>
</div>
<div dir="ltr">Giles<br>
<blockquote type="cite">On 9 Jun 2024, at 15:28, H Plato
<a class="moz-txt-link-rfc2396E" href="mailto:[email protected]"><[email protected]></a> wrote:<br>
<br>
</blockquote>
</div>
<blockquote type="cite">
<div dir="ltr">
<meta http-equiv="content-type"
content="text/html; charset=UTF-8">
Just an update on this. With Dave’s awesome HA_Item module and
help, I’ve managed to migrate my razberry, yeelight, shluter
and my venstar modules to home assistant. I still have my eto
calcuations/open sprinkler, tasmota power and nanoleaf left to
do. I’ve been really impressed with Dave’s 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’s moved over and some run time
in the summer, this would 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 version of
festival in ’server mode’, and a wav file is picked up and
played on the speakers attached to a Delta410. If anyone has
something similar and is using piper, I’d be interested in
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="lineBreakAtBeginningOfMessage">
<div><br>
<blockquote type="cite">
<div>On Apr 1, 2024, at 8:18 AM, Lieven Hollevoet
<a class="moz-txt-link-rfc2396E" href="mailto:[email protected]"><[email protected]></a> wrote:</div>
<br class="Apple-interchange-newline">
<div>
<meta http-equiv="content-type"
content="text/html; charset=UTF-8">
<div
style="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. </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. </div>
<div><br>
</div>
<div>Basic idea: different pull request = different
branch on which you apply the change.</div>
<div><br>
</div>
<div>Hope this helps, if it doesn’t please send me 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> Lieven.<br>
<div><br>
<blockquote type="cite">
<div>Op 31 mrt. 2024, om 21:41 heeft
<a class="moz-txt-link-abbreviated" href="mailto:[email protected]">[email protected]</a> het volgende
geschreven:</div>
<br class="Apple-interchange-newline">
<div>
<meta http-equiv="Content-Type"
content="text/html; charset=UTF-8">
<div>
<div class="moz-cite-prefix">On 3/29/24
08:22, H Plato wrote:<br>
</div>
<blockquote type="cite"
cite="mid:[email protected]">
<pre class="moz-quote-pre" wrap="">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 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> -Brian M<br>
</p>
</div>
________________________________________________________<br>
To unsubscribe from this list, go to:
<a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.net/lists/listinfo/misterhouse-users</a><br>
<br>
</div>
</blockquote>
</div>
<br>
</div>
</div>
________________________________________________________<br>
To unsubscribe from this list, go to:
<a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.net/lists/listinfo/misterhouse-users</a><br>
<br>
</div>
</blockquote>
</div>
<br>
</div>
<span>________________________________________________________</span><br>
<span>To unsubscribe from this list, go to:
<a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.net/lists/listinfo/misterhouse-users</a></span><br>
<span></span><br>
</div>
</blockquote>
<br>
<fieldset class="moz-mime-attachment-header"></fieldset>
<br>
<fieldset class="moz-mime-attachment-header"></fieldset>
<pre class="moz-quote-pre" wrap="">________________________________________________________
To unsubscribe from this list, go to: <a class="moz-txt-link-freetext" href="https://lists.sourceforge.net/lists/listinfo/misterhouse-users">https://lists.sourceforge.net/lists/listinfo/misterhouse-users</a>
</pre>
</blockquote>
<p><br>
</p>
</body>
</html>
--------------DR0uWUp9si2bl04PyulqsORX--
--===============7587245547255388164==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
--===============7587245547255388164==
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
--===============7587245547255388164==--