Skip to content

Commit c2531a8

Browse files
authored
Merge pull request #1025 from sonninnos/commodore-updates
Commodore updates
2 parents e3032dd + 3f31106 commit c2531a8

File tree

2 files changed

+42
-37
lines changed

2 files changed

+42
-37
lines changed

docs/library/puae.md

+26-17
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ The virtual keyboard has these additional actions:
321321
- `CROP` = Toggle crop mode
322322
- `SVDS` = Create/Insert & remove save disk
323323

324-
- Reset (Red key with undo icon, soft reset = Ctrl-Amiga-Amiga)
324+
- Reset (long press = soft reset, shifted = WHDLoad QuitKey)
325325
- Mouse controls (Left+right button, up, down, left, right)
326326
- Numpad key (Toggles numbers, arrows, Return etc. to numpad variants)
327327

@@ -646,7 +646,8 @@ Settings with (Restart) means that core has to be closed for the new setting to
646646

647647
- **WHDLoad NoWriteCache** [puae_use_whdload_nowritecache] (**disabled**|enabled)
648648

649-
Write save data immediately or on WHDLoad quit. Write cache enabled runs the core a few frames after frontend quit in order to trigger WHDLoad quit and flush the cache. Core restart required.
649+
Write cache requires running the core a few frames after closing content to trigger WHDLoad quit and flush cache to disk.
650+
QuitKey = '$2b' = '#' = 'LCtrl + Backslash'. Core restart required.
650651

651652
- **Global Boot HD** [puae_use_boot_hd] (**disabled**|files|hdf20|hdf40|hdf80|hdf128|hdf256|hdf512)
652653

@@ -676,23 +677,27 @@ Settings with (Restart) means that core has to be closed for the new setting to
676677
- 'PAL': 50Hz - 288px / 576px
677678
- 'NTSC': 60Hz - 240px / 480px
678679

679-
- **Pixel Aspect Ratio** [puae_video_aspect] (**auto**|PAL|NTSC)
680+
- **Pixel Aspect Ratio** [puae_video_aspect] (**auto**|PAL|NTSC|1:1)
680681

681682
Hotkey toggling disables this option until core restart.
682683

683-
- 'PAL': 1/1 = 1.000
684-
- 'NTSC': 44/52 = 0.846
684+
- 'PAL': 26/25 = 1.04
685+
- 'NTSC': 43/50 = 0.86
685686

686-
- **Resolution** [puae_video_resolution] (**auto**|lores|hires|superhires)
687+
- **Resolution** [puae_video_resolution] (**auto**|auto-lores|auto-superhires|lores|hires|superhires)
687688

688-
'Automatic' defaults to 'High' and switches to 'Super-High' when needed.
689+
'Automatic' uses 'High' at minimum.
690+
'Automatic (Low)' allows 'Low'.
691+
'Automatic (Super-High)' sets max size already at startup.
689692

690-
| Value | Label |
691-
|------------|-------------------|
692-
| auto | Automatic |
693-
| lores | Low 360px |
694-
| hires | High 720px |
695-
| superhires | Super-High 1440px |
693+
| Value | Label |
694+
|-----------------|------------------------|
695+
| auto | Automatic |
696+
| auto-lores | Automatic (Low) |
697+
| auto-superhires | Automatic (Super-High) |
698+
| lores | Low 360px |
699+
| hires | High 720px |
700+
| superhires | Super-High 1440px |
696701

697702
- **Line Mode** [puae_video_vresolution] (**auto**|single|double)
698703

@@ -822,13 +827,17 @@ Settings with (Restart) means that core has to be closed for the new setting to
822827

823828
Required distance from stick center to register input.
824829

825-
- **Analog Stick Mouse Speed** [puae_analogmouse_speed] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
830+
- **Left Analog Stick Mouse Speed** [puae_analogmouse_speed] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
826831

827-
Mouse movement speed multiplier for analog stick.
832+
Mouse speed for left analog stick.
828833

829-
- **D-Pad Mouse Speed** [puae_dpadmouse_speed] (1|2|3|4|5|**6**|7|8|9|10|11|12|13|14|15|16|17|18)
834+
- **Right Analog Stick Mouse Speed** [puae_analogmouse_speed_right] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
830835

831-
Mouse movement speed multiplier for directional pad.
836+
Mouse speed for right analog stick.
837+
838+
- **D-Pad Mouse Speed** [puae_dpadmouse_speed] (0|1|2|3|4|5|**6**|7|8|9|10|11|12|13|14|15|16|17|18)
839+
840+
Mouse speed for directional pad.
832841

833842
- **Mouse Speed** [puae_mouse_speed] (10|20|30|40|50|60|70|80|90|**100**|110|120|130|140|150|160|170|180|190|200|210|220|230|240|250|260|270|280|290|300)
834843

docs/library/vice.md

+16-20
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
577577

578578
##### VIC-II (C64, C128, CBM-II 5x0)
579579

580-
- **VIC-II Filter** [vice_vicii_filter] (**disabled**|enabled|enabled_medblur|enabled_lowblur|enabled_noblur)
580+
- **VIC-II Filter** [vice_vicii_filter] (**disabled**|enabled_noblur|enabled_lowblur|enabled_medblur|enabled)
581581

582582
PAL emulation filter with custom horizontal blur.
583583

@@ -589,7 +589,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
589589

590590
PAL emulation filter oddline phase. Applies with 'Internal' palette only!
591591

592-
- **VIC-II Color Palette** [vice_external_palette] (default|**colodore**|pepto-pal|pepto-ntsc|pepto-ntsc-sony|cjam|c64hq|c64s|ccs64|community-colors|deekay|frodo|godot|pc64|ptoing|rgb|vice)
592+
- **VIC-II Color Palette** [vice_external_palette] (**default**|c64hq|c64s|ccs64|cjam|colodore|community-colors|deekay|frodo|godot|lemon64|palette|palette_6569R1_v1r|palette_6569R5_v1r|palette_8565R2_v1r|palette_C64_amber|palette_C64_cyan|palette_C64_green|pc64|pepto-pal|pepto-palold|pepto-ntsc|pepto-ntsc-sony|pixcen|ptoing|rgb|the64|vice)
593593

594594
'Colodore' is recommended for the most accurate colors.
595595

@@ -615,7 +615,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
615615

616616
##### VIC (VIC-20)
617617

618-
- **VIC Filter** [vice_vic_filter] (**disabled**|enabled|enabled_medblur|enabled_lowblur|enabled_noblur)
618+
- **VIC Filter** [vice_vic_filter] (**disabled**|enabled_noblur|enabled_lowblur|enabled_medblur|enabled)
619619

620620
PAL emulation filter with custom horizontal blur.
621621

@@ -627,7 +627,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
627627

628628
PAL emulation filter oddline phase. Applies with 'Internal' palette only!
629629

630-
- **VIC Color Palette** [vice_vic20_external_palette] (default|**colodore_vic**|mike-pal|mike-ntsc|vice)
630+
- **VIC Color Palette** [vice_vic20_external_palette] (**default**|colodore_vic|mike-pal|mike-ntsc|palette|vice)
631631

632632
'Colodore' is recommended for the most accurate colors.
633633

@@ -653,7 +653,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
653653

654654
##### TED (PLUS/4)
655655

656-
- **TED Filter** [vice_ted_filter] (**disabled**|enabled|enabled_medblur|enabled_lowblur|enabled_noblur)
656+
- **TED Filter** [vice_ted_filter] (**disabled**|enabled_noblur|enabled_lowblur|enabled_medblur|enabled)
657657

658658
PAL emulation filter with custom horizontal blur.
659659

@@ -665,7 +665,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
665665

666666
PAL emulation filter oddline phase. Applies with 'Internal' palette only!
667667

668-
- **TED Color Palette** [vice_plus4_external_palette] (default|**colodore_ted**|yape-pal|yape-ntsc)
668+
- **TED Color Palette** [vice_plus4_external_palette] (**default**|colodore_ted|ITU-R_BT601_CRT|ITU-R_BT709_HDTV|ITU-R_BT2020|yape-pal|yape-ntsc)
669669

670670
'Colodore' is recommended for the most accurate colors.
671671

@@ -691,18 +691,10 @@ Settings with (Restart) means that core has to be closed for the new setting to
691691

692692
##### CRTC (CBM-II, PET)
693693

694-
- **CRTC Filter** [vice_crtc_filter] (**disabled**|enabled|enabled_medblur|enabled_lowblur|enabled_noblur)
694+
- **CRTC Filter** [vice_crtc_filter] (**disabled**|enabled_noblur|enabled_lowblur|enabled_medblur|enabled)
695695

696696
PAL emulation filter with custom horizontal blur.
697697

698-
- **CRTC Filter Oddline Offset** [vice_crtc_filter_oddline_offset] (**1000**|20-2000)
699-
700-
PAL emulation filter oddline offset.
701-
702-
- **CRTC Filter Oddline Phase** [vice_crtc_filter_oddline_phase] (**1000**|20-2000)
703-
704-
PAL emulation filter oddline phase. Applies with 'Internal' palette only!
705-
706698
- **CRTC Color Palette** [vice_cbm2_external_palette] (**default**|green|amber|white)
707699

708700
- **CRTC Color Palette** [vice_pet_external_palette] (**default**|green|amber|white)
@@ -787,7 +779,7 @@ Settings with (Restart) means that core has to be closed for the new setting to
787779

788780
Filter bias for 6581, which can be used to adjust DAC bias in millivolts.
789781

790-
- **ReSID Filter 8580 Bias** [vice_resid_8580filterbias] (-5000|-4500|-4000|-3500|-3000|-2500|-2000|-1500|-1000|-500|0|500|1000|**1500**|2000|2500|3000|3500|4000|4500|5000)
782+
- **ReSID Filter 8580 Bias** [vice_resid_8580filterbias] (-5000|-4500|-4000|-3500|-3000|-2500|-2000|-1500|-1000|-500|**0**|500|1000|1500|2000|2500|3000|3500|4000|4500|5000)
791783

792784
Filter bias for 8580, which can be used to adjust DAC bias in millivolts.
793785

@@ -810,13 +802,17 @@ Settings with (Restart) means that core has to be closed for the new setting to
810802

811803
Required distance from stick center to register input.
812804

813-
- **Analog Stick Mouse Speed** [vice_analogmouse_speed] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
805+
- **Left Analog Stick Mouse Speed** [vice_analogmouse_speed] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
806+
807+
Mouse speed for left analog stick.
808+
809+
- **Right Analog Stick Mouse Speed** [vice_analogmouse_speed_right] (0.1|0.2|0.3|0.4|0.5|0.6|0.7|0.8|0.9|**1.0**|1.1|1.2|1.3|1.4|1.5|1.6|1.7|1.8|1.9|2.0|2.1|2.2|2.3|2.4|2.5|2.6|2.7|2.8|2.9|3.0)
814810

815-
Mouse movement speed multiplier for analog stick.
811+
Mouse speed for right analog stick.
816812

817-
- **D-Pad Mouse Speed** [vice_dpadmouse_speed] (1|2|3|4|5|**6**|7|8|9|10|11|12|13|14|15|16|17|18)
813+
- **D-Pad Mouse Speed** [vice_dpadmouse_speed] (0|1|2|3|4|5|**6**|7|8|9|10|11|12|13|14|15|16|17|18)
818814

819-
Mouse movement speed multiplier for directional pad.
815+
Mouse speed for directional pad.
820816

821817
- **Mouse Speed** [vice_mouse_speed] (10|20|30|40|50|60|70|80|90|**100**|110|120|130|140|150|160|170|180|190|200|210|220|230|240|250|260|270|280|290|300)
822818

0 commit comments

Comments
 (0)