Skip to content

Commit

Permalink
Merge pull request #1025 from sonninnos/commodore-updates
Browse files Browse the repository at this point in the history 
Commodore updates
  • Loading branch information
@fpscan
fpscan authored Feb 27, 2025
2 parents e3032dd + 3f31106 commit c2531a8
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 37 deletions.
43 changes: 26 additions & 17 deletions docs/library/puae.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ The virtual keyboard has these additional actions:
- `CROP` = Toggle crop mode
- `SVDS` = Create/Insert & remove save disk

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

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

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

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.
Write cache requires running the core a few frames after closing content to trigger WHDLoad quit and flush cache to disk.
QuitKey = '$2b' = '#' = 'LCtrl + Backslash'. Core restart required.

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

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

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

Hotkey toggling disables this option until core restart.

- 'PAL': 1/1 = 1.000
- 'NTSC': 44/52 = 0.846
- 'PAL': 26/25 = 1.04
- 'NTSC': 43/50 = 0.86

- **Resolution** [puae_video_resolution] (**auto**|lores|hires|superhires)
- **Resolution** [puae_video_resolution] (**auto**|auto-lores|auto-superhires|lores|hires|superhires)

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

| Value | Label |
|------------|-------------------|
| auto | Automatic |
| lores | Low 360px |
| hires | High 720px |
| superhires | Super-High 1440px |
| Value | Label |
|-----------------|------------------------|
| auto | Automatic |
| auto-lores | Automatic (Low) |
| auto-superhires | Automatic (Super-High) |
| lores | Low 360px |
| hires | High 720px |
| superhires | Super-High 1440px |

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

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

Required distance from stick center to register input.

- **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)
- **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)

Mouse movement speed multiplier for analog stick.
Mouse speed for left analog stick.

- **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)
- **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)

Mouse movement speed multiplier for directional pad.
Mouse speed for right analog stick.

- **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)

Mouse speed for directional pad.

- **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)

Expand Down
36 changes: 16 additions & 20 deletions docs/library/vice.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@ Settings with (Restart) means that core has to be closed for the new setting to

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

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

PAL emulation filter with custom horizontal blur.

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

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

- **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)
- **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)

'Colodore' is recommended for the most accurate colors.

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

##### VIC (VIC-20)

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

PAL emulation filter with custom horizontal blur.

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

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

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

'Colodore' is recommended for the most accurate colors.

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

##### TED (PLUS/4)

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

PAL emulation filter with custom horizontal blur.

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

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

- **TED Color Palette** [vice_plus4_external_palette] (default|**colodore_ted**|yape-pal|yape-ntsc)
- **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)

'Colodore' is recommended for the most accurate colors.

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

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

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

PAL emulation filter with custom horizontal blur.

- **CRTC Filter Oddline Offset** [vice_crtc_filter_oddline_offset] (**1000**|20-2000)

PAL emulation filter oddline offset.

- **CRTC Filter Oddline Phase** [vice_crtc_filter_oddline_phase] (**1000**|20-2000)

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

- **CRTC Color Palette** [vice_cbm2_external_palette] (**default**|green|amber|white)

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

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

- **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)
- **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)

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

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

Required distance from stick center to register input.

- **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)
- **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)

Mouse speed for left analog stick.

- **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)

Mouse movement speed multiplier for analog stick.
Mouse speed for right analog stick.

- **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)
- **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)

Mouse movement speed multiplier for directional pad.
Mouse speed for directional pad.

- **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)

Expand Down

0 comments on commit c2531a8

Please sign in to comment.