deb_libcec.git
11 years agopress & hold
Lars Op den Kamp [Mon, 3 Dec 2012 23:48:22 +0000 (00:48 +0100)] 
press & hold

11 years agonever mark user control opcodes as unsupported
Lars Op den Kamp [Mon, 3 Dec 2012 23:44:24 +0000 (00:44 +0100)] 
never mark user control opcodes as unsupported

11 years agodon't mark as inactive source on routing changes
Lars Op den Kamp [Mon, 3 Dec 2012 21:23:34 +0000 (22:23 +0100)] 
don't mark as inactive source on routing changes

11 years agoreport our OSD name to the TV, since some TVs don't request it
Lars Op den Kamp [Sun, 2 Dec 2012 09:56:58 +0000 (10:56 +0100)] 
report our OSD name to the TV, since some TVs don't request it

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Sat, 17 Nov 2012 02:33:33 +0000 (03:33 +0100)] 
Merge branch 'master' into release

12 years agobit nicer than 1c8829bdd654b1cb7ed2c1bd1c7a437d5b198bcf, also send the key to clients...
Lars Op den Kamp [Sat, 17 Nov 2012 02:32:32 +0000 (03:32 +0100)] 
bit nicer than 1c8829bdd654b1cb7ed2c1bd1c7a437d5b198bcf, also send the key to clients when receiving a vendor key up

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Sat, 17 Nov 2012 02:23:59 +0000 (03:23 +0100)] 
Merge branch 'master' into release

12 years agophilips: some models send a vendor key release after a normal key press. only the...
Lars Op den Kamp [Sat, 17 Nov 2012 02:22:27 +0000 (03:22 +0100)] 
philips: some models send a vendor key release after a normal key press. only the first press was picked up because of this. closes #92

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Thu, 15 Nov 2012 14:51:25 +0000 (15:51 +0100)] 
Merge branch 'master' into release

12 years agofixed - string wasn't null terminated when logging 'set menu language'
Lars Op den Kamp [Thu, 15 Nov 2012 14:29:40 +0000 (15:29 +0100)] 
fixed - string wasn't null terminated when logging 'set menu language'

12 years agodon't mark a device as present after poll messages. it might be trying to allocate...
Lars Op den Kamp [Thu, 15 Nov 2012 14:23:20 +0000 (15:23 +0100)] 
don't mark a device as present after poll messages. it might be trying to allocate a logical address

12 years agotransmit an abort message when the vendor id is requested for philips, instead of...
Lars Op den Kamp [Thu, 15 Nov 2012 14:15:52 +0000 (15:15 +0100)] 
transmit an abort message when the vendor id is requested for philips, instead of returning philips's vendor id

12 years agodisplay an alert message when another device uses the same physical address as libCEC...
Lars Op den Kamp [Thu, 15 Nov 2012 14:02:52 +0000 (15:02 +0100)] 
display an alert message when another device uses the same physical address as libCEC uses, and reset libCEC's address to the default, 1.0.0.0 when this happens. bugzid: 831

12 years agobump CEC_LATEST_ADAPTER_FW_VERSION
Lars Op den Kamp [Thu, 15 Nov 2012 13:57:45 +0000 (14:57 +0100)] 
bump CEC_LATEST_ADAPTER_FW_VERSION

12 years agofixed typo in CCECBusDevice::SetActiveRoute(). issue #89
Lars Op den Kamp [Thu, 15 Nov 2012 09:47:00 +0000 (10:47 +0100)] 
fixed typo in CCECBusDevice::SetActiveRoute(). issue #89

12 years agoupdated changelog
Lars Op den Kamp [Thu, 15 Nov 2012 01:27:06 +0000 (02:27 +0100)] 
updated changelog

12 years agoupdated version number in the windows installer
Lars Op den Kamp [Thu, 15 Nov 2012 00:06:57 +0000 (01:06 +0100)] 
updated version number in the windows installer

12 years agofixed include path for threads.h in PHCommandHandler.h
Lars Op den Kamp [Thu, 15 Nov 2012 00:04:19 +0000 (01:04 +0100)] 
fixed include path for threads.h in PHCommandHandler.h

12 years agofixed: return value wasn't updated in GetLogicalAddresses()
Lars Op den Kamp [Wed, 14 Nov 2012 23:54:42 +0000 (00:54 +0100)] 
fixed: return value wasn't updated in GetLogicalAddresses()

12 years agosend active source message when we received a routing change with a device that is...
Lars Op den Kamp [Wed, 14 Nov 2012 23:42:34 +0000 (00:42 +0100)] 
send active source message when we received a routing change with a device that is handled by libCEC as address. issue #89

12 years agoadded 'is' command to cec-client, to mark libCEC as inactive source
Lars Op den Kamp [Wed, 14 Nov 2012 23:07:22 +0000 (00:07 +0100)] 
added 'is' command to cec-client, to mark libCEC as inactive source

12 years agobump to 2.0.4. dropped obsolete cec-config
Lars Op den Kamp [Wed, 14 Nov 2012 17:19:22 +0000 (18:19 +0100)] 
bump to 2.0.4. dropped obsolete cec-config

12 years agoadded CEC_CLIENT_VERSION_CURRENT and CEC_SERVER_VERSION_CURRENT. closes #88
Lars Op den Kamp [Wed, 14 Nov 2012 16:01:17 +0000 (17:01 +0100)] 
added CEC_CLIENT_VERSION_CURRENT and CEC_SERVER_VERSION_CURRENT. closes #88

12 years agosupport colon separated data for the 'tx' command in cec-client
Lars Op den Kamp [Wed, 14 Nov 2012 15:52:32 +0000 (16:52 +0100)] 
support colon separated data for the 'tx' command in cec-client

12 years agoonly change the handler of the primary device if the tv has a quirks mode, not for...
Lars Op den Kamp [Wed, 14 Nov 2012 10:55:53 +0000 (11:55 +0100)] 
only change the handler of the primary device if the tv has a quirks mode, not for other devices

12 years agosend an active source message when the route was set to the physical address that...
Lars Op den Kamp [Wed, 14 Nov 2012 09:55:40 +0000 (10:55 +0100)] 
send an active source message when the route was set to the physical address that is handled by libCEC

12 years agodefault double tap timeout wasn't set for panasonic
Lars Op den Kamp [Wed, 14 Nov 2012 09:46:12 +0000 (10:46 +0100)] 
default double tap timeout wasn't set for panasonic

12 years agophilips TVs sometimes keep sending key presses without key releases
Lars Op den Kamp [Wed, 14 Nov 2012 09:39:22 +0000 (10:39 +0100)] 
philips TVs sometimes keep sending key presses without key releases

12 years agodon't update the power status when the stream path is reset
Lars Op den Kamp [Wed, 14 Nov 2012 09:27:01 +0000 (10:27 +0100)] 
don't update the power status when the stream path is reset

12 years agofixed - philips TVs ignore 'image view on' right after they were sent into standby...
Lars Op den Kamp [Wed, 14 Nov 2012 02:43:14 +0000 (03:43 +0100)] 
fixed - philips TVs ignore 'image view on' right after they were sent into standby. check the power status of the tv every 5 seconds, until it reports to have powered on

12 years agomark a device as powered on when receiving a stream path or routing change
Lars Op den Kamp [Wed, 14 Nov 2012 01:33:36 +0000 (02:33 +0100)] 
mark a device as powered on when receiving a stream path or routing change

12 years agono need to cache the physical address of the active source in the device map; the...
Lars Op den Kamp [Wed, 14 Nov 2012 01:26:52 +0000 (02:26 +0100)] 
no need to cache the physical address of the active source in the device map; the address of the active source is sent along with the message

12 years agofixed - update the active source status correct on stream path changes
Lars Op den Kamp [Wed, 14 Nov 2012 01:21:34 +0000 (02:21 +0100)] 
fixed - update the active source status correct on stream path changes

12 years agoadded handler for philips. ignore repeating 'display information' keypresses from...
Lars Op den Kamp [Wed, 14 Nov 2012 00:45:39 +0000 (01:45 +0100)] 
added handler for philips. ignore repeating 'display information' keypresses from the tv, cause it keeps spamming this until another button is pressed

12 years agoensure that we only send 'image view on' when needed
Lars Op den Kamp [Wed, 14 Nov 2012 00:08:04 +0000 (01:08 +0100)] 
ensure that we only send 'image view on' when needed

12 years agoRevert "updated CEC_LATEST_ADAPTER_FW_DATE". Update this after we released the firmware.
Lars Op den Kamp [Tue, 13 Nov 2012 13:25:06 +0000 (14:25 +0100)] 
Revert "updated CEC_LATEST_ADAPTER_FW_DATE". Update this after we released the firmware.

This reverts commit 82a7cf7e6b0dde638f3e6572cf401c10807d733e.

12 years agofixed: mark the TV as 'in transition standby -> on' after sending 'image view on...
Lars Op den Kamp [Tue, 13 Nov 2012 13:14:09 +0000 (14:14 +0100)] 
fixed: mark the TV as 'in transition standby -> on' after sending 'image view on', so we don't spam the TV with 'image view on' command while waiting for it to finish powering up. bugzid: 1603. bugzid: 1609. bugzid: 1592

12 years agoonly mark a device as active source from cache if it's powered on
Lars Op den Kamp [Mon, 12 Nov 2012 23:30:09 +0000 (00:30 +0100)] 
only mark a device as active source from cache if it's powered on

12 years agoupdated CEC_LATEST_ADAPTER_FW_DATE
Lars Op den Kamp [Mon, 12 Nov 2012 20:59:57 +0000 (21:59 +0100)] 
updated CEC_LATEST_ADAPTER_FW_DATE

12 years agosignal all waiting threads when receiving an active source message, cache the current...
Lars Op den Kamp [Mon, 12 Nov 2012 16:42:20 +0000 (17:42 +0100)] 
signal all waiting threads when receiving an active source message, cache the current active source address, so the info doesn't get lost when we don't know the physical address yet. fixes incorrect or slow active source queries

12 years agofixed - request the active source before requesting device information in cec-client...
Lars Op den Kamp [Mon, 12 Nov 2012 15:34:39 +0000 (16:34 +0100)] 
fixed - request the active source before requesting device information in cec-client, or it'll display incorrect information when called the first time

12 years agoupdate the value of CCECProcessor::m_bMonitor when registering a client. SetControlle...
Lars Op den Kamp [Mon, 12 Nov 2012 15:25:25 +0000 (16:25 +0100)] 
update the value of CCECProcessor::m_bMonitor when registering a client. SetControlled() wasn't called on exit, so it took 30 seconds until it was auto-enabled

12 years agomark the adapter as (in)active source for firmware v3+
Lars Op den Kamp [Mon, 12 Nov 2012 15:04:12 +0000 (16:04 +0100)] 
mark the adapter as (in)active source for firmware v3+

12 years agosilence 'unused' warning properly. closes #86
Lars Op den Kamp [Mon, 12 Nov 2012 09:27:23 +0000 (10:27 +0100)] 
silence 'unused' warning properly. closes #86

12 years agofixed - only change the type of the client to 'playback device' instead of 'recorder...
Lars Op den Kamp [Fri, 9 Nov 2012 15:39:34 +0000 (16:39 +0100)] 
fixed - only change the type of the client to 'playback device' instead of 'recorder' for panasonic if the TV is a panasonic. issue #84

12 years agoalways poll the TV if it's marked as not present. issue #83. issue #84
Lars Op den Kamp [Fri, 9 Nov 2012 15:32:55 +0000 (16:32 +0100)] 
always poll the TV if it's marked as not present. issue #83. issue #84

12 years agofixed - only set m_iCurrentButton when the duration isn't known yet. fixes duplicate...
Lars Op den Kamp [Fri, 9 Nov 2012 13:39:38 +0000 (14:39 +0100)] 
fixed - only set m_iCurrentButton when the duration isn't known yet. fixes duplicate key press for vendor remote codes. closes #81

12 years agofixed: delete the right registry key
Martin Ellis [Thu, 8 Nov 2012 20:07:49 +0000 (20:07 +0000)] 
fixed: delete the right registry key

12 years agocosmetics: captialisation of words
Martin Ellis [Thu, 8 Nov 2012 20:07:23 +0000 (20:07 +0000)] 
cosmetics: captialisation of words

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Wed, 31 Oct 2012 14:58:41 +0000 (15:58 +0100)] 
Merge branch 'master' into release

12 years agochangelog updated for 2.0.3
Lars Op den Kamp [Wed, 31 Oct 2012 14:57:57 +0000 (15:57 +0100)] 
changelog updated for 2.0.3

12 years agoincreased double tap timeout to 250ms
Lars Op den Kamp [Wed, 31 Oct 2012 14:55:42 +0000 (15:55 +0100)] 
increased double tap timeout to 250ms

12 years agorenamed CuBox and NXP* to TDA995x
Lars Op den Kamp [Wed, 31 Oct 2012 14:45:14 +0000 (15:45 +0100)] 
renamed CuBox and NXP* to TDA995x

12 years agoadded bootstrap script. updated README
Lars Op den Kamp [Wed, 31 Oct 2012 14:37:15 +0000 (15:37 +0100)] 
added bootstrap script. updated README

12 years agobump version number to 2.0.3 and updated changelog
Lars Op den Kamp [Wed, 31 Oct 2012 11:05:53 +0000 (12:05 +0100)] 
bump version number to 2.0.3 and updated changelog

12 years agofixed - LG doesn't send routing changes, and marks the TV as active source when switc...
Lars Op den Kamp [Wed, 31 Oct 2012 12:36:03 +0000 (13:36 +0100)] 
fixed - LG doesn't send routing changes, and marks the TV as active source when switching to another source that's not been selected in the simplink menu instead. this change keeps libCEC marked as powered on and keep the deck state set to CEC_DECK_INFO_OTHER_STATUS_LG. fixes keypresses not working after switching to another source and back to libCEC's hdmi port via the source select menu instead of the simplink menu. github issue #71

12 years agolog what data we received exactly when we receive an response from the pi's firmware...
Lars Op den Kamp [Wed, 31 Oct 2012 10:08:59 +0000 (11:08 +0100)] 
log what data we received exactly when we receive an response from the pi's firmware that doesn't match any command that we sent. issue #77

12 years agofixed - some TVs send keypresses to us without making us the active source. mark...
Lars Op den Kamp [Thu, 25 Oct 2012 12:26:23 +0000 (14:26 +0200)] 
fixed - some TVs send keypresses to us without making us the active source. mark us as active source when this happens. issue #71

12 years agofix for LG models that send a vendor key up after a normal key down. issue #71
Lars Op den Kamp [Thu, 25 Oct 2012 12:14:54 +0000 (14:14 +0200)] 
fix for LG models that send a vendor key up after a normal key down. issue #71

12 years agorespond with CEC_ABORT_REASON_INVALID_OPERAND when receiving a keypress without a...
Lars Op den Kamp [Thu, 25 Oct 2012 11:58:12 +0000 (13:58 +0200)] 
respond with CEC_ABORT_REASON_INVALID_OPERAND when receiving a keypress without a parameter

12 years agolog unhandled vendor remote keycodes in the log, so they get logged without debugging...
Lars Op den Kamp [Thu, 25 Oct 2012 11:56:43 +0000 (13:56 +0200)] 
log unhandled vendor remote keycodes in the log, so they get logged without debugging enabled

12 years agofixed typo in stop+pause combo key
Lars Op den Kamp [Thu, 25 Oct 2012 10:12:25 +0000 (12:12 +0200)] 
fixed typo in stop+pause combo key

12 years agofixed - don't respond with an abort message when receiving a vendor remote button...
Lars Op den Kamp [Thu, 25 Oct 2012 08:51:51 +0000 (10:51 +0200)] 
fixed - don't respond with an abort message when receiving a vendor remote button command

12 years agofixed - don't try to set controlled mode when using firmware version 1 and crash...
Lars Op den Kamp [Tue, 23 Oct 2012 13:28:53 +0000 (15:28 +0200)] 
fixed - don't try to set controlled mode when using firmware version 1 and crash. closes #76

12 years agoMerge pull request #73 from warped-rudi/Pulse-Eight
Lars Op den Kamp [Fri, 19 Oct 2012 08:01:22 +0000 (01:01 -0700)] 
Merge pull request #73 from warped-rudi/Pulse-Eight

Added adapter ID interface for NXP (CuBox)

12 years agoAdded adapter ID interface
warped-rudi [Fri, 19 Oct 2012 05:56:19 +0000 (07:56 +0200)] 
Added adapter ID interface

12 years agofixed - new combo key handling broke samsung's vendor specific remote buttons. github...
Lars Op den Kamp [Thu, 18 Oct 2012 14:45:54 +0000 (16:45 +0200)] 
fixed - new combo key handling broke samsung's vendor specific remote buttons. github issue #54

12 years agofixed handling of active route changes. github issue #56 and issue #58
Lars Op den Kamp [Thu, 18 Oct 2012 13:58:17 +0000 (15:58 +0200)] 
fixed handling of active route changes. github issue #56 and issue #58

12 years agoadded CCECDeviceMap::GetChildrenOf()
Lars Op den Kamp [Thu, 18 Oct 2012 13:50:07 +0000 (15:50 +0200)] 
added CCECDeviceMap::GetChildrenOf()

12 years agoadded CCECTypeUtils::PhysicalAddressIsIncluded()
Lars Op den Kamp [Thu, 18 Oct 2012 11:51:42 +0000 (13:51 +0200)] 
added CCECTypeUtils::PhysicalAddressIsIncluded()

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Mon, 15 Oct 2012 15:27:38 +0000 (17:27 +0200)] 
Merge branch 'master' into release

12 years agoMerge branch 'development'. closes #67
Lars Op den Kamp [Mon, 15 Oct 2012 12:11:32 +0000 (14:11 +0200)] 
Merge branch 'development'. closes #67

12 years agofixed typo. closes #69
Lars Op den Kamp [Mon, 15 Oct 2012 12:08:21 +0000 (14:08 +0200)] 
fixed typo. closes #69

12 years agobumped version and updated changelog
Lars Op den Kamp [Mon, 15 Oct 2012 11:52:37 +0000 (13:52 +0200)] 
bumped version and updated changelog

12 years agoupdate the device status to CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON after sendin...
Lars Op den Kamp [Mon, 15 Oct 2012 11:34:35 +0000 (13:34 +0200)] 
update the device status to CEC_POWER_STATUS_IN_TRANSITION_STANDBY_TO_ON after sending an image view on command and the status isn't 'on' yet

12 years agobit less bus and log spamming while waiting for the tv to power up
Lars Op den Kamp [Mon, 15 Oct 2012 11:26:45 +0000 (13:26 +0200)] 
bit less bus and log spamming while waiting for the tv to power up

12 years agofixed - reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby
Lars Op den Kamp [Mon, 15 Oct 2012 11:03:26 +0000 (13:03 +0200)] 
fixed - reset CVLCommandHandler::m_bCapabilitiesSent when the TV goes to standby

12 years agofixed - don't keep spamming the bus with a vendor command when an active source switc...
Lars Op den Kamp [Mon, 15 Oct 2012 11:02:09 +0000 (13:02 +0200)] 
fixed - don't keep spamming the bus with a vendor command when an active source switch is pending for panasonic, but only send it when needed

12 years agoless debug logging by default
Lars Op den Kamp [Mon, 15 Oct 2012 10:15:23 +0000 (12:15 +0200)] 
less debug logging by default

12 years agofixed - updating the device status after a poll was broken and could reset the status...
Lars Op den Kamp [Mon, 15 Oct 2012 10:13:09 +0000 (12:13 +0200)] 
fixed - updating the device status after a poll was broken and could reset the status of devices that were marked as handled by libCEC to 'not present'

12 years agoMerge branch 'master' into release
Lars Op den Kamp [Thu, 11 Oct 2012 15:14:12 +0000 (17:14 +0200)] 
Merge branch 'master' into release

12 years agoMerge branch 'development'
Lars Op den Kamp [Thu, 11 Oct 2012 14:55:12 +0000 (16:55 +0200)] 
Merge branch 'development'

12 years agobump to 2.0.1 and updated changelog
Lars Op den Kamp [Thu, 11 Oct 2012 13:48:52 +0000 (15:48 +0200)] 
bump to 2.0.1 and updated changelog

12 years agolog what we received exactly when logging FIXME
Lars Op den Kamp [Thu, 11 Oct 2012 13:25:27 +0000 (15:25 +0200)] 
log what we received exactly when logging FIXME

12 years agofixed - typo in CVLCommandHandler::VendorPreActivateSourceHook. bugzid: 1087
Lars Op den Kamp [Thu, 11 Oct 2012 13:13:53 +0000 (15:13 +0200)] 
fixed - typo in CVLCommandHandler::VendorPreActivateSourceHook. bugzid: 1087

12 years agofixed - if we failed to get the physical address of the device that we are connected...
Lars Op den Kamp [Thu, 11 Oct 2012 12:58:53 +0000 (14:58 +0200)] 
fixed - if we failed to get the physical address of the device that we are connected to in the config, then try to use the address that was persisted in the eeprom before resetting to the default value, 1.0.0.0. closes #50.

12 years agofixed - don't update the device status of unregistered/broadcast
Lars Op den Kamp [Thu, 11 Oct 2012 12:41:57 +0000 (14:41 +0200)] 
fixed - don't update the device status of unregistered/broadcast

12 years agofixed - log all device status changes
Lars Op den Kamp [Thu, 11 Oct 2012 12:34:43 +0000 (14:34 +0200)] 
fixed - log all device status changes

12 years agolower retry timeout for source switches
Lars Op den Kamp [Thu, 11 Oct 2012 12:14:58 +0000 (14:14 +0200)] 
lower retry timeout for source switches

12 years agocec-client: fixed - wait for the source switch to finish when cec-client is called...
Lars Op den Kamp [Thu, 11 Oct 2012 12:13:22 +0000 (14:13 +0200)] 
cec-client: fixed - wait for the source switch to finish when cec-client is called with the -s switch

12 years agofixed - CCECClient::IsLibCECActiveSource returns false now while the active source...
Lars Op den Kamp [Thu, 11 Oct 2012 12:12:25 +0000 (14:12 +0200)] 
fixed - CCECClient::IsLibCECActiveSource returns false now while the active source command is pending

12 years agofixed - log failed acks and other errors in the debug log again
Lars Op den Kamp [Thu, 11 Oct 2012 12:02:21 +0000 (14:02 +0200)] 
fixed - log failed acks and other errors in the debug log again

12 years agorequest the power status of the TV directly after registering a new client
Lars Op den Kamp [Thu, 11 Oct 2012 11:21:09 +0000 (13:21 +0200)] 
request the power status of the TV directly after registering a new client

12 years agofixed - don't send 'image view on' when the TV is already powering up
Lars Op den Kamp [Thu, 11 Oct 2012 11:19:40 +0000 (13:19 +0200)] 
fixed - don't send 'image view on' when the TV is already powering up

12 years agofixed - don't keep waiting for an updated power status from the TV for Panasonic...
Lars Op den Kamp [Thu, 11 Oct 2012 11:19:04 +0000 (13:19 +0200)] 
fixed - don't keep waiting for an updated power status from the TV for Panasonic, but request a status update once every 5 seconds, or we can possibly wait forever for the tv to send it

12 years agofixed - reset the delayed source switch timeout properly, so we don't spam commands...
Lars Op den Kamp [Thu, 11 Oct 2012 10:59:15 +0000 (12:59 +0200)] 
fixed - reset the delayed source switch timeout properly, so we don't spam commands every second

12 years agofixed - don't change the device status when sending a delayed source switch
Lars Op den Kamp [Thu, 11 Oct 2012 10:56:56 +0000 (12:56 +0200)] 
fixed - don't change the device status when sending a delayed source switch

12 years agodon't send out commands to a device that is marked as not present or handled by libCEC
Lars Op den Kamp [Thu, 11 Oct 2012 10:51:29 +0000 (12:51 +0200)] 
don't send out commands to a device that is marked as not present or handled by libCEC

12 years agofixed - don't keep trying to send 'image view on' commands to the TV when no TV is...
Lars Op den Kamp [Thu, 11 Oct 2012 10:41:26 +0000 (12:41 +0200)] 
fixed - don't keep trying to send 'image view on' commands to the TV when no TV is connected, and just send the 'set active source' command. fixes source switch and debug log spam for people without a TV connected

12 years agoMerge branch 'development' into release
Lars Op den Kamp [Tue, 9 Oct 2012 11:17:25 +0000 (13:17 +0200)] 
Merge branch 'development' into release