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

MisterHouse 3.0 Release #223

Merged
merged 79 commits into from
Jun 20, 2013
Merged

MisterHouse 3.0 Release #223

merged 79 commits into from
Jun 20, 2013

Conversation

krkeegan
Copy link
Collaborator

I think we are ready to push master into stable and release 3.0. The master branch seems to have been working fine for those who have been using it for the past week, at least I have not heard otherwise. Besides the documentation, today's pushes solved a few nits that shouldn't and haven't caused any issues for me. I also added extensive notes to https://github.com/hollie/misterhouse/wiki/Changelog.

So with that, we should be good. I confess I didn't pay attention to how the versioning is supposed to work. Should I be updating VERSION in the master branch? I assume that since it is set to unstable, it only gets changed in the stable branch.

jduda and others added 30 commits February 26, 2013 20:26
…ttery Status

The following likely only works for i2cs devices, I think all Remotelinc 2 devices are i2cs?  It at least works on rev 1.4.

- set_awake_time sets = sets the time in seconds that the remote will remain awake after sending a command.  The default is 4, it can be set up to 254 seconds, with 255 being always awake.

- get_extended_info = is primarily added to get the battery level.  Battery level is returned as a byte, but the number does not immediately make sense.  I will have to let the batter run down some to better understand what it means.

At the moment, I have the code set to call get_extended_info whenever the all_link_report is received.  This report represents the last message sent by the device before the awake time begins to run.  In the future, an additional function can be added to only call get_extended_info if it hasn't been called in x hours.

N.B. in order for set_awake_time to work properly, the engine version of the device must be known.

#172
I think that the battery level is reported is volts * 50.  Online it lists the battery voltage as 3.7 and I am getting numbers like 177 right now.  Finally, one stray comment from Insteon suggested that they believe 0xA3 or 163 to be the low voltage warning level.
This is a generic object that is "tied" to the battery events in the parent RemoteLinc.  It can be used to display the battery voltage on the RemoteLinc on the MH web page or to directly tie events to rather than using the low_battery_event code.
No need to reinvent the wheel, low batter events can be tracked using the child objects and tied events
If the device doesn't hear the first request, it won't be awake to hear subsequent ones.  Sending subsequent messages only slows things down.
Uses Socket_Item instead of direct socket connection to avoid pauses in main loop.
Stores device state in Generic_Item state variable now.
PIO, Latches, and Sense now use state values of ON and OFF.
@hollie
Copy link
Owner

hollie commented Jun 15, 2013

Hi Kevin,

I'll make the new release tonight and I will document the process I follow on the wiki.

Kind regards,
Lieven.

Op 15-jun.-2013, om 04:05 heeft Kevin Robert Keegan notifications@github.com het volgende geschreven:

I think we are ready to push master into stable and release 3.0. The master branch seems to have been working fine for those who have been using it for the past week, at least I have not heard otherwise. Besides the documentation, today's pushes solved a few nits that shouldn't and haven't caused any issues for me. I also added extensive notes to https://github.com/hollie/misterhouse/wiki/Changelog.

So with that, we should be good. I confess I didn't pay attention to how the versioning is supposed to work. Should I be updating VERSION in the master branch? I assume that since it is set to unstable, it only gets changed in the stable branch.

You can merge this Pull Request by running

git pull https://github.com/hollie/misterhouse master
Or view, comment on, or merge it at:

#223

Commit Summary

• Merge pull request #8 from krkeegan/fix_update_link
• Added basic support for the Philips Hue lights.
• Fix Issue #132: Remove tracking scripts from user docs
• Map aldb to I2 if get_engine_version returns NAK
• Merge pull request #133 from mstovenour/fix_issue_132
• Fix a few podchecker errors
• Remove executable mode from lib/Insteon/ Perl Module files.
• Add missing shabang to lib/Insteon/MessageDecoder_test.pl file.
• Correct Perl path in bin/display_callers shabang line.
• Correct Perl path in bin/test_x10 shabang line.
• Correct Perl path in bin/xAP-festival.pl shabang line.
• Correct Perl path in web/bin/dbmedit.cgi shabang line.
• Correct Perl path in web/bin/test_cgi_error shabang line.
• Correct Perl path in web/bin/weather_graph_zoom.pl shabang line.
• Correct Perl path in web/newclock/index.pl shabang line.
• Correct Perl path in web/newclock/alarm.pl shabang line.
• Correct Perl path in web/organizer/calendar.pl shabang line.
• Correct Perl path in web/organizer/contacts.pl shabang line.
• Correct Perl path in web/organizer/tasks.pl shabang line.
• Insteon: Add Error Message if Root Object Cannot be Found
• Insteon: Prevent Calling Level Command if Device Cannot Level
• Insteon/X10 Ignore no_hop_increase Flag for X10 Devices
• Insteon:: ALDB_Query Fix package names in query_aldb_delta
• Merge pull request #143 from krkeegan/insteon_fix_level_errors
• Merge pull request #124 from krkeegan/list_groups_by_object
• Merge pull request #98 from jduda/android_updates2
• Merge pull request #145 from krkeegan/hop_tracking
• Merge pull request #144 from krkeegan/insteon_warn_no_root
• Merge pull request #110 from ProGEEK/mhl
• Insteon: Fix concat errors
• Merge pull request #146 from krkeegan/insteon_warn_no_root
• Insteon::DimmableLight Fix convert_level to return FF for 100%
• Insteon_PLM Fix So Callback is Used if NAK Received on Manage AllLink
• Merge branch 'master' into the fix_issue_139 branch.
• Merge branch 'master' into the Fixes_for_Issue_141 branch.
• Functionality and doc update
• Fix for issue #151 - Warnings in message decoder test
• Added functionality to control the color and the brightness of a lamp
• Added function to control hue, saturation and brightness in one command
• Insteon: Prevent Crash When PLM Busy but no Active Message
• Insteon: Prevent Crashing if AllLink_Failure_Report Receive and No Active Message
• X10/Insteon: Fix error in parsing of x10 Receive Messages in Insteon_PLM
• Insteon_Irrigation: Move Old Irrigation Code to Insteon Lib
• Insteon_Irrigation: Update Perldoc
• Insteon_Irrigation: Update Initialization Settings
• Insteon_Irrigation: Update new Subroutine
• Insteon_Irrigation:Convert all calls to _send_cmd to use Message Class
• Insteon_Irrigation: Update Print_Log to match class name
• Insteon_Irrigation: Add Irrigation Message Types
• Insteon_Irrigation: Update Read Table A Definition
• Insteon_Irrigation: Fix Message Creation
• Insteon_Irrigation: Add call to SUPER is_info_request
• Insteon_Irrigation: Fix Typo in Read Table A
• Insteon_Irrigation: Set Message_Types in Self Hash
• Insteon_PLM: Fix Error in Message Parser Dumping Buffer on Busy
• Merge pull request #149 from krkeegan/fix_issue_147
• Merge pull request #150 from krkeegan/fix_issue_148
• Merge pull request #131 from hollie/add_philips_hue_support
• Merge branch 'master' as of 9 Apr 2013 into the branch fix_issue_139.
• Merge branch 'master' of of 9 Apr 2013 into Fixes_for_Issue_141 branch.
• Remove the file web/comics/Dilbert-2002.02.28.gif
• Remove the file web/comics/FoxTrot-2003.02.12.gif
• Insteon: Set Device State on a Received AllLink Broadcast Message
• Insteon_i2: Reject ALDB Read Responses Where Address Is Incorrect
• Insteon: Flip Logic on Received AllLink Broadcast Message
• Merge pull request #118 from drobinson0919/master
• Merge pull request #161 from jame/comics-gifs-issue
• Merge pull request #130 from hollie/add_xpl_x10_support
• Merge pull request #97 from jduda/pocketsphinx_update2
• Merge pull request #121 from ProGEEK/xbmc
• Insteon_i2: Fix ALDB Address Used for Re-Reading When Corrupt Message Received
• Add Zmtrigger_Item.pm
• Merge pull request #162 from krkeegan/fix_issue_153
• Merge pull request #159 from krkeegan/fix_issue_158
• Merge pull request #157 from krkeegan/fix_issue_156
• Merge pull request #160 from krkeegan/insteon_irrigation
• Merge pull request #13 from krkeegan/fix_issue_11
• Merge pull request #9 from krkeegan/i2_aldb_delta
• Merge branch 'master' into i2_aldb_support
• Removed unused code that had been commented out
• Merge remote-tracking branch 'upstream/master'
• Insteon: Clear No_Hop_Flag Even If No Debug; Don't Call Setby if Undef
• /lib Documentation Updates
• Fix issues when adding ALDB controller entries
• Doc Updates
• Insteon: Fix Error in PLM Message Integrity Check Logic
• Merge pull request #171 from krkeegan/fix_issue_83
• Insteon: Catch and Log AllLink_Cleanup_Reports
• Insteon: Catch Error if Device ID in All_Link_Failure Does Not Exist
• Insteon: Add Function to Filter Out Duplicate Received Messages
• Insteon_FanLinc: Fix Level Error in Child Set Command
• Insteon: Update PLM Scene State on Change
• Insteon: Extend Temporal Search Window for Duplicate Messages
• Insteon: Expand Duplicate Window for Messages Requiring an ACK
• Insteon: Fix typo in _is_duplicate_received
• Insteon: More Adjustments to is_duplicate_received
• Insteon: Add Time to Allow for ACK to Finish Transmitting
• Insteon_Remotelinc: Added Ability to Set Awake Time and To Request Battery Status
• Insteon_RemoteLinc: Add Perl Documentation
• Insteon_RemoteLinc: Add Set Battery Timer
• Insteon_RemoteLinc: Add Check for If Battery Timer Expired
• Insteon_RemoteLinc: Cleanup Battery Timer
• Insteon_RemoteLinc: Add the Low Battery Level Indicator
• Insteon_RemoteLinc: Add Set Low Battery Event
• Insteon_RemoteLinc: Add Eval to Battery Low Level Event
• Insteon_Remotelinc: Change Battery Level to Volts; Cleanup Coding Errors
• Insteon_RemoteLinc: Add RemoteLinc_Battery Object
• Insteon_RemoteLinc: Make Battery Parent is the Root Item
• Insteon_MotionSensor: Add Generic Get Info Request
• Insteon_MotionSensor: Add Generic Get Info Request
• Insteon_MotionSensor: Add Set Query Time
• Insteon_MotionSensor: Add Set Low Battery Level
• Insteon_MotionSensor: Add Battery Low Event
• Insteon_MotionSensor: Add Process Message
• Insteon_MotionSensor: Add Is Light Level Tests
• Insteon_MotionSensor: Add Light Level Settings
• Insteon_MotionSensor: Add Light Level Tests to Process Message
• Insteon_MotionSensor: Add Child Objects
• Insteon_MotionSensor: Cleanup Code; Remove Event Routines
• Insteon_MotionSensor: Cleanup Git Cherry-Pick Errors
• Insteon_MotionSensor: Add Routines to Set Flags
• Insteon_RemoteLinc: Remove Low Battery and Event Routines
• Insteon: Catch Multiple Calls to Set_Receive in the Same Pass
• Insteon_MotionSensor: Defer Identical Set Messages Received in the Same Pass
• Insteon: Catch Cleanup Messages Sent in the Same Pass as AllLink Messages
• Insteon: Log Output if PLM Parser Drops a Duplicate Message
• Insteon: Relocate PLM Decoder to Allow Decoding Multiple Messages Received at the Same Time
• Return a web page instead of HTML code when visiting Phone
• Insteon: Move Failure_Reason into BaseObject from Message
• Merge pull request #166 from krkeegan/hop_tracking
• Merge pull request #173 from krkeegan/fix_issue_168
• Merge pull request #180 from krkeegan/fix_issue_83
• Merge pull request #189 from krkeegan/fix_issue_17
• Merge pull request #190 from mstovenour/merge_i2_aldb_support
• Merge pull request #191 from krkeegan/fix_issue_177
• Merge pull request #192 from krkeegan/fix_issue_185
• Merge pull request #194 from krkeegan/fix_issue_175
• Merge branch 'master' into fix_issue_186
• Merge pull request #193 from krkeegan/fix_issue_186
• Merge pull request #195 from krkeegan/fix_issue_169
• Insteon: Call Message Decoder on Parsed_Data
• Insteon: Fix Bug in Link Scan Callback When Nack Received
• Merge pull request #197 from krkeegan/scan_changed_nack_bug
• Merge pull request #196 from krkeegan/fix_issue_186
• Insteon_MotionSensor: Fix Bit Mapping for Settings
• Insteon_MotionSensor: Switch Set Routine to Use Base Classes
• Insteon_MotionSensor: Make Flag Acknowledgement More Clear
• Insteon: Redefine Active_Interface on Code Reload
• Insteon:Simple Typo in Debug Log of ALDB_PLM
• Insteon_RemoteLinc: Fix Typos
• Insteon_RemoteLinc: Only Send Battery Request Once
• Insteon_MotionSensor: Only Send Battery Request Once
• Insteon: Allow for Per Message Individual Retry Count
• Merge branch 'master' into insteon_motionsensor
• Merge branch 'insteon_retry_count' into insteon_motionsensor
• Merge branch 'master' into insteon_remotelinc
• Merge branch 'insteon_retry_count' into insteon_remotelinc
• Reset the crash_cnt state variable when selecting the reset language files command.
• Avoid a divide by zero error by first checking for zero humidity.
• Merge remote-tracking branch 'upstream/master'
• Major overhaul of this module.
• Merge branch 'master' into owfs_update
• Merge branch 'master' into weather_update
• Merge branch 'master' into pocketsphinx
• Insteon: Fix Hash Keys Error with Older Perl Versions
• Merge pull request #203 from krkeegan/insteon_keys_fix
• Merge remote-tracking branch 'upstream/master'
• Merge branch 'master' into owfs_update
• Merge branch 'weather_update'
• Merge branch 'pocketsphinx'
• Merge branch 'master' into owfs_update
• Correct a bug involving tracking the state of a latch.
• Merge branch 'master' into owfs_update
• Restore files to original master.
• Insteon_MotionSensor: Change Get_Extended_Info Request to All Zeros
• Insteon_MotionSensor: Add Recent Variant of Extended Get/Set Response
• Insteon_MotionSensor: Cleanup the Documentation
• Insteon_IOLinc: Cleanup the documentation
• Insteon_IOLinc: Fix Incorrect References to Microseconds
• Insteon_RemoteLinc: Cleanup Documentation
• Merge branch 'fix_issue_139' of https://github.com/jame/misterhouse into jame-fix_issue_139
• Merge pull request #208 from krkeegan/jame-fix_issue_139
• Merge pull request #142 from jame/Fixes_for_Issue_141
• Merge branch 'fix_issue_151' of https://github.com/mstovenour/misterhouse into mstovenour-fix_issue_151
• Merge branch 'master' into mstovenour-fix_issue_151
• Merge pull request #209 from krkeegan/mstovenour-fix_issue_151
• Merge pull request #167 from drobinson0919/doc_updates
• Merge branch 'master' into insteon_fanlinc
• Merge pull request #198 from krkeegan/insteon_fanlinc
• Merge pull request #200 from krkeegan/fix_issue_57
• Merge branch 'master' into insteon_aldb_typo
• Merge pull request #201 from krkeegan/insteon_aldb_typo
• Merge branch 'master' into insteon_retry_count
• Merge pull request #202 from krkeegan/insteon_retry_count
• Merge branch 'master' into insteon_motionsensor
• Merge pull request #205 from krkeegan/insteon_motionsensor
• Merge branch 'master' into insteon_iolinc
• Merge branch 'master' into insteon_iolinc
• Merge pull request #206 from krkeegan/insteon_iolinc
• Merge branch 'master' into insteon_remotelinc
• Merge pull request #207 from krkeegan/insteon_remotelinc
• Insteon_IOLinc: Filter Out Status Requests in Process Message
• Insteon_IOLinc: Redefine how IOLinc Sensors are tracked
• Insteon_IOLinc: Add Request Sensor Status Sub
• Insteon_IOLinc: Cleanup a few bugs
• Insteon_IOLinc: Prepare for Resetting Relay State When Momentary Mode is Used
• I don't know.
• Oops, the last commit had git merge stuff. This is the proper changes.
• Fix issue 210
• Insteon: Add Initial Support for Linking i2cs Devices in MH
• Insteon: Dont Just Decode the First Message
• Insteon: Timeout After Receipt of AllLink Broadcast to Avoid Collision with Cleanup
• Insteon: Set Cmd2 to 00 in All Link Send Commands
• Insteon: Catch Status Requests in Unique _process_message Routines
• Merge pull request #219 from krkeegan/insteon_iolinc
• Merge pull request #218 from krkeegan/insteon_is_info_fix
• Merge pull request #213 from krkeegan/insteon_i2cs_linking
• Merge pull request #214 from krkeegan/insteon_debug4
• Merge pull request #216 from krkeegan/insteon_plm_scene
• Insteon_IOLinc: Still Trying to Fix Problem With Momentary Settings
• Insteon_IOLinc: Fix Get Flags Log Message and Fix Documentation of Set Relay Mode
• Update_Docs: Initial Work to Allow Subdirectory Scanning
• Update_Docs: Print SubDir Files in Items and Modules List
• Update_Docs: Move Package Sorting Outside of Directory Loop
• Update_Docs: Fix Regex Error Used to Distinguish Items from Modules
• Update_Docs: Disable code which deleted files in the distro dir; Cleanup internal comments
• Insteon: Add Documentation to AllLinkDatabase File
• Insteon: Add Documentation to BaseInsteon.pm; Fix a few things in AllLinkDatabase.pm
• Format Docs: Make Head3 Larger, Add Head4 Style
• Insteon_Docs: Add Documentation to BaseInterface.pm
• Insteon_Docs: Update Documentation for Controller.pm
• Insteon Docs: Update IOLinc Documentation
• Update Docs: Fix Pod2Html Commands so Links Are Created; Modify Example.pod
• Insteon Docs: Add Documentation to Irrigation; Fix Typo in IOLinc Documentation
• Insteon Docs: Add documentation to lighting.pm
• Insteon Docs: Add Documenation to Message.pm
• Insteon Docs: Update Documentation in Security.pm
• Insteon Docs: Add More Links to Connect the Documents Together
• Insteon Docs: Missed a =cut
• Insteon Docs: Fix Various Perldoc Errors
• Insteon Docs: Add Documentation to Insteon.pm
• Insteon Docs: Continue Documentation of Insteon.pm
• Insteon Docs: Add Documentation to Insteon_PLM; Add INI Parameters
• Merge pull request #221 from krkeegan/insteon_docs
• Merge pull request #204 from jduda/owfs_update
• Merge pull request #211 from peloy/fix_issue_210
• Merge pull request #215 from krkeegan/insteon_alllink_timeout
• Merge pull request #220 from krkeegan/update_docs
• Insteon_IOLinc: Prevent Setting Sensor State on Both Broadcast and Cleanup Msgs
• Merge pull request #222 from krkeegan/insteon_iolinc
File Changes

• M README.md (4)
• A VERSION (1)
• A X10_RF_rfxsensor.pm b/lib/X10_RF_rfxsensor.pm (0)
• M bin/display_callers (2)
• M bin/mh (59)
• M bin/mh.ini (13)
• M bin/mhl (3)
• M bin/test_x10 (2)
• M bin/update_docs (260)
• M bin/xAP-festival.pl (2)
• A code/common/xbmc_notification.pl (45)
• M docs/download.html (144)
• A docs/download.pod (45)
• M docs/faq.pod (3840)
• M docs/install.pod (329)
• M docs/toc.html (17)
• M lib/Acid.pm (44)
• M lib/AlsaPlayer.pm (327)
• M lib/AnalogSensor_Item.pm (378)
• M lib/Android_Item.pm (57)
• M lib/Audible_Menu.pm (47)
• M lib/AudiotronPlayer.pm (64)
• M lib/BSC.pm (156)
• M lib/Base_Item.pm (78)
• M lib/CCNet_Monitor.pm (74)
• M lib/CID_Announce.pm (99)
• M lib/CID_Log.pm (90)
• M lib/CID_Lookup.pm (92)
• M lib/CID_Server.pm (65)
• M lib/Caller_ID.pm (51)
• M lib/Compool.pm (106)
• M lib/Concept.pm (248)
• M lib/DSC5401.pm (169)
• M lib/DSC_Alarm.pm (212)
• M lib/DVDPlayer.pm (60)
• M lib/Device_Item.pm (48)
• M lib/Display.pm (51)
• M lib/Display_Alpha.pm (142)
• M lib/Display_osd232.pm (386)
• M lib/Door_Item.pm (180)
• M lib/Dummy_Interface.pm (58)
• M lib/EIB_Device.pm (63)
• M lib/EIB_Items.pm (638)
• A lib/ExamplePOD.pm (58)
• M lib/Fan_Control.pm (83)
• M lib/File_Item.pm (122)
• M lib/FroggyRita.pm (49)
• M lib/Generic_Item.pm (182)
• M lib/Group.pm (115)
• M lib/HVweb_Item.pm (79)
• M lib/HomeBase.pm (66)
• M lib/Homevision.pm (53)
• M lib/IR_Item.pm (124)
• M lib/IR_Utils.pm (53)
• M lib/Insteon.pm (546)
• M lib/Insteon/AllLinkDatabase.pm (3599)
• M lib/Insteon/BaseInsteon.pm (1267)
• M lib/Insteon/BaseInterface.pm (452)
• M lib/Insteon/Controller.pm (339)
• A lib/Insteon/IOLinc.pm (552)
• A lib/Insteon/Irrigation.pm (312)
• M lib/Insteon/Lighting.pm (661)
• M lib/Insteon/Message.pm (422)
• M lib/Insteon/MessageDecoder.pm (24)
• M lib/Insteon/MessageDecoder_test.pl (3)
• M lib/Insteon/Security.pm (733)
• D lib/Insteon_Irrigation.pm (186)
• M lib/Insteon_PLM.pm (325)
• M lib/Irrigation_Item.pm (162)
• M lib/K8055.pm (67)
• M lib/LCD.pm (100)
• M lib/Light_Item.pm (202)
• M lib/Light_Restriction_Item.pm (138)
• M lib/Light_Switch_Item.pm (156)
• M lib/Logger.pm (124)
• M lib/Lynx10PLC.pm (406)
• M lib/MBM_mh.pm (73)
• M lib/MBM_sensors.pm (186)
• M lib/MSN.pm (74)
• M lib/Marrick.pm (71)
• M lib/Motion_Item.pm (133)
• M lib/Motion_Tracker.pm (140)
• M lib/Mp3Player.pm (52)
• M lib/Musica.pm (107)
• M lib/Network_Item.pm (67)
• M lib/Numbered_Menu.pm (127)
• M lib/Occupancy_Monitor.pm (674)
• M lib/OneWire_xAP.pm (98)
• M lib/Owfs_Item.pm (1873)
• M lib/Owfs_Thermostat.pm (105)
• M lib/PAobj.pm (74)
• A lib/Philips_Hue.pm (279)
• M lib/Photocell_Item.pm (112)
• M lib/PlayList.pm (195)
• M lib/PocketSphinx.pm (376)
• M lib/Presence_Monitor.pm (207)
• M lib/Process_Item.pm (147)
• M lib/RCS_Item.pm (59)
• M lib/RCSs.pm (59)
• M lib/RCSsTR40.pm (405)
• M lib/RF_Item.pm (115)
• M lib/RedRat.pm (59)
• M lib/RollFileHandle.pm (96)
• M lib/SMS_Item.pm (88)
• M lib/Scene.pm (211)
• M lib/SchoolDays.pm (148)
• M lib/Serial_Item.pm (54)
• M lib/Servo_Item.pm (49)
• M lib/Slinke.pm (215)
• M lib/SoapServer.pm (77)
• M lib/Socket_Item.pm (193)
• M lib/Stargate.pm (631)
• M lib/Stargate485.pm (171)
• M lib/StargateJTelephone.pm (48)
• M lib/SunTime_mh.pm (78)
• M lib/SysDiag_xAP.pm (108)
• M lib/TED.pm (59)
• M lib/Telephone_logger.pm (49)
• M lib/Text_Cmd.pm (87)
• M lib/Timer.pm (157)
• M lib/Voice_Cmd.pm (110)
• M lib/Voice_Text.pm (27)
• M lib/Weather_Item.pm (78)
• M lib/X10_Items.pm (440)
• M lib/X10_MR26.pm (5)
• A lib/Zmtrigger_Item.pm (190)
• M lib/ajax.pm (109)
• M lib/audrey_cid.pm (161)
• M lib/caddx.pm (158)
• M lib/console_utils.pl (50)
• M lib/dss_interface.pm (51)
• M lib/example_interface.pm (51)
• M lib/floorplan.pl (93)
• M lib/handy_tk_utilities.pl (178)
• M lib/handy_utilities.pl (71)
• M lib/iButton.pm (215)
• M lib/imap_utils.pl (73)
• M lib/json_server.pl (78)
• M lib/lirc_mh.pm (100)
• M lib/menu_code.pl (149)
• M lib/my_lib.pm (160)
• M lib/ncpuxa.pm (63)
• M lib/ncpuxa_mh.pm (71)
• M lib/net_gmail_utils.pl (91)
• M lib/read_table_A.pl (47)
• M lib/table_A2XML.pm (92)
• M lib/xPL_Items.pm (6)
• A lib/xPL_X10Basic.pm (79)
• M web/bin/ListManager.pl (11)
• M web/bin/dbmedit.cgi (2)
• M web/bin/phone_list.pl (2)
• M web/bin/test_cgi_error.pl (2)
• M web/bin/weather_graph_zoom.pl (2)
• D web/comics/Dilbert-2002.02.28.gif (0)
• D web/comics/FoxTrot-2003.02.12.gif (0)
• M web/lib/pod.css (10)
• M web/newclock/alarm.pl (2)
• M web/newclock/index.pl (2)
• M web/organizer/calendar.pl (2)
• M web/organizer/contacts.pl (2)
• M web/organizer/tasks.pl (2)
• A xPL_Lighting.pm b/lib/xPL_Lighting.pm (0)
Patch Links:

https://github.com/hollie/misterhouse/pull/223.patch
https://github.com/hollie/misterhouse/pull/223.diff

@hollie
Copy link
Owner

hollie commented Jun 15, 2013

Kevin,

I'm probably missing something: is it the intention that the changes in this pull request are merged into master before making the v3.0 release? The thing is that I can't merge your pull request automatically, so I don't know if it is your intention to merge these changes manually or if something went wrong with the pull request that you want to fix first.

Lieven.

@jame
Copy link
Contributor

jame commented Jun 20, 2013

I will be quite interested in what can be used as the ChangeLog file. (Need it for the debian packaging...)

@hollie
Copy link
Owner

hollie commented Jun 20, 2013

Hi RJ,

the changelog is here:
https://github.com/hollie/misterhouse/wiki/Changelog

Kind regards,
Lieven.

On Thu, Jun 20, 2013 at 3:29 AM, Robert James Clay <notifications@github.com

wrote:

I will be quite interested in what can be used as the ChangeLog file.
(Need it for the debian packaging...)


Reply to this email directly or view it on GitHubhttps://github.com//pull/223#issuecomment-19725895
.

@hollie
Copy link
Owner

hollie commented Jun 20, 2013

I've synced with Kevin on this pull request. I'll take care of the new release before the weekend and close this pull request when it is available.

@hollie hollie merged commit 9e7bb19 into stable Jun 20, 2013
@hollie
Copy link
Owner

hollie commented Jun 20, 2013

Done, the problem originated from a small conflict in the VERSION file and the related code that was updated in both branches. In the next updates to stable this should not happen anymore.

I've documented the process for later reference here https://github.com/hollie/misterhouse/wiki/Contributing#branches-naming-convention-and-stable-releases

@krkeegan
Copy link
Collaborator Author

Cool, thanks Lieven. Again, sorry I hadn't realized there was a conflict,
I just assumed a fast forward would work.

Quick question about the stable release procedure. How should the VERSION
file be updated? Based on what is on that page, I would assume:

  1. Finish up code.
  2. Update VERSION in master to the new Number
  3. Merge in stable (clearing up at least the VERSION conflict)
  4. Push master to stable
  5. Update VERSION in master to unstable again

On Thu, Jun 20, 2013 at 12:42 PM, Lieven Hollevoet <notifications@github.com

wrote:

Done, the problem originated from a small conflict in the VERSION file and
the related code that was updated in both branches. In the next updates to
stable this should not happen anymore.

I've documented the process for later reference here
https://github.com/hollie/misterhouse/wiki/Contributing#branches-naming-convention-and-stable-releases


Reply to this email directly or view it on GitHubhttps://github.com//pull/223#issuecomment-19778255
.

@hollie
Copy link
Owner

hollie commented Jun 20, 2013

Hey Kevin,

absolutely no problem, detecting the conflict was as easy as running the commands I wrote in the wiki.

Concerning the VERSION file: I'm in doubt. If we update it in the stable branch (as I did now, first merge master into stable and then update VERSION in stable) then I think we should not end up with a conflict. The only problem this time was that we had a conflict because VERSION and the related code in bin/mh were adapted in more than one branch.

I think that if we don't change the VERSION file any more, the next merge of master into stable will go smoothly. Then we just update the VERSION file again in stable.

An another note: I invite you to announce the new release on the list. You did most of the work according to me :-)

Template:


Hello list,

I have just updated the stable branch of the MisterHouse git repo to v3.0.

If you want to know what changed, the changelog is here:
https://github.com/hollie/misterhouse/wiki/Changelog#v30-20130620

If you are running stable already then updating to this new version is as easy as running 'git pull'.

A big thanks to all the contributors for keeping the awesome project alive!

Kind regards,
Lieven.

Op 20-jun.-2013, om 21:47 heeft Kevin Robert Keegan notifications@github.com het volgende geschreven:

Cool, thanks Lieven. Again, sorry I hadn't realized there was a conflict,
I just assumed a fast forward would work.

Quick question about the stable release procedure. How should the VERSION
file be updated? Based on what is on that page, I would assume:

  1. Finish up code.
  2. Update VERSION in master to the new Number
  3. Merge in stable (clearing up at least the VERSION conflict)
  4. Push master to stable
  5. Update VERSION in master to unstable again

On Thu, Jun 20, 2013 at 12:42 PM, Lieven Hollevoet <notifications@github.com

wrote:

Done, the problem originated from a small conflict in the VERSION file and
the related code that was updated in both branches. In the next updates to
stable this should not happen anymore.

I've documented the process for later reference here
https://github.com/hollie/misterhouse/wiki/Contributing#branches-naming-convention-and-stable-releases


Reply to this email directly or view it on GitHubhttps://github.com//pull/223#issuecomment-19778255
.


Reply to this email directly or view it on GitHub.

@peloy
Copy link
Collaborator

peloy commented Jun 20, 2013

Hello,

On 06/20/2013 03:47 PM, Kevin Robert Keegan wrote:

Cool, thanks Lieven. Again, sorry I hadn't realized there was a conflict,
I just assumed a fast forward would work.

Quick question about the stable release procedure. How should the VERSION
file be updated? Based on what is on that page, I would assume:

  1. Finish up code.
  2. Update VERSION in master to the new Number
  3. Merge in stable (clearing up at least the VERSION conflict)

Why would there be any conflicts? The code in stable should be unchanged
so a merge should not result in any conflicts, no? A conflict arises
when the same code in two branches is modified, and the VCS cannot
automatically merge one into the other.

Cheers,

Eloy Paris.-

  1. Push master to stable
  2. Update VERSION in master to unstable again

On Thu, Jun 20, 2013 at 12:42 PM, Lieven Hollevoet
<notifications@github.com

wrote:

Done, the problem originated from a small conflict in the VERSION
file and
the related code that was updated in both branches. In the next
updates to
stable this should not happen anymore.

I've documented the process for later reference here

https://github.com/hollie/misterhouse/wiki/Contributing#branches-naming-convention-and-stable-releases


Reply to this email directly or view it on
GitHubhttps://github.com//pull/223#issuecomment-19778255

.


Reply to this email directly or view it on GitHub
#223 (comment).

@krkeegan
Copy link
Collaborator Author

I was thinking something like the following example:

  1. the VERSION file in the stable branch gets set to 3.0
  2. the VERSION file in the master branch gets set to unstable
  3. since both files were modified there would be a conflict.

My git skills are pretty weak so I may be going about this wrong.

@peloy
Copy link
Collaborator

peloy commented Jun 20, 2013

On 06/20/2013 04:08 PM, Kevin Robert Keegan wrote:

I was thinking something like the following example:

  1. the VERSION file in the stable branch gets set to 3.0
  2. the VERSION file in the master branch gets set to unstable
  3. since both files were modified there would be a conflict.

I see. Yes, this definitely causes a conflict. I am still trying to
digest the unstable/stable branch release management strategy. I am more
used to something like:

  • Release 2.2 happens
  • Update VERSION file to "3.0pre" in the master branch
  • Do development in master branch
  • Update VERSION file to "3.0" in master branch
  • Release (by merging master into stable)
  • Update VERSION file to "3.1pre" in the master branch and repeat cycle

This way you are not updating VERSION in stable other than through a
merge. I guess we don't have to use "X.Ypre" and can use "unstable"
instead but my point is that we change "unstable" to <stable release
number", merge, and change back to "unstable" after the release.

I got used to this before Git. I don't know if Git and its seamless and
powerful branches changes this paradigm.

My git skills are pretty weak so I may be going about this wrong.

They stronger than mine; I am still trying to finish reading the Git
book ;-)

Cheers,

Eloy Paris.-

@hollie
Copy link
Owner

hollie commented Jun 20, 2013

Hey guys,

Op 20-jun.-2013, om 22:26 heeft Eloy Paris notifications@github.com het volgende geschreven:

On 06/20/2013 04:08 PM, Kevin Robert Keegan wrote:

I was thinking something like the following example:

  1. the VERSION file in the stable branch gets set to 3.0
  2. the VERSION file in the master branch gets set to unstable
  3. since both files were modified there would be a conflict.

Wait wait, first this note: according to me the reason we had a conflict now was because in both master and stable the same files were changed at the same lines. This should not happen anymore in next releases.
Now that the VERSION file is present in the master branch there will be no new conflicts next time (as we won't change the VERSION file in master any more).

I see. Yes, this definitely causes a conflict. I am still trying to
digest the unstable/stable branch release management strategy. I am more
used to something like:

  • Release 2.2 happens
  • Update VERSION file to "3.0pre" in the master branch
  • Do development in master branch
  • Update VERSION file to "3.0" in master branch
  • Release (by merging master into stable)
  • Update VERSION file to "3.1pre" in the master branch and repeat cycle

This way you are not updating VERSION in stable other than through a
merge. I guess we don't have to use "X.Ypre" and can use "unstable"
instead but my point is that we change "unstable" to <stable release
number", merge, and change back to "unstable" after the release.

Yes, this is also a possible way to go.

I got used to this before Git. I don't know if Git and its seamless and
powerful branches changes this paradigm.

Not necessarily. We can use this, but we can also use the way I did it now: master VERSION remains at 'unstable' and once we make a new stable branch we modify (in stable) the content of the file to v3.x.

My git skills are pretty weak so I may be going about this wrong.

They stronger than mine; I am still trying to finish reading the Git
book ;-)

Actually, I don't think your git skills are weak, considered the amount of contributions that flawlessly merged into master.

Anyhow: I don't hold any decision power on what concept we use. My only 2 cents is that it is important to have the 'unstable' term in the master branch so that it is clear that new people starting out with MisterHouse are not running the development branch.

Kind regards,
Lieven.

@peloy
Copy link
Collaborator

peloy commented Jun 20, 2013

On 06/20/2013 04:36 PM, Lieven Hollevoet wrote:

[...]

Wait wait, first this note: according to me the reason we had a conflict
now was because in both master and stable the same files were changed at
the same lines. This should not happen anymore in next releases.
Now that the VERSION file is present in the master branch there will be
no new conflicts next time (as we won't change the VERSION file in
master any more).

Okay.

I got used to this before Git. I don't know if Git and its seamless and
powerful branches changes this paradigm.

Not necessarily. We can use this, but we can also use the way I did it
now: master VERSION remains at 'unstable' and once we make a new stable
branch we modify (in stable) the content of the file to v3.x.

Okay.

My git skills are pretty weak so I may be going about this wrong.

They stronger than mine; I am still trying to finish reading the Git
book ;-)

Actually, I don't think your git skills are weak, considered the amount
of contributions that flawlessly merged into master.

Indeed. And he used branches and a lot of fancy Git things.

Anyhow: I don't hold any decision power on what concept we use. My only
2 cents is that it is important to have the 'unstable' term in the
master branch so that it is clear that new people starting out with
MisterHouse are not running the development branch.

I think your approach is fine.

Cheers,

Eloy Paris.-

@krkeegan
Copy link
Collaborator Author

master VERSION remains at 'unstable' and once we make a new stable branch we modify (in stable) the content of the file to v3.x.

Ahh, that is where I was confused. I was avoiding any direct commits to the stable branch. Yes, with that design there shouldn't be any conflicts.

@jame
Copy link
Contributor

jame commented Jun 22, 2013

Hi Lieven!

On Wed, 19 Jun 2013 23:59:52 -0700
Lieven Hollevoet notifications@github.com wrote:

the changelog is here:
https://github.com/hollie/misterhouse/wiki/Changelog

That's useful for those who have a good Internet connection but not
for those who don't, nor does that provide an updated one for the
MisterHouse distribution ...

On Thu, Jun 20, 2013 at 3:29 AM, Robert James Clay wrote:

I will be quite interested in what can be used as the ChangeLog
file. (Need it for the debian packaging...)

I figure to use the file docs/updates.pod for it, patching it with at
least the information you mentioned above...

Since the pull has been closed, I'll follow up to the mailing list
and etc. regarding this...

RJ Clay
jame@rocasa.us

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.

5 participants