From 6a8adf882d51e2ed8f4a2d12981216e68f0a7e6c Mon Sep 17 00:00:00 2001
From: Harold Gray <66528859+haroldthegray@users.noreply.github.com>
Date: Tue, 28 Jun 2022 10:16:14 -0400
Subject: [PATCH] Add GSM770X monitor and cleanup GSM7706 (#208)

* Add GSM770X monitor and cleanup GSM7706

* cleaned up caps

* easter egg aspect ratio

* return language address to not break things

Co-authored-by: Harold Gray <hcode@isGray.net>
---
 db/monitor/GSM7706.xml |  70 +----------------------
 db/monitor/GSM7707.xml |   4 ++
 db/monitor/GSM770X.xml | 122 +++++++++++++++++++++++++++++++++++++++++
 db/options.xml.in      |  38 ++++++++-----
 4 files changed, 152 insertions(+), 82 deletions(-)
 create mode 100644 db/monitor/GSM7707.xml
 create mode 100644 db/monitor/GSM770X.xml

diff --git a/db/monitor/GSM7706.xml b/db/monitor/GSM7706.xml
index 045738e..73ea1c3 100644
--- a/db/monitor/GSM7706.xml
+++ b/db/monitor/GSM7706.xml
@@ -1,70 +1,4 @@
 <?xml version="1.0"?>
-<monitor name="LG 32UL950-W" init="standard">
-    <caps add="(prot(monitor)type(lcd)model(UL950)cmds(01 02 03 0C E3 F3)vcp(02 04 05 08 10 12 14(05 08 0B ) 16 18 1A 52 60(11 0F ) AC AE B2 B6 C0 C6 C8 C9 D6(01 04) DF 62 8D F4 F5(01 02 03 04) F6(00 01 02) 4D 4E 4F 15(01 06 11 13 14 15 18 19 20 22 23 24 28 29 32 48) F7(00 01 02 03) F8(00 01) F9 E4 E5 E6 E7 E8 E9 EA EB EF FA(00 01) FD(00 01) FE(00 01 02) FF)mccs_ver(2.1)mswhql(1))" />
-    <controls>
-        <!-- Control 0x02: +/2/2 C [New Control Value - Some values changed] -->
-        <control id="newcontrolvalue" address="0x02"/>
-        <!-- Control 0x04: +/0/255 C [Restore Factory Defaults] -->
-        <control id="defaults" address="0x04" delay="2000"/>
-        <!-- Control 0x05: +/0/1 C [Restore Brightness and Contrast] -->
-        <control id="defaultluma" address="0x05" delay="2000"/>
-        <!-- Control 0x06: +/0/255   [???] -->
-        <control id="defaultgeom" address="0x06" delay="2000"/>
-        <!-- Control 0x08: +/0/255 C [Restore Factory Default Color] -->
-        <control id="defaultcolor" address="0x08" delay="2000"/>
-        <!-- Control 0x10: +/28/100 C [Brightness] -->
-        <control id="brightness" address="0x10"/>
-        <!-- Control 0x12: +/60/100 C [Contrast] -->
-		<control id="contrast" address="0x12"/>
-        <!-- Control 0x87: +/60/100   [Sharpness] -->
-        <control id="sharpness" address="0x87"/>
-        <!-- Control 0x14: +/5/11 C [???] -->
-		<control id="colorpreset" address="0x14">
-			<value id="user" value="0x0B"/>
-			<value id="6500k" value="0x05"/>
-			<value id="9300k" value="0x08"/>
-		</control>
-        <!-- Control 0x0c: +/50/100 C [Color temperature request] ? -->
-        <control id="colortemp" address="0x0c"/>
-        <!-- Control 0x16: +/50/100 C [Red maximum level] -->
-		<control id="red" address="0x16"/>
-        <!-- Control 0x18: +/50/100 C [Green maximum level] -->
-		<control id="green" address="0x18"/>
-        <!-- Control 0x1a: +/39/100 C [Blue maximum level] -->
-		<control id="blue" address="0x1a"/>
-        <!-- Control 0x62: +/77/100 C [Audio Speaker Volume Adjust] -->
-        <control id="audiospeakervolume" address="0x62"/>
-        <!-- Control: 0x8d [Audio Mute] -->
-        <control id="audiospeakermute" address="0x8d">
-			<value id="mute" value="1"/>
-			<value id="unmute" value="2"/>
-		</control>
-        <!-- Control 0xd6: +/1/5 C [DPMS Control - On] -->
-		<control id="dpms" address="0xd6">
-			<value id="on" value="1"/>
-			<value id="standby" value="5"/>
-		</control>
-        <!-- Control 0xf7: +/2/255 C [Response time] -->
-        <control id="responsetime" address="0xF7">
-            <value id="off" value="0"/>
-            <value id="high" value="1"/>
-            <value id="middle" value="2"/>
-            <value id="low" value="3"/>
-        </control>
-        <!-- Control 0xf8: +/0/255 C [Free Sync] -->
-        <control id="freesync" address="0xF8">
-            <value id="off" value="0"/>
-            <value id="base" value="2"/>
-            <value id="extended" value="3"/>
-        </control>
-        <!-- Control 0xf9: +/0/255 C [Black Stabilization] - Cannot write ? -->
-        <control id="blackstabilization" address="0xf9" />
-        <!-- Control 0xfe: +/2/255 C [Gamma]  - Cannot write ? -->
-        <control id="gammamode" address="0xfe" >
-			<value id="mode1" value="2" />
-			<value id="mode2" value="3" />
-			<value id="mode3" value="4" />
-			<value id="mode4" value="16" />
-		</control>
-    </controls>
+<monitor name="LG GSM770 HDMI" init="standard">
+	<include file="GSM770X"/>
 </monitor>
diff --git a/db/monitor/GSM7707.xml b/db/monitor/GSM7707.xml
new file mode 100644
index 0000000..388b163
--- /dev/null
+++ b/db/monitor/GSM7707.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<monitor name="LG GSM770 Display Port" init="standard">
+	<include file="GSM770X"/>
+</monitor>
\ No newline at end of file
diff --git a/db/monitor/GSM770X.xml b/db/monitor/GSM770X.xml
new file mode 100644
index 0000000..93c5150
--- /dev/null
+++ b/db/monitor/GSM770X.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<monitor name="LG GSM770 Monitor" init="standard">
+  <!-- Some of the data is READ ONLY and some of it is not rendered correctly by DDC, so it has been commented out. -->
+  <!-- ... like when the max of a value is 100 but the device returns max of 255, so the percentage is wrong. -->
+	<caps add="(prot(monitor)type(lcd)model(UL950)cmds(01 02 03 0C E3 F3)vcp(02 04 05 08 10 12 14(05 08 0B) 15(0B 31 27 01 30 0F 19 1E 1F 16 17) 16 18 1A 62 87 8D(01 02) CC D6(01 04) EB F5(01 02) F6(00 01 02) F7(00 01 02 03) F8(00 02 03) FE(02 03 04 10))mccs_ver(2.1)mswhql(1))"/>
+	<controls>
+		<!-- Control 0x02: +/2/2 C [New Control Value - Some values changed] -->
+		<!-- <control id="newcontrolvalue" address="0x02"/> -->
+		<!-- Control 0x04: +/0/255 C [Restore Factory Defaults] -->
+		<control id="defaults" address="0x04" delay="2000"/>
+		<!-- Control 0x05: +/0/1 C [Restore Brightness and Contrast] -->
+		<control id="defaultluma" address="0x05" delay="2000"/>
+		<!-- Control 0x08: +/0/255 C [Restore Factory Default Color] -->
+		<control id="defaultcolor" address="0x08" delay="2000"/>
+		<!-- Control 0x0c: +/35/100   [???] -->
+		<!-- <control id="colortemp" address="0x0C"/> -->
+		<!-- Control 0x10: +/40/100 C [Brightness] -->
+		<control id="brightness" address="0x10"/>
+		<!-- Control 0x12: +/70/100 C [Contrast] -->
+		<control id="contrast" address="0x12"/>
+		<!-- Control 0x14: +/11/11 C [Color Temperature] -->
+		<control id="colorpreset" address="0x14">
+			<value id="6500k" value="0x05"/>
+			<!-- <value id="7500k" value=""/> Cannot set with DDCC? -->
+			<value id="9300k" value="0x08"/>
+			<value id="user" value="0x0B"/>
+		</control>
+		<!-- Control 0x15: +/11/255 C [LG Picture] -->
+		<control id="lgmode" address="0x15">
+			<value id="custom" value="0x0B"/>
+			<value id="vivid" value="0x31"/>
+			<value id="hdreffect" value="0x27"/>
+			<value id="reader" value="0x01"/>
+			<value id="cinema" value="0x30"/>
+			<value id="srgb" value="0x0F"/>
+			<value id="dcip3" value="0x19"/>
+			<value id="fps" value="0x1E"/>
+			<value id="rts" value="0x1F"/>
+			<value id="ebu" value="0x16"/>
+			<value id="rec709" value="0x17"/>
+		</control>
+		<!-- Control 0x16: +/50/100 C [Red maximum level] -->
+		<control id="red" address="0x16"/>
+		<!-- Control 0x18: +/50/100 C [Green maximum level] -->
+		<control id="green" address="0x18"/>
+		<!-- Control 0x1a: +/50/100 C [Blue maximum level] -->
+		<control id="blue" address="0x1A"/>
+		<!-- Control 0x62: +/32/100 C [Audio Speaker Volume Adjust] -->
+		<control id="audiospeakervolume" address="0x62"/>
+		<!-- Control 0x87: +/50/100   [Sharpness] -->
+		<control id="sharpness" address="0x87"/>
+		<!-- Control 0x8d: +/2/100 C [Audio Speaker Mute - Unmute] -->
+		<control id="audiospeakermute" address="0x8D">
+			<value id="mute" value="0x01"/>
+			<value id="unmute" value="0x02"/>
+		</control>
+		<!-- Control 0xcc: +/0/16   [Language] -->
+		<control id="language" name="Language" address="0xCC">
+			<value id="english" value="0x00"/>
+			<value id="german" value="0x01"/>
+			<value id="french" value="0x02"/>
+			<value id="spanish" value="0x03"/>
+			<value id="italian" value="0x04"/>
+			<value id="swedish" value="0x05"/>
+			<value id="finnish" value="0x06"/>
+			<value id="portuguese" value="0x07"/>
+			<value id="brazilian" value="0x08"/>
+			<value id="polish" value="0x09"/>
+			<value id="russian" value="0x0A"/>
+			<value id="czech" value="0x0B"/>
+			<value id="ukrainian" value="0x0C"/>
+			<value id="chinese" value="0x0D"/>
+			<value id="chinese_tw" value="0x0E"/>
+			<value id="japanese" value="0x0F"/>
+			<value id="korean" value="0x10"/>
+		</control>
+		<!-- Control 0xd6: +/1/5 C [DPMS Control - On] -->
+		<control id="power" address="0xD6">
+			<value id="on" value="0x01"/>
+			<value id="off" value="0x05"/>
+		</control>
+		<!-- Control 0xeb: +/0/1   [OSD Lock] -->
+		<control id="osdlock" address="0xEB">
+			<value id="off" value="0x00"/>
+			<value id="on" value="0x01"/>
+		</control>
+		<!-- Control 0xf5: +/1/255 C [Aspect Ratio] READ ONLY -->
+		<!-- Easter Egg... set address 0x60 to value 3/4 gives "off menu" 21:9 aspect ratios -->
+		<control id="ratio" address="0xF5">
+			<value id="wide" name="Full Wide" value="0x01"/>
+			<value id="original" name="Original" value="0x02"/>
+		</control>
+		<!-- Control 0xf6: +/0/255 C [Smart Energy Saving] -->
+		<control id="energysaving" address="0xF6">
+			<value id="off" value="0x00"/>
+			<value id="low" value="0x01"/>
+			<value id="high" value="0x02"/>
+		</control>
+		<!-- Control 0xf7: +/2/255 C [Response time] -->
+		<control id="responsetime" address="0xF7">
+			<value id="off" value="0x00"/>
+			<value id="high" value="0x01"/>
+			<value id="middle" value="0x02"/>
+			<value id="low" value="0x03"/>
+		</control>
+		<!-- Control 0xf8: +/0/255 C [Free Sync] -->
+		<control id="freesync" address="0xF8">
+			<value id="off" value="0x00"/>
+			<value id="base" value="0x02"/>
+			<value id="extended" value="0x03"/>
+		</control>
+		<!-- Control 0xf9: +/50/255 C [Black Stabilization] READ ONLY and scale is incorrect -->
+		<!-- <control id="blackstabilization" address="0xF9" min="0" max="100"/> -->
+		<!-- Control 0xfe: +/3/255 C [Gamma] Read Only -->
+		<control id="gammamode" address="0xFE">
+			<value id="mode1" value="0x02"/>
+			<value id="mode2" value="0x03"/>
+			<value id="mode3" value="0x04"/>
+			<value id="mode4" value="0x10"/>
+		</control>
+	</controls>
+</monitor>
diff --git a/db/options.xml.in b/db/options.xml.in
index cf71f78..5aa9212 100644
--- a/db/options.xml.in
+++ b/db/options.xml.in
@@ -186,6 +186,13 @@
 				<value id="fpsgame2" name="FPS Game 2" value="29"/>
 				<value id="photo" name="Photo" value="32"/>
 				<value id="cinema" name="Cinema" value="48"/>
+				<value id="vivid" name="Vivid"/>
+				<value id="hdreffect" name="HDR Effect"/>
+				<value id="dcip3" name="DCI-P3"/>
+				<value id="fps" name="FPS"/>
+				<value id="rts" name="RTS"/>
+				<value id="ebu" name="EBU"/>
+				<value id="rec709" name="REC709"/>
 			</control>
 		</subgroup>
 		<subgroup name="Gamma" >
@@ -357,6 +364,11 @@
 				<value id="coarsefine" name="Clock and clock phase"/>
 				<value id="posfast" name="H/V Position (fast mode)"/>
 			</control>
+			<control id="ratio" type="list" name="Aspect Ratio" address="0xF5">
+				<value id="1to1" name="1:1" value="0x00"/>
+				<value id="wide" name="Full Wide" value="0x01"/>
+				<value id="original" name="Original" value="0x02"/>
+			</control>
 		</subgroup>
 	</group>
 	<group name="Geometry">
@@ -397,13 +409,6 @@
 				<value id="cannotsupply" name="Display cannot suply orientation" value="0xFF"/>
 			</control>
 		</subgroup>
-	<subgroup name="Ratio">
-			<control id="ratio" type="list" name="Screen ratio" address="0xF5">
-				<value id="1to1" name="1:1" value="0"/>
-				<value id="wide" name="Wide" value="1"/>
-				<value id="original" name="Original" value="2"/>
-			</control>
-		</subgroup>
 	</group>
 	<group name="Screen purity">
 		<subgroup name="Moire" pattern="moire">
@@ -626,7 +631,7 @@
 				<value id="portraitleft" name="Portrait (Left)"/>
 				<value id="portraitright" name="Portrait (Right)"/>
 			</control>
-			<control id="language" type="list" name="Language select" address="0x68">
+			<control id="language" type="list" name="Language" address="0x68">
 				<value id="english"       name="English"/>
 				<value id="french"        name="Français (French)"/>
 				<value id="finnish"       name="Suomi (Finnish)"/>
@@ -647,18 +652,23 @@
 				<value id="portuguese"    name="Português (Portuguese)"/>
 				<value id="serbocroatian" name="SiGC/BiH/CRO (Serbo-Croatian)"/>
 				<value id="hindi"         name="हिन्दी (India)"/>
-				<value id="finnish" name="Suomalainen (Finnish)"/>
-				<value id="turkish" name="Türk (Turkish)"/>
-				<value id="brazilian"    name="Português do Brasil (Brazilian Portuguese)"/>
-				<value id="malay"        name="Bahasa Melayu (Malay)"/>
-				<value id="thai"         name="ภาษาไทย (Thai)"/>
-				<value id="arabic"       name="العربية (Arabic)"/>
+				<value id="finnish"       name="Suomalainen (Finnish)"/>
+				<value id="turkish"       name="Türk (Turkish)"/>
+				<value id="brazilian"     name="Português do Brasil (Brazilian Portuguese)"/>
+				<value id="malay"         name="Bahasa Melayu (Malay)"/>
+				<value id="thai"          name="ภาษาไทย (Thai)"/>
+				<value id="arabic"        name="العربية (Arabic)"/>
+				<value id="ukrainian"     name="українська (Ukrainian)"/>
 			</control>
 			<!-- If "changed", read 0x52 register value to get address of the control changed using OSD menu -->
 			<control id="newcontrolvalue" type="list" name="New Control Value" address="0x02">
 				<value id="nochanges" name="No changes" value="0x01"/>
 				<value id="changed" name="Some values changed" value="0x02"/>
 			</control>
+			<control id="osdlock" type="list" name="OSD Lock">
+				<value id="off" name="Off"/>
+				<value id="on" name="On"/>
+			</control>
 		</subgroup>
 		<subgroup name="Power control">
 			<control id="dpms" type="list" name="DPMS Control" address="0xd6">