From 83d5bde9549dff682fe0c8cc63f02b1f0102bcce Mon Sep 17 00:00:00 2001
From: Guillaume Rousse <guillomovitch@gmail.com>
Date: Mon, 25 Mar 2019 21:00:49 +0100
Subject: [PATCH 1/2] more modular consumables description

---
 documentation/dev/spec/protocol/netinventory.md | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/documentation/dev/spec/protocol/netinventory.md b/documentation/dev/spec/protocol/netinventory.md
index 3da0bc9c..f639b04a 100644
--- a/documentation/dev/spec/protocol/netinventory.md
+++ b/documentation/dev/spec/protocol/netinventory.md
@@ -10,7 +10,7 @@ title: Network inventory protocol
 ### Specification
 
     {
-	    'id': ''string'',
+            'id': ''string'',
         'type': 'netinventory',
         'workers': ''integer'',
         'targets': [
@@ -255,6 +255,7 @@ title: Network inventory protocol
 
           <!-- CARTRIDGES node can content any meaningful printer cartridge info
           and it is up to the server to interpret given keys and values -->
+          <!-- this element is deprecated, CONSUMABLES should be used instead -->
           <!ELEMENT CARTRIDGES ANY>
           <!-- Following lines are well-known samples, so they are kept as comment
             <!ELEMENT CARTRIDGEBLACK (#PCDATA)>
@@ -285,6 +286,16 @@ title: Network inventory protocol
             <!ELEMENT CARTRIDGEPHOTOBLACK (#PCDATA)>
             End of samples -->
 
+          <!-- consumables list ->
+          <!ELEMENT CONSUMABLES (CONSUMABLE)+>
+
+            <!-- a single consumable ->
+            <!ELEMENT CONSUMABLE (TYPE, COLOR, VALUE, UNIT)>
+              <!ELEMENT TYPE (#PCDATA)>
+              <!ELEMENT COLOR (#PCDATA)>
+              <!ELEMENT VALUE (#PCDATA)>
+              <!ELEMENT UNIT (#PCDATA)>
+
         <!-- netinventory module version(string) -->
         <!ELEMENT MODULEVERSION (#PCDATA)>
         <!-- server process ID (integer) -->

From 84a3e108d0d7d9b9bd3e9afaa46988572bafebcd Mon Sep 17 00:00:00 2001
From: Guillaume Bougard <gbougard@teclib.com>
Date: Fri, 9 Oct 2020 14:47:34 +0200
Subject: [PATCH 2/2] support max raw value for consumables

---
 documentation/dev/spec/protocol/netinventory.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/documentation/dev/spec/protocol/netinventory.md b/documentation/dev/spec/protocol/netinventory.md
index f639b04a..bdb49454 100644
--- a/documentation/dev/spec/protocol/netinventory.md
+++ b/documentation/dev/spec/protocol/netinventory.md
@@ -295,6 +295,8 @@ title: Network inventory protocol
               <!ELEMENT COLOR (#PCDATA)>
               <!ELEMENT VALUE (#PCDATA)>
               <!ELEMENT UNIT (#PCDATA)>
+              <!-- use MAX if available, or assume it's 100 when UNIT is not set -->
+              <!ELEMENT MAX (#PCDATA)>
 
         <!-- netinventory module version(string) -->
         <!ELEMENT MODULEVERSION (#PCDATA)>