Supply port id via constructor

Author: ccrisan

qtoggleserver/cmdline/peripheral.py

@@ -155,7 +155,7 @@ async def make_port_args(self) -> List[Dict[str, Any]]:
 
  return [{
  'driver': CommandLinePort,
- 'port_id': p['id'],
- 'port_type': p['type'],
+ 'id': p['id'],
+ 'type': p['type'],
  'writable': self._write_command is not None
  } for p in self._port_details]

qtoggleserver/cmdline/ports.py

@@ -8,25 +8,21 @@
 
 
 class CommandLinePort(polled.PolledPort):
- def __init__(self, *, port_id: str, port_type: str, writable: bool, **kwargs) -> None:
- self._port_id: str = port_id
- self._type: str = port_type
+ def __init__(self, *, id: str, type: str, writable: bool, **kwargs) -> None:
+ self._type = type
  self._writable = writable
 
- super().__init__(**kwargs)
+ super().__init__(id=id, **kwargs)
 
  def get_peripheral(self) -> CommandLine:
  return cast(CommandLine, super().get_peripheral())
 
- def make_id(self) -> str:
- return self._port_id
-
  async def write_value(self, value: PortValue) -> None:
  peripheral = self.get_peripheral()
- peripheral.update_value(self._port_id, value)
+ peripheral.update_value(self.get_initial_id(), value)
 
  await peripheral.write_values()
 
  async def read_value(self) -> NullablePortValue:
- value = self.get_peripheral().get_value(self._port_id)
+ value = self.get_peripheral().get_value(self.get_initial_id())
  return await self.adapt_value_type(value)