Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ia7 v1.1.200 #573

Merged
merged 35 commits into from
Jul 10, 2016
Merged

Ia7 v1.1.200 #573

merged 35 commits into from
Jul 10, 2016

Conversation

hplato
Copy link
Collaborator

@hplato hplato commented Feb 29, 2016

Updates to IA7 since the v4 stable freeze in the fall. I've been using this code for a few months without issue, however with the changes to http_server and ajax.pm be good to get some more testers. Plus master should be cutting edge!

Improvements include

  • notifications. Banners and alert windows
  • web audio, including changes to support safari http streaming. Mobile devices work as well (have to press the gear button as audio needs an action before playing on IOS).
  • IP Address override. Allow for config_json settings per client IP (ie. can be used to set certain devices to default to web audio)
  • Weather Station 2 will now show last RRD update time.

hplato added 27 commits November 3, 2015 08:39
longer sockets such as speech never closing the ajax port
Added Last updated to Weatherstation 2
Updated http_server to respond to range header
Merge branch 'master' into ia7 to sync with v4.1
… the end user with some guidance if the collections or prefs.json file isn't parsed properly
- Added in purple button, default for an unknown state
- ia7_config.json state_colors section allow for color overrides
- print log will now give a few hints if collections.json or ia7_config.json file has syntax errors
- removed old versions of bootstrap and font awesome
…dal rather than breaking the IA7 environment. Common and User code modules updated
… the ia7 config files (ia7_config and ia7_rrd_config)
@hollie
Copy link
Owner

hollie commented Apr 11, 2016

Hey Howard,

I tried merging this branch in my running system and for one reason or the other the web interface I had configured to suit my setup shows empty after the merge.

I haven't had time to look into this further in detail, but I wonder: did you change something in the way customizations can be applied that would cause the web interface not to shown any buttons? The heading and the 'checking' button are there, but that is all.

Kind regards,
Lieven.

@hplato
Copy link
Collaborator Author

hplato commented Apr 11, 2016

Whoa! That commit somehow has the more experimental v1.2 stuff in it. Yes there's a change to the authorization subsystem (it now actually works!), which adds a new collection id of 700 requirement. Clive found this and my latest update has fixed the issue, but i haven't pushed it yet. A workaround is adding a collection id 700 with

"User" : "$Authorize"

(I think, i'm doing that from memory)

It would be great to test v1.1.200 as it has made some big changes. To http and ajax modules to support audio streaming, and is 4 months old or so. I've been using it on my production setup without issue.

I'm also thinking about how this change can be applied against custom collection files.

Sent from my mobile device.

On Apr 11, 2016, at 11:33 AM, Lieven Hollevoet [email protected] wrote:

Hey Howard,

I tried merging this branch in my running system and for one reason or the other the web interface I had configured to suit my setup shows empty after the merge.

I haven't had time to look into this further in detail, but I wonder: did you change something in the way customizations can be applied that would cause the web interface not to shown any buttons? The heading and the 'checking' button are there, but that is all.

Kind regards,
Lieven.


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub

@hplato
Copy link
Collaborator Author

hplato commented Apr 12, 2016

Can I somehow pull that pull request back and submit another one with this commit from March 3rd?

hplato@bf0645c

v1.2 is making things cleaner (full in-browser support for changing users, most of the ‘Setup Mr.House modules now work’, comics & mail are working, About Mr.House now has buttons to view the prefs files), however there are still some things to clean up for triggers and items. Probably a week or two and v1.2 would be ready to test.

On another note, do you think with the bsc.pl fix and the longer perltidy lines, the issues are fixed on stable?

Lastly, I would also vote for moving in mqtt into the next version. So far working well, with two things;

  1. I see an uninitialized value on startup:

04/11/16 09:25:39 PM *** Keep Alive = 121
04/11/16 09:25:39 PM *** mqtt mqtt_connect Socket (127.0.0.1:1883,121)
04/11/16 09:25:39 PM *** mqtt Socket check (121) [ ]: Connected
04/11/16 09:25:39 PM *** mqtt mqtt Received: ConnAck/at-most-once Connection Accepted
04/11/16 09:25:39 PM *** mqtt mqtt Sub 1 Received: (--No $$msg{string}--)
04/11/16 09:25:39 PM *** mqtt mqtt Initializing MQTT connection ...
04/11/16 09:25:39 PM *** mqtt added MQTT check_for_data ...

04/11/16 09:25:39 PM Oops1: Use of uninitialized value in concatenation (.) or string at /usr/local/misterhouse/git-prod/bin/../lib/mqtt.pm line 682.

04/11/16 09:25:39 PM *** mqtt mqtt set mqtt: [(on), (mqtt=HASH(0x592b430)), ]

  1. debug should be pulled from mh.ini (ie. remove line 198)

On Apr 11, 2016, at 11:33 AM, Lieven Hollevoet [email protected] wrote:

Hey Howard,

I tried merging this branch in my running system and for one reason or the other the web interface I had configured to suit my setup shows empty after the merge.

I haven't had time to look into this further in detail, but I wonder: did you change something in the way customizations can be applied that would cause the web interface not to shown any buttons? The heading and the 'checking' button are there, but that is all.

Kind regards,
Lieven.


You are receiving this because you authored the thread.
Reply to this email directly or view it on GitHub #573 (comment)

@hollie
Copy link
Owner

hollie commented Apr 12, 2016

Hey Howard,

if you committed all changes to the same branch in your repo then it will not be that easy to revert. That is why you need to make a separate branch for different changes. This makes separating the pull requests easier.

On the other hand: I have no issue moving to v1.2 for testing immediately...

Best regards,
Lieven.

hplato and others added 8 commits April 19, 2016 16:15
… Need to test all operations logged in as noone, family, and admin
Common code module to provide ability to modify collections.json if structural change is needed
web/ia7/include/javascript.js:
       * If you append '&show_pos' to the flooplan URL you
         it enables drag&drop item positioning: grab fp items with the
         mouse and drop them where you would like to have tem positioned.
         perl code do do the positioning is generated below the fp. Copy
         and paste this code into your favourite mh code file. For me this
         is 'zzzzzzz_fp_positions.pl', the weird name makes sure to load
         this file last and all the items do exist.
       * use the actual display width of fp image is used as the base for
         resizing (instead of $(window).width() to make the floorplan work
         on bigger screens too. For those the the floorplan image is smaller
         than the windows width)
       * scale the item icons proportional to the original size of the fp
         background image. This means when you create your background image
         you should choose the image size it in a way that the XXX_48.png
         variants of the icons fit well into it.
       * coordinates of fp items are now the center of the items icon
         and not the top left corner.

lib/json_server.pl:
       * add querry to get a list of available iconsets
- added a 'developer' mode and flag. Choosing Developer adds in the advanced collection set and can show additional information such as floorplan coordinates
- included tobias's code
- fixed the caret padding for voice commands
@hplato hplato merged commit 8280512 into hollie:master Jul 10, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants