From 6c3fe969dd36536e2925603109808203ae1d2741 Mon Sep 17 00:00:00 2001
From: fly <merspieler@alwaysdata.com>
Date: Tue, 14 May 2024 16:43:26 +0200
Subject: [PATCH] Keep reportId in hidtools output

Signed-off-by: fly <merspieler@alwaysdata.com>
---
 Pedestal/firmware/descriptor.wara | 21 +++++++++++++++++++++
 Pedestal/firmware/hidtools.sh     |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Pedestal/firmware/descriptor.wara b/Pedestal/firmware/descriptor.wara
index 1f08e83..de67f75 100644
--- a/Pedestal/firmware/descriptor.wara
+++ b/Pedestal/firmware/descriptor.wara
@@ -14,6 +14,27 @@ logicalValueRange = [0, 65535]
 usage = ['Generic Desktop', 'Z']
 logicalValueRange = [0, 65535]
 
+[[applicationCollection.inputReport.variableItem]]
+usageRange = ['Button', 'Button 1', 'Button 16']
+logicalValueRange = [0, 1]
+
+[[applicationCollection.inputReport]]
+
+[[applicationCollection.inputReport.physicalCollection]]
+usage = ['Generic Desktop', 'Pointer']
+
+[[applicationCollection.inputReport.physicalCollection.variableItem]]
+usage = ['Generic Desktop', 'X']
+logicalValueRange = [0, 65535]
+
+[[applicationCollection.inputReport.physicalCollection.variableItem]]
+usage = ['Generic Desktop', 'Z']
+logicalValueRange = [0, 65535]
+
+[[applicationCollection.inputReport.variableItem]]
+usageRange = ['Button', 'Button 1', 'Button 16']
+logicalValueRange = [0, 1]
+
 [[applicationCollection.outputReport]]
 
 [[applicationCollection.outputReport.variableItem]]
diff --git a/Pedestal/firmware/hidtools.sh b/Pedestal/firmware/hidtools.sh
index 85f7524..12d02cc 100755
--- a/Pedestal/firmware/hidtools.sh
+++ b/Pedestal/firmware/hidtools.sh
@@ -1,3 +1,3 @@
 #! /usr/bin/env bash
 nix run github:feathecutie/hidtools -- -s descriptor.wara
-cat descriptor.h |grep "    0x"|grep -v "ReportId"
+cat descriptor.h |grep "    0x"