diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt index 060105f6..2b72545a 100644 --- a/Doc/ChangeLog.txt +++ b/Doc/ChangeLog.txt @@ -2,6 +2,7 @@ Version 3.1.1 ------------- - WBW: Version bumped due to pervasive changes - WBW: Preliminary hard disk partition support (backward compatible) +- WBW: Change Propeller VGA signal timings to 60Hz refresh Version 3.1 ----------- diff --git a/Source/Prop/Spin/ParPortProp.spin b/Source/Prop/Spin/ParPortProp.spin index 6ecf049f..5e890c21 100644 --- a/Source/Prop/Spin/ParPortProp.spin +++ b/Source/Prop/Spin/ParPortProp.spin @@ -3,8 +3,8 @@ ************************************ * ParPortProp for RomWBW * * Interface to RBC ParPortProp * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ************************************ Wayne Warthen @@ -29,11 +29,12 @@ Updates: 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -608,7 +609,7 @@ PRI Activity DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "ParPortProp",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/PropIO.spin b/Source/Prop/Spin/PropIO.spin index 3d677264..9e074fe0 100644 --- a/Source/Prop/Spin/PropIO.spin +++ b/Source/Prop/Spin/PropIO.spin @@ -3,8 +3,8 @@ ******************************* * PropIO for RomWBW * * Interface to RBC PropIO * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ******************************* Wayne Warthen @@ -34,11 +34,12 @@ 2014-02-09 WBW: Clean up 2015-11-15 WBW: Added SD card capacity reporting 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "PropIO",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/PropIO2.spin b/Source/Prop/Spin/PropIO2.spin index 9e01d3cb..ad1592f7 100644 --- a/Source/Prop/Spin/PropIO2.spin +++ b/Source/Prop/Spin/PropIO2.spin @@ -3,8 +3,8 @@ ********************************* * PropIO 2 for RomWBW * * Interface to RBC PropIO 2 * - * Version 0.96 * - * March 11, 2018 * + * Version 0.97 * + * May 9, 2020 * ********************************* Wayne Warthen @@ -34,11 +34,12 @@ 2014-02-08 WBW: Adaptation for PropIO 2 2015-11-15 WBW: Added SD card capacity reporting 2018-03-11 WBW: Implement character attributes + 2020-05-09 WBW: Switch monitor refresh to 60Hz }} CON - VERSION = (((0 << 8) + 96) << 16) + 0 + VERSION = (((0 << 8) + 97) << 16) + 0 _CLKMODE = XTAL1 + PLL16X _XINFREQ = 5_000_000 @@ -337,7 +338,7 @@ PRI DumpBuffer(Buffer) | i, j DAT -strVer byte "F/W v0.96",0 +strVer byte "F/W v0.97",0 strHW byte "PropIO v2",0 strROM byte "RomWBW",0 diff --git a/Source/Prop/Spin/vgacolour.spin b/Source/Prop/Spin/vgacolour.spin index c5cc2f80..0981fe55 100644 --- a/Source/Prop/Spin/vgacolour.spin +++ b/Source/Prop/Spin/vgacolour.spin @@ -20,6 +20,7 @@ CON +{ ' 640 x 480 @ 69Hz settings: 80 x 30 characters hp = 640 ' horizontal pixels @@ -33,6 +34,24 @@ CON hn = 1 ' horizontal 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) +} + +'{ +' 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 diff --git a/Source/ver.inc b/Source/ver.inc index 783d72d7..59f55502 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.4" +#DEFINE BIOSVER "3.1.1-pre.5" diff --git a/Source/ver.lib b/Source/ver.lib index 450a4790..33acdafa 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.4" + db "3.1.1-pre.5" endm