Browse Source

Propeller VGA Signal Timing Update

- Propeller VGA signal now uses 60Hz refresh for  better compatibility with all VGA monitors
pull/126/head
Wayne Warthen 6 years ago
parent
commit
2aa43a8063
  1. 1
      Doc/ChangeLog.txt
  2. 9
      Source/Prop/Spin/ParPortProp.spin
  3. 9
      Source/Prop/Spin/PropIO.spin
  4. 9
      Source/Prop/Spin/PropIO2.spin
  5. 19
      Source/Prop/Spin/vgacolour.spin
  6. 2
      Source/ver.inc
  7. 2
      Source/ver.lib

1
Doc/ChangeLog.txt

@ -2,6 +2,7 @@ Version 3.1.1
------------- -------------
- WBW: Version bumped due to pervasive changes - WBW: Version bumped due to pervasive changes
- WBW: Preliminary hard disk partition support (backward compatible) - WBW: Preliminary hard disk partition support (backward compatible)
- WBW: Change Propeller VGA signal timings to 60Hz refresh
Version 3.1 Version 3.1
----------- -----------

9
Source/Prop/Spin/ParPortProp.spin

@ -3,8 +3,8 @@
************************************ ************************************
* ParPortProp for RomWBW * * ParPortProp for RomWBW *
* Interface to RBC ParPortProp * * Interface to RBC ParPortProp *
* Version 0.96 *
* March 11, 2018 *
* Version 0.97 *
* May 9, 2020 *
************************************ ************************************
Wayne Warthen Wayne Warthen
@ -29,11 +29,12 @@
Updates: Updates:
2018-03-11 WBW: Implement character attributes 2018-03-11 WBW: Implement character attributes
2020-05-09 WBW: Switch monitor refresh to 60Hz
}} }}
CON CON
VERSION = (((0 << 8) + 96) << 16) + 0
VERSION = (((0 << 8) + 97) << 16) + 0
_CLKMODE = XTAL1 + PLL16X _CLKMODE = XTAL1 + PLL16X
_XINFREQ = 5_000_000 _XINFREQ = 5_000_000
@ -608,7 +609,7 @@ PRI Activity
DAT DAT
strVer byte "F/W v0.96",0
strVer byte "F/W v0.97",0
strHW byte "ParPortProp",0 strHW byte "ParPortProp",0
strROM byte "RomWBW",0 strROM byte "RomWBW",0

9
Source/Prop/Spin/PropIO.spin

@ -3,8 +3,8 @@
******************************* *******************************
* PropIO for RomWBW * * PropIO for RomWBW *
* Interface to RBC PropIO * * Interface to RBC PropIO *
* Version 0.96 *
* March 11, 2018 *
* Version 0.97 *
* May 9, 2020 *
******************************* *******************************
Wayne Warthen Wayne Warthen
@ -34,11 +34,12 @@
2014-02-09 WBW: Clean up 2014-02-09 WBW: Clean up
2015-11-15 WBW: Added SD card capacity reporting 2015-11-15 WBW: Added SD card capacity reporting
2018-03-11 WBW: Implement character attributes 2018-03-11 WBW: Implement character attributes
2020-05-09 WBW: Switch monitor refresh to 60Hz
}} }}
CON CON
VERSION = (((0 << 8) + 96) << 16) + 0
VERSION = (((0 << 8) + 97) << 16) + 0
_CLKMODE = XTAL1 + PLL16X _CLKMODE = XTAL1 + PLL16X
_XINFREQ = 5_000_000 _XINFREQ = 5_000_000
@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j
DAT DAT
strVer byte "F/W v0.96",0
strVer byte "F/W v0.97",0
strHW byte "PropIO",0 strHW byte "PropIO",0
strROM byte "RomWBW",0 strROM byte "RomWBW",0

9
Source/Prop/Spin/PropIO2.spin

@ -3,8 +3,8 @@
********************************* *********************************
* PropIO 2 for RomWBW * * PropIO 2 for RomWBW *
* Interface to RBC PropIO 2 * * Interface to RBC PropIO 2 *
* Version 0.96 *
* March 11, 2018 *
* Version 0.97 *
* May 9, 2020 *
********************************* *********************************
Wayne Warthen Wayne Warthen
@ -34,11 +34,12 @@
2014-02-08 WBW: Adaptation for PropIO 2 2014-02-08 WBW: Adaptation for PropIO 2
2015-11-15 WBW: Added SD card capacity reporting 2015-11-15 WBW: Added SD card capacity reporting
2018-03-11 WBW: Implement character attributes 2018-03-11 WBW: Implement character attributes
2020-05-09 WBW: Switch monitor refresh to 60Hz
}} }}
CON CON
VERSION = (((0 << 8) + 96) << 16) + 0
VERSION = (((0 << 8) + 97) << 16) + 0
_CLKMODE = XTAL1 + PLL16X _CLKMODE = XTAL1 + PLL16X
_XINFREQ = 5_000_000 _XINFREQ = 5_000_000
@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j
DAT DAT
strVer byte "F/W v0.96",0
strVer byte "F/W v0.97",0
strHW byte "PropIO v2",0 strHW byte "PropIO v2",0
strROM byte "RomWBW",0 strROM byte "RomWBW",0

19
Source/Prop/Spin/vgacolour.spin

@ -20,6 +20,7 @@
CON CON
{
' 640 x 480 @ 69Hz settings: 80 x 30 characters ' 640 x 480 @ 69Hz settings: 80 x 30 characters
hp = 640 ' horizontal pixels hp = 640 ' horizontal pixels
@ -33,6 +34,24 @@ CON
hn = 1 ' horizontal normal sync state (0|1) hn = 1 ' horizontal normal sync state (0|1)
vn = 1 ' vertical normal sync state (0|1) vn = 1 ' vertical normal sync state (0|1)
pr = 30 ' pixel rate in MHz at 80MHz system clock (5MHz granularity) pr = 30 ' pixel rate in MHz at 80MHz system clock (5MHz granularity)
}
'{
' 640 x 480 @ 60Hz settings: 80 x 40 characters
hp = 640 'horizontal pixels
vp = 480 'vertical pixels
hf = 16 'horizontal front porch pixels
hs = 96 'horizontal sync pixels
hb = 48 'horizontal back porch pixels
vf = 10 'vertical front porch lines
vs = 2 'vertical sync lines
vb = 33 'vertical back porch lines
hn = 1 'horizontal normal sync state (0|1)
vn = 1 'vertical normal sync state (0|1)
pr = 25 'pixel rate in MHz at 80MHz system clock (5MHz granularity)
'}
' columns and rows ' columns and rows

2
Source/ver.inc

@ -2,4 +2,4 @@
#DEFINE RMN 1 #DEFINE RMN 1
#DEFINE RUP 1 #DEFINE RUP 1
#DEFINE RTP 0 #DEFINE RTP 0
#DEFINE BIOSVER "3.1.1-pre.4"
#DEFINE BIOSVER "3.1.1-pre.5"

2
Source/ver.lib

@ -3,5 +3,5 @@ rmn equ 1
rup equ 1 rup equ 1
rtp equ 0 rtp equ 0
biosver macro biosver macro
db "3.1.1-pre.4"
db "3.1.1-pre.5"
endm endm

Loading…
Cancel
Save