Skip to content

Commit

Permalink
Merge remote-tracking branch 'ian/dev' into dev
Browse files Browse the repository at this point in the history 
Change-Id: I972199167643ed79e9162c40e421c1184f60000f
  • Loading branch information
@hoglet67
hoglet67 committed Nov 26, 2020
2 parents 6ebc151 + fa66f58 commit 2d102ae
Show file tree
Hide file tree
Showing 195 changed files with 570 additions and 485 deletions.
563 changes: 303 additions & 260 deletions src/cpld_rgb.c
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion src/cpld_simple.c
View file
Expand Up @@ -12,6 +12,7 @@ typedef struct {
int sp_offset[NUM_OFFSETS];
int half_px_delay; // 0 = off, 1 = on, all modes
int divider; // cpld divider, 6 or 8
int range;
int full_px_delay; // 0..15
int filter_l;
int sub_c;
Expand Down Expand Up @@ -49,6 +50,7 @@ enum {
F_OFFSET,
HALF,
DIVIDER,
RANGE,
DELAY,
FILTER_L,
SUB_C,
Expand Down Expand Up @@ -134,7 +136,8 @@ static param_t params[] = {
{ E_OFFSET, "E Phase", "e_offset", 0, 0, 1 },
{ F_OFFSET, "F Phase", "f_offset", 0, 0, 1 },
{ HALF, "Half Pixel Shift", "half", 0, 1, 1 },
{ DIVIDER, "Clock Multiplier", "divider", 0, 3, 1 },
{ DIVIDER, "Clock Multiplier", "multiplier", 0, 7, 1 },
{ RANGE, "Multiplier Range", "range", 0, 1, 1 },
{ DELAY, "Pixel H Offset", "delay", 0, 15, 1 },
//block of hidden YUV options for file compatibility
{ FILTER_L, "Filter Y", "l_filter", 0, 1, 1 },
Expand Down
6 changes: 5 additions & 1 deletion src/cpld_yuv.c
View file
Expand Up @@ -29,6 +29,7 @@ typedef struct {
int sp_offset[NUM_OFFSETS];
int half_px_delay; // 0 = off, 1 = on, all modes
int divider; // cpld divider, 6 or 8
int range; // divider ranging
int delay;
int filter_l;
int sub_c;
Expand Down Expand Up @@ -105,6 +106,7 @@ enum {
F_OFFSET,
HALF,
DIVIDER,
RANGE,
DELAY,
FILTER_L,
SUB_C,
Expand Down Expand Up @@ -200,7 +202,8 @@ static param_t params[] = {
{ E_OFFSET, "E Phase", "e_offset", 0, 0, 1 },
{ F_OFFSET, "F Phase", "f_offset", 0, 0, 1 },
{ HALF, "Half Pixel Shift", "half", 0, 1, 1 },
{ DIVIDER, "Clock Multiplier", "divider", 6, 8, 2 },
{ DIVIDER, "Clock Multiplier", "multiplier", 6, 8, 2 },
{ RANGE, "Multiplier Range", "range", 0, 1, 1 },
//end of hidden block
{ DELAY, "Pixel H Offset", "delay", 0, 15, 1 },
{ FILTER_L, "Filter Y", "l_filter", 0, 1, 1 },
Expand Down Expand Up @@ -525,6 +528,7 @@ static void cpld_init(int version) {
params[F_OFFSET].hidden = 1;
params[HALF].hidden = 1;
params[DIVIDER].hidden = 1;
params[RANGE].hidden = 1;
cpld_version = version;
config->all_offsets = 0;
config->sp_offset[0] = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/defs.h
View file
Expand Up @@ -263,7 +263,7 @@ typedef struct {
#define FORCE_UPDATE_FILE_MESSAGE "Deleting this file will force a CPLD update check on the next reset\r\n"
#define BLANK_FILE "/cpld_firmware/recovery/blank/BLANK.xsvf"

#define BBC_VERSION 0x78
#define BBC_VERSION 0x79
#define RGB_VERSION 0x92
#define YUV_VERSION 0x90

Expand Down
12 changes: 6 additions & 6 deletions src/osd.c
View file
Expand Up @@ -2167,8 +2167,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, black_ref, 2000, 2000, &r, &g, &b, &m); break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); break; // white (buff)
Expand Down Expand Up @@ -2217,8 +2217,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 720, 2000, 2000, &r, &g, &b, &m); break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); break; // white (buff)
Expand Down Expand Up @@ -2267,8 +2267,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 720, 2000, 2000, &r, &g, &b, &m); r = 9; g = 9; b = 9; break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); r = 255; g = 255; b = 255; break; // white (buff)
Expand Down Expand Up @@ -2317,8 +2317,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, black_ref, 2000, 2000, &r, &g, &b, &m); r=0x00; g=0x00; b=0x00; break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); r=0xff; g=0xff; b=0xff; break; // white (buff)
Expand Down Expand Up @@ -2367,8 +2367,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, black_ref, 2000, 2000, &r, &g, &b, &m); r=0x00; g=0x00; b=0x00; break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); r=0xff; g=0xff; b=0xff; break; // white (buff)
Expand Down Expand Up @@ -2417,8 +2417,8 @@ void generate_palettes() {
case (bz + rz): {
switch (luma) {
case 0x00:
case 0x10: //alt
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 720, 2000, 2000, &r, &g, &b, &m); r=0x00; g=0x00; b=0x00; break; // black
case 0x10: //alt
case 0x02: //alt
case 0x12:
yuv2rgb(maxdesat, mindesat, luma_scale, black_ref, 420, 2000, 2000, &r, &g, &b, &m); r=0xff; g=0xff; b=0xff; break; // white (buff)
Expand Down
7 changes: 4 additions & 3 deletions src/rgb_to_hdmi.c
View file
Expand Up @@ -741,7 +741,7 @@ void set_pll_frequency(double f, int pll_ctrl, int pll_fract) {
}


static int calibrate_sampling_clock(int profile_changed) {
int calibrate_sampling_clock(int profile_changed) {
int a = 13;

// Default values for the Beeb
Expand Down Expand Up @@ -1975,7 +1975,7 @@ signed int analyze_mode7_alignment(capture_info_t *capinfo) {
if (capinfo->video_type != VIDEO_TELETEXT) {
return -1;
}

log_info("Testing mode 7 alignment");
// mode 7 character is 12 pixels wide
int counts[MODE7_CHAR_WIDTH];
// bit offset pixels 0..7
Expand Down Expand Up @@ -2059,6 +2059,7 @@ signed int analyze_default_alignment(capture_info_t *capinfo) {
if (autoswitch != AUTOSWITCH_MODE7) {
return -1;
}
log_info("Testing default alignment");
// mode 0 character is 8 pixels wide
int counts[DEFAULT_CHAR_WIDTH];
// bit offset pixels 0..7
Expand Down Expand Up @@ -2344,7 +2345,7 @@ void set_scaling(int mode, int reboot) {
||( video_type != VIDEO_TELETEXT && get_normalscaling() == SCALING_UNEVEN && get_haspect() == 3 && (get_vaspect() == 2 || get_vaspect() == 4))) {
width = width * 4 / 3;
}
if (width > 340 && h_size43 < 1440 && (h_size43 % width) > (width / 3)) {
if ((width > 340 && h_size43 < 1440 && (h_size43 % width) > (width / 3)) || (autoswitch == AUTOSWITCH_MODE7 && v_size == 1024)) {
gscaling = GSCALING_MANUAL43;
filtering = FILTERING_SOFT;
set_auto_name("Auto (Interp. 4:3 / Soft)");
Expand Down
2 changes: 1 addition & 1 deletion src/rgb_to_hdmi.h
View file
Expand Up @@ -73,7 +73,7 @@ void set_helper_flag();
int eight_bit_detected();
int new_DAC_detected();
int extra_flags();

int calibrate_sampling_clock(int profile_changed);

// Reboot the system immediately
void reboot();
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Acorn_Atom_TTL.txt
View file
@@ -1,2 +1,2 @@
sampling=1,1,1,1,1,1,1,0,1,2,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=1,1,1,1,1,1,1,0,1,0,2,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=80,28,272,208,320,240,1,1,3,0,7159090,456,5000,262,4,0,0
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/Acorn_Electron.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=184,27,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Acorn_Teletext.txt
View file
@@ -1,2 +1,2 @@
sampling=1,1,2,2,2,2,2,1,8,8,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=2,2,2,2,2,2,2,1,1,0,8,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=156,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Amiga/Amiga_50Hz.txt
View file
@@ -1,3 +1,3 @@
sampling=1,1,1,1,1,1,1,0,0,5,0,0,0,0,0,0,5,1,0,55,20,55,20,25,255,255,255
sampling=1,1,1,1,1,1,1,0,0,0,5,0,0,0,0,0,0,5,1,0,55,20,55,20,25,255,255,255
geometry=136,35,640,256,720,280,1,2,0,2,14187580,908,5000,313,4,1,1
palette=RrGgBb_(EGA)
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Amiga/Amiga_60Hz.txt
View file
@@ -1,3 +1,3 @@
sampling=1,1,1,1,1,1,1,0,0,2,0,0,0,0,0,0,5,1,0,55,20,55,20,25,127,127,127
sampling=1,1,1,1,1,1,1,0,0,0,2,0,0,0,0,0,0,5,1,0,55,20,55,20,25,127,127,127
geometry=136,35,640,200,712,224,1,2,0,2,14187580,910,5000,263,4,1,1
palette=RrGgBb_(EGA)
6 changes: 0 additions & 6 deletions src/scripts/Profiles/3-12_BIT_BBC/BBC_24Mhz_Mode_7.txt
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/BBC_Master.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/BBC_Micro.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,1,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,1,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=144,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/BBC_NuLA_12bpp_Mode7.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
sampling7=10,10,10,10,10,10,10,0,3,1,4,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,2,12000000,768,5000,312,4,0,1
sampling=6,6,6,6,6,6,6,0,1,2,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
sampling=5,5,5,5,5,5,5,0,0,0,2,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,0,2,16000000,1024,5000,312,4,0,0
auto_switch=2
normal_scaling=1
Expand Down
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/BBC_NuLA_3bpp_Mode7.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=6,6,6,6,6,6,6,0,1,2,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
sampling=6,6,6,6,6,6,6,0,0,0,2,0,0,0,0,0,0,5,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,0,2,16000000,1024,5000,312,4,0,0
auto_switch=2
overclock_core=100
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Camputers_Lynx.txt
View file
@@ -1,2 +1,2 @@
sampling=5,5,5,5,5,5,5,0,1,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=5,5,5,5,5,5,5,0,1,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=60,25,256,252,280,286,3,2,3,0,6000000,384,5000,312,4,0,0
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Black.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=128
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Blue.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=132
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Cyan.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=134
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Green.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=130
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Magenta.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=133
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Red.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=129
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/White.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=135
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Colour Test/Yellow.txt
View file
@@ -1,3 +1,3 @@
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=160,21,672,270,672,270,1,2,1,1,16000000,1024,5000,312,4,0,0
border_colour=131
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Communicator.txt
View file
@@ -1,2 +1,2 @@
sampling=2,2,2,2,2,2,2,0,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=2,2,2,2,2,2,2,0,0,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=184,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Communicator_Mode7.txt
View file
@@ -1,2 +1,2 @@
sampling=0,0,0,0,0,0,0,0,1,12,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=0,0,0,0,0,0,0,0,1,0,12,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=144,32,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,0
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Custom.txt
View file
@@ -1,2 +1,2 @@
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/Default.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,12,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,12,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=136,26,520,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=0
palette=RGB
Expand Down
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Oric.txt
View file
@@ -1,3 +1,3 @@
sampling=0,0,0,0,0,0,0,0,1,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=0,0,0,0,0,0,0,0,1,0,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=64,58,240,216,280,280,3,2,3,0,6000000,384,5000,312,4,0,0
progressive_scaling=1
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC/RML_480Z.txt
View file
@@ -1,2 +1,2 @@
sampling=0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=140,21,672,276,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
sampling=0,0,0,0,0,0,0,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=156,41,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC/Sinclair_QL.txt
View file
@@ -1,2 +1,2 @@
sampling=0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=0,0,0,0,0,0,0,0,0,0,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=60,32,512,256,520,288,3,4,1,1,10000000,640,5000,312,4,0,0
3 changes: 0 additions & 3 deletions src/scripts/Profiles/3-12_BIT_BBC/ZX80.txt
View file

This file was deleted.

1 change: 1 addition & 0 deletions src/scripts/Profiles/3-12_BIT_BBC/ZX80/Default.txt
View file
@@ -0,0 +1 @@
auto_switch=1
3 changes: 3 additions & 0 deletions src/scripts/Profiles/3-12_BIT_BBC/ZX80/ZX80_50Hz.txt
View file
@@ -0,0 +1,3 @@
sampling=1,1,1,1,1,1,1,0,0,0,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=64,47,272,208,344,288,1,1,3,0,6500000,414,50000,310,4,3,0
palette=Mono_(2_level)
3 changes: 3 additions & 0 deletions src/scripts/Profiles/3-12_BIT_BBC/ZX80/ZX80_60Hz.txt
View file
@@ -0,0 +1,3 @@
sampling=1,1,1,1,1,1,1,0,0,0,6,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=64,23,272,208,344,252,1,1,3,0,6500000,414,50000,262,4,3,0
palette=Mono_(2_level)
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC_Analog/Acorn_Electron.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=184,27,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC_Analog/Acorn_Teletext.txt
View file
@@ -1,2 +1,2 @@
sampling=1,1,2,2,2,2,2,1,8,8,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=2,2,2,2,2,2,2,1,1,0,8,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=156,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC_Analog/Amstrad_CPC.txt
View file
@@ -1,3 +1,3 @@
sampling=3,3,3,3,3,3,3,0,1,6,0,0,0,0,0,0,1,1,0,55,20,55,20,45,255,255,255
sampling=3,3,3,3,3,3,3,0,1,0,6,0,0,0,0,0,0,1,1,0,55,20,55,20,45,255,255,255
geometry=204,65,640,200,768,286,1,2,1,1,16000000,1024,5000,312,4,0,0
palette=RGBrgb_(Amstrad)
6 changes: 0 additions & 6 deletions src/scripts/Profiles/3-12_BIT_BBC_Analog/BBC_24Mhz_Mode_7.txt
View file

This file was deleted.

4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC_Analog/BBC_Master.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,4,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=148,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
4 changes: 2 additions & 2 deletions src/scripts/Profiles/3-12_BIT_BBC_Analog/BBC_Micro.txt
View file
@@ -1,6 +1,6 @@
sampling7=6,6,6,6,6,6,6,0,1,1,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling7=6,6,6,6,6,6,6,0,1,0,1,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry7=144,26,480,256,576,288,3,4,1,0,12000000,768,5000,312,4,0,2
sampling=4,4,4,4,4,4,4,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
sampling=4,4,4,4,4,4,4,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,0,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0
auto_switch=2
palette_control=1
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC_Analog/Camputers_Lynx.txt
View file
@@ -1,2 +1,2 @@
sampling=5,5,5,5,5,5,5,0,1,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=5,5,5,5,5,5,5,0,1,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=60,25,256,252,280,286,3,2,3,0,6000000,384,5000,312,4,0,0
2 changes: 1 addition & 1 deletion src/scripts/Profiles/3-12_BIT_BBC_Analog/Custom.txt
View file
@@ -1,2 +1,2 @@
sampling=3,3,3,3,3,3,3,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
sampling=3,3,3,3,3,3,3,0,0,0,5,0,0,0,0,0,0,0,0,0,100,255,100,255,100,255,255,255
geometry=176,29,640,256,768,288,1,2,1,1,16000000,1024,5000,312,4,0,0

0 comments on commit 2d102ae

Please sign in to comment.