The functions defined are laying the groundwork. The functions will be called from the "self.pjlink_functions" defined at line 155.
at this point, I'm working on the changes incrementally - plus, trying to do some refactoring at the same time. Since the update to PJLink Class 2 is rather large, I'm trying to keep the actual merges somewhat manageable by keeping them limited per merge. On Mon, Jul 17, 2017 at 1:35 PM, Tim Bentley <[email protected]> wrote: > Review: Needs Fixing > > See inline comments. > Please fix the commit comments to reflect the changes as they refer to #noqa > which has been removed. (There may be more). > > Diff comments: > >> >> === modified file 'openlp/core/lib/projector/pjlink1.py' >> --- openlp/core/lib/projector/pjlink1.py 2017-06-17 00:25:06 +0000 >> +++ openlp/core/lib/projector/pjlink1.py 2017-07-12 13:16:20 +0000 >> @@ -262,6 +277,38 @@ >> self.send_command('INF2', queue=True) >> if self.pjlink_name is None: >> self.send_command('NAME', queue=True) >> + if self.pjlink_class == '2': >> + # Class 2 specific checks >> + if self.serial_no is None: >> + self.send_command('SNUM', queue=True) >> + if self.sw_version is None: >> + self.send_command('SVER', queue=True) >> + if self.model_filter is None: >> + self.send_command('RFIL', queue=True) >> + if self.model_lamp is None: >> + self.send_command('RLMP', queue=True) >> + >> + def process_rfil(self, data): > > Where is this called from? > >> + """ >> + Process replacement filter type >> + """ >> + if self.model_filter is None: >> + self.model_filter = data >> + else: >> + log.warn("({ip}) Filter model already set".format(ip=self.ip)) >> + log.warn("({ip}) Saved model: '{old}'".format(ip=self.ip, >> old=self.model_filter)) >> + log.warn("({ip}) New model: '{new}'".format(ip=self.ip, >> new=data)) >> + >> + def process_rlmp(self, data): > > Where is this called from? > >> + """ >> + Process replacement lamp type >> + """ >> + if self.model_lamp is None: >> + self.model_lamp = data >> + else: >> + log.warn("({ip}) Lamp model already set".format(ip=self.ip)) >> + log.warn("({ip}) Saved lamp: '{old}'".format(ip=self.ip, >> old=self.model_lamp)) >> + log.warn("({ip}) New lamp: '{new}'".format(ip=self.ip, >> new=data)) >> >> def _get_status(self, status): >> """ > > > -- > https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327290 > You are the owner of lp:~alisonken1/openlp/pjlink2-f. -- - Ken Registered Linux user 296561 Slackin' since 1993 Slackware Linux (http://www.slackware.com) OpenLP - Church Projection Software Empower Your Church http://openlp.org https://code.launchpad.net/~alisonken1/openlp/pjlink2-f/+merge/327290 Your team OpenLP Core is subscribed to branch lp:openlp. _______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : [email protected] Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
