Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts: # src/scripts/Profiles/3BIT_RGB/Atom_50HzTTL.txt # src/scripts/Profiles/3BIT_RGB/ZX80.txt # src/scripts/Profiles/3BIT_RGB/ZX80_(TTL).txt # src/scripts/Profiles/6BIT_RGB/Atom_50HzTTL.txt # src/scripts/Profiles/6BIT_RGB/ZX80.txt # src/scripts/Profiles/6BIT_RGB/ZX80_(TTL).txt # src/scripts/Profiles/BBC/ZX80_(TTL).txt # src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v10-v20.txt # src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v21-v23.txt # src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v24.txt # src/scripts/Profiles/RGB(TTL)/ZX80_(TTL).txt
2020-02-11 20:47:39 +00:00 · 2020-02-11 20:47:39 +00:00 · 1f32a8932c
commit 1f32a8932c
--- a/src/scripts/Profiles/3BIT_RGB/Atom.txt
+++ b/src/scripts/Profiles/3BIT_RGB/Atom.txt
@ -0,0 +1,2 @@
+sampling=1,1,1,1,1,1,1,0,8,2,0,1
+geometry=80,28,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0,0
--- a/src/scripts/Profiles/3BIT_RGB/Atom_50HzTTL.txt
+++ b/src/scripts/Profiles/3BIT_RGB/Atom_50HzTTL.txt
@ -1,2 +0,0 @@
-sampling=1,1,1,1,1,1,1,0,6,0,0,0
-geometry=60,37,304,240,304,240,1,1,3,4,7159090,456,5000,312,4,0,0
--- a/src/scripts/Profiles/3BIT_RGB/ZX80_(TTL).txt
+++ b/src/scripts/Profiles/3BIT_RGB/ZX80_(TTL).txt
--- a/src/scripts/Profiles/6BIT_RGB/Atom.txt
+++ b/src/scripts/Profiles/6BIT_RGB/Atom.txt
@ -0,0 +1,2 @@
+sampling=1,1,1,1,1,1,1,0,8,2,0,0
+geometry=80,28,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0
--- a/src/scripts/Profiles/6BIT_RGB/Atom_50HzTTL.txt
+++ b/src/scripts/Profiles/6BIT_RGB/Atom_50HzTTL.txt
@ -1,2 +0,0 @@
-sampling=1,1,1,1,1,1,1,0,6,0,0,0
-geometry=60,37,304,240,304,240,1,1,3,4,7159090,456,5000,312,4,0,0
--- a/src/scripts/Profiles/6BIT_RGB/ZX80_(TTL).txt
+++ b/src/scripts/Profiles/6BIT_RGB/ZX80_(TTL).txt
--- a/src/scripts/Profiles/6BIT_RGB_Analog/UK_101_(TTL).txt
+++ b/src/scripts/Profiles/6BIT_RGB_Analog/UK_101_(TTL).txt
@ -1,2 +0,0 @@
-sampling=0,0,0,0,0,0,0,0,6,0,0,0,18,45,18,255,50,0,0,0
-geometry=56,18,400,270,384,288,1,1,3,8,8000000,512,5000,312,4,3,0
--- a/src/scripts/Profiles/6BIT_RGB_Analog/ZX80_(TTL).txt
+++ b/src/scripts/Profiles/6BIT_RGB_Analog/ZX80_(TTL).txt
@ -1,3 +0,0 @@
-sampling=2,2,2,2,2,2,2,0,6,8,0,0,18,45,18,255,50,0,0,0
-geometry=64,47,272,208,384,288,1,1,3,4,6500000,414,25000,306,4,3,0
-palette=Mono_(2_level)
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v10-v20.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v10-v20.txt
@ -1,2 +0,0 @@
-sampling=1,1,1,1,1,1,1,0,8,0,0,0
-geometry=24,53,272,208,320,240,1,1,1,4,14318181,912,5000,312,4,0,0,3
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v21-v23.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v21-v23.txt
@ -1,2 +0,0 @@
-sampling=1,1,1,1,1,1,1,0,8,0,0,0
-geometry=24,53,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0,0
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v24.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_50HzTTL_v24.txt
@ -1,2 +0,0 @@
-sampling=1,1,1,1,1,1,1,0,8,0,0,0
-geometry=72,53,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0,0
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_v10-v20.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_v10-v20.txt
@ -0,0 +1,2 @@
+sampling=3,3,3,3,3,3,3,0,8,0,0,1
+geometry=24,28,272,208,320,240,1,1,1,4,14318181,912,5000,312,4,0,0,3
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_v21-v23.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_v21-v23.txt
@ -0,0 +1,2 @@
+sampling=3,3,3,3,3,3,3,0,8,3,0,1
+geometry=28,28,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0,0
--- a/src/scripts/Profiles/Legacy_3BIT/Atom_v24-v62.txt
+++ b/src/scripts/Profiles/Legacy_3BIT/Atom_v24-v62.txt
@ -0,0 +1,2 @@
+sampling=1,1,1,1,1,1,1,0,8,2,0,1
+geometry=72,28,272,208,320,240,1,1,3,4,7159090,456,5000,312,4,0,0,0