openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #32772
Re: [Merge] lp:~alisonken1/openlp/pjlink2-q into lp:openlp
Review: Needs Fixing
Sorry will clash with one of my fixes which has been merged
See question
Diff comments:
>
> === modified file 'openlp/core/projectors/constants.py'
> --- openlp/core/projectors/constants.py 2018-01-03 00:35:14 +0000
> +++ openlp/core/projectors/constants.py 2018-03-17 17:48:23 +0000
> @@ -154,110 +154,137 @@
> S_INFO
> ]
>
> -# NOTE: Changed format to account for some commands are both class 1 and 2
> +# NOTE: Changed format to account for some commands are both class 1 and 2.
> +# Make sure the sequence of 'version' is lowest-to-highest.
> PJLINK_VALID_CMD = {
> 'ACKN': {'version': ['2', ],
> + 'default': '2',
Why do we have a missing slot?
> 'description': translate('OpenLP.PJLinkConstants',
> 'Acknowledge a PJLink SRCH command - returns MAC address.')
> },
> 'AVMT': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Blank/unblank video and/or mute audio.')
> },
> 'CLSS': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector PJLink class support.')
> },
> 'ERST': {'version': ['1', '2'],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query error status from projector. '
> 'Returns fan/lamp/temp/cover/filter/other error status.')
> },
> 'FILT': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query number of hours on filter.')
> },
> 'FREZ': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Freeze or unfreeze current image being projected.')
> },
> 'INF1': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector manufacturer name.')
> },
> 'INF2': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector product name.')
> },
> 'INFO': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector for other information set by manufacturer.')
> },
> 'INNM': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query specified input source name')
> },
> 'INPT': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Switch to specified video source.')
> },
> 'INST': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query available input sources.')
> },
> 'IRES': {'version:': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query current input resolution.')
> },
> 'LAMP': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query lamp time and on/off status. Multiple lamps supported.')
> },
> 'LKUP': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'UDP Status - Projector is now available on network. Includes MAC address.')
> },
> 'MVOL': {'version': ['2', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Adjust microphone volume by 1 step.')
> },
> 'NAME': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query customer-set projector name.')
> },
> 'PJLINK': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Initial connection with authentication/no authentication request.')
> },
> 'POWR': {'version': ['1', ],
> + 'default': '1',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Turn lamp on or off/standby.')
> },
> 'RFIL': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query replacement air filter model number.')
> },
> 'RLMP': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query replacement lamp model number.')
> },
> 'RRES': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query recommended resolution.')
> },
> 'SNUM': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector serial number.')
> },
> 'SRCH': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'UDP broadcast search request for available projectors. Reply is ACKN.')
> },
> 'SVER': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Query projector software version number.')
> },
> 'SVOL': {'version': ['2', ],
> + 'default': '2',
> 'description': translate('OpenLP.PJLinkConstants',
> 'Adjust speaker volume by 1 step.')
> }
>
> === modified file 'openlp/core/projectors/pjlink.py'
> --- openlp/core/projectors/pjlink.py 2018-02-11 11:42:13 +0000
> +++ openlp/core/projectors/pjlink.py 2018-03-17 17:48:23 +0000
> @@ -351,7 +319,7 @@
> self.projectorUpdateIcons.emit()
> return
>
> - def process_clss(self, data):
> + def process_clss(self, data, *args, **kwargs):
why args
> """
> PJLink class that this projector supports. See PJLink specification for format.
> Updates self.class.
--
https://code.launchpad.net/~alisonken1/openlp/pjlink2-q/+merge/341563
Your team OpenLP Core is subscribed to branch lp:openlp.
Follow ups
References
