Fix blockly to python: print with color in blockly

Author: vimior

xarm/tools/blockly/_blockly_handler.py

@@ -271,23 +271,38 @@ def _handle_app_studio_traj(self, block, indent=0, arg_map=None):
 
  def _handle_tool_message(self, block, indent=0, arg_map=None):
  fields = self._get_nodes('field', block)
+ color = json.dumps(fields[0].text, ensure_ascii=False) if len(fields) > 1 else 'white'
  msg = json.dumps(fields[1].text if fields[-1].text is not None else '', ensure_ascii=False)
- self._append_main_code('print({})'.format(msg), indent + 2)
+ if self._highlight_callback is not None:
+ self._append_main_code('print({}, {})'.format(msg, color), indent + 2)
+ else:
+ self._append_main_code('print({})'.format(msg), indent + 2)
 
  def _handle_tool_console(self, block, indent=0, arg_map=None):
  fields = self._get_nodes('field', block)
+ color = json.dumps(fields[0].text, ensure_ascii=False) if len(fields) > 1 else 'white'
  msg = json.dumps(fields[1].text if fields[-1].text is not None else '', ensure_ascii=False)
- self._append_main_code('print({})'.format(msg), indent + 2)
+ if self._highlight_callback is not None:
+ self._append_main_code('print({}, {})'.format(msg, color), indent + 2)
+ else:
+ self._append_main_code('print({})'.format(msg), indent + 2)
 
  def _handle_tool_console_with_variable(self, block, indent=0, arg_map=None):
  fields = self._get_nodes('field', block)
+ color = json.dumps(fields[0].text, ensure_ascii=False)
  msg = fields[1].text
  value = self._get_node('value', block)
  expression = self._get_condition_expression(value, arg_map=arg_map)
  if msg:
- self._append_main_code('print({}.format({}))'.format(json.dumps(msg+'{}', ensure_ascii=False), expression), indent + 2)
+ if self._highlight_callback is not None:
+ self._append_main_code('print({}.format({}), {})'.format(json.dumps(msg+'{}', ensure_ascii=False), expression, color), indent + 2)
+ else:
+ self._append_main_code('print({}.format({}))'.format(json.dumps(msg+'{}', ensure_ascii=False), expression), indent + 2)
  else:
- self._append_main_code('print(\'{{}}\'.format({}))'.format(expression), indent + 2)
+ if self._highlight_callback is not None:
+ self._append_main_code('print(\'{{}}\'.format({}), {})'.format(expression, color), indent + 2)
+ else:
+ self._append_main_code('print(\'{{}}\'.format({}))'.format(expression), indent + 2)
 
  def _handle_wait(self, block, indent=0, arg_map=None):
  value = self._get_node('value', root=block)

xarm/x3/base.py

@@ -2335,7 +2335,7 @@ def getset_tgpio_modbus_data(self, datas, min_res_len=0, ignore_log=False, host_
  if not self.connected:
  return APIState.NOT_CONNECTED, []
  ret = self.arm_cmd.tgpio_set_modbus(datas, len(datas), host_id=host_id)
- ret[0] = self._check_modbus_code(ret, min_res_len + 2)
+ ret[0] = self._check_modbus_code(ret, min_res_len + 2, host_id=host_id)
  if not ignore_log:
  self.log_api_info('API -> getset_tgpio_modbus_data -> code={}, response={}'.format(ret[0], ret[2:]), code=ret[0])
  return ret[0], ret[2:]