{"id":2629,"url":"https://patchwork.libcamera.org/api/patches/2629/?format=json","web_url":"https://patchwork.libcamera.org/patch/2629/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200113164245.52535-15-jacopo@jmondi.org>","date":"2020-01-13T16:42:36","name":"[libcamera-devel,14/23] libcamera: controls: Parse 'compound' yaml property","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d16c1a35fa506fcec7f529ab73e973edf9049800","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/2629/mbox/","series":[{"id":618,"url":"https://patchwork.libcamera.org/api/series/618/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=618","date":"2020-01-13T16:42:22","name":"Properties and compound controls","version":1,"mbox":"https://patchwork.libcamera.org/series/618/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2629/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2629/checks/","tags":{},"headers":{"Return-Path":"","Received":["from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4BC58606EA\n\tfor ;\n\tMon, 13 Jan 2020 17:40:35 +0100 (CET)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id E1A08100009;\n\tMon, 13 Jan 2020 16:40:34 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 13 Jan 2020 17:42:36 +0100","Message-Id":"<20200113164245.52535-15-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.24.0","In-Reply-To":"<20200113164245.52535-1-jacopo@jmondi.org>","References":"<20200113164245.52535-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 14/23] libcamera: controls: Parse\n\t'compound' yaml property","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 13 Jan 2020 16:40:35 -0000"},"content":"Parse the 'compound' yaml property and create Control<> instances with\nthe opportune type accordingly.\n\nControls defined in the yaml source file as 'compound' will be\ninstantiated with 'Span' type, while non-compound controls retain the\n'T' type.\n\nExample\ncontrols_ids.yaml:\n\n - CompoundControl:\n type: int32_t\n description: A fictional compound control\n compound: true\n\nWill be parsed by gen-control.py to generate a Control>\ninstance.\n\nSigned-off-by: Jacopo Mondi \n---\n src/libcamera/gen-controls.py | 14 ++++++++++++--\n 1 file changed, 12 insertions(+), 2 deletions(-)","diff":"diff --git a/src/libcamera/gen-controls.py b/src/libcamera/gen-controls.py\nindex 7369ab4b0fdb..53ac66483bf6 100755\n--- a/src/libcamera/gen-controls.py\n+++ b/src/libcamera/gen-controls.py\n@@ -42,9 +42,14 @@ ${description}\n name, ctrl = ctrl.popitem()\n id_name = snake_case(name).upper()\n \n+ if ctrl.get('compound'):\n+ ctrl_type = 'Span<%s>' % ctrl['type']\n+ else:\n+ ctrl_type = ctrl['type']\n+\n info = {\n 'name': name,\n- 'type': ctrl['type'],\n+ 'type': ctrl_type,\n 'description': format_description(ctrl['description']),\n 'id_name': id_name,\n }\n@@ -92,9 +97,14 @@ def generate_h(controls):\n \n ids.append('\\t' + id_name + ' = ' + str(id_value) + ',')\n \n+ if ctrl.get('compound'):\n+ ctrl_type = 'Span<%s>' % ctrl['type']\n+ else:\n+ ctrl_type = ctrl['type']\n+\n info = {\n 'name': name,\n- 'type': ctrl['type'],\n+ 'type': ctrl_type,\n }\n \n enum = ctrl.get('enum')\n","prefixes":["libcamera-devel","14/23"]}