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

src/rgb_to_hdmi.c

@@ -1018,7 +1018,7 @@ int *diff_N_frames_by_sample(capture_info_t *capinfo, int n, int mode7, int elk)
          int line = (capinfo->sizex2 & 1) ? (y >> 1) : y;
          // As v_offset increases, e.g. by one, the screen image moves up one capture line
          // (the hardcoded constant of 20 relates to the BBC video format)
-         line += (capinfo->v_offset - 20);
+         line += (capinfo->v_offset - 21);
          // Skip lines that might contain flashing cursor
          // (the cursor rows were determined empirically)
          if (line >= 0) {

src/scripts/Profiles/Atom_CPLD.txt

@@ -1,3 +1,3 @@
-sampling=2,2,2,2,2,2,2,0,6,5,0
-geometry=76,11,608,240,608,480,1,8,7159090,456,0,262,4,0
+sampling=1,1,1
+geometry=40,11,304,240,608,480,0,8,7159090,456,0,262,4,0
 palette=14