Skip to content

Commit 2c8d801

Browse files
committed
Update episode examples for VGA library changes
1 parent 98d25fe commit 2c8d801

File tree

5 files changed

+24
-13
lines changed

5 files changed

+24
-13
lines changed

episodes/ep01-vga/ep01-vga-10-library/main.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include "vga.h"
13+
#include "vga-modes.h"
1314
#include "slides.h"
1415

1516
#include "pico/stdlib.h"
@@ -70,9 +71,9 @@ int main(void)
7071
{
7172
set_sys_clock_khz(252000, false);
7273

73-
VgaInitParams params;
74+
VgaInitParams params = { 0 };
75+
params.params = vgaGetParams(VGA_640_480_60HZ, 2);
7476
params.scanlineFn = slideshowScanline;
75-
params.endOfFrameFn = NULL;
7677

7778
vgaInit(params);
7879

episodes/ep02-tms/ep02-tms-00-color/main.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include "vga.h"
13+
#include "vga-modes.h"
1314
#include "vrEmuTms9918.h"
1415
#include "vrEmuTms9918Util.h"
1516

@@ -79,7 +80,8 @@ int main(void)
7980
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_COLOR_ADDRESS);
8081
vrEmuTms9918WriteByteRpt(tms, vrEmuTms9918FgBgColor(TMS_MAGENTA, TMS_WHITE), 32);
8182

82-
VgaInitParams params;
83+
VgaInitParams params = { 0 };
84+
params.params = vgaGetParams(VGA_640_480_60HZ, 2);
8385
params.scanlineFn = tmsScanline;
8486
params.endOfFrameFn = NULL;
8587

episodes/ep02-tms/ep02-tms-01-text/main.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include "vga.h"
13+
#include "vga-modes.h"
1314

1415
#include "vrEmuTms9918Util.h"
1516

@@ -97,7 +98,8 @@ int main(void)
9798
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_NAME_ADDRESS);
9899
vrEmuTms9918WriteString(tms, "Hello, vrEmuTms9918!");
99100

100-
VgaInitParams params;
101+
VgaInitParams params = { 0 };
102+
params.params = vgaGetParams(VGA_640_480_60HZ, 2);
101103
params.scanlineFn = tmsScanline;
102104
params.endOfFrameFn = NULL;
103105

episodes/ep02-tms/ep02-tms-02-sprites/main.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include "vga.h"
13+
#include "vga-modes.h"
1314

1415
#include "vrEmuTms9918Util.h"
1516

@@ -116,7 +117,8 @@ int main(void)
116117
vrEmuTms9918WriteData(tms, i + 2);
117118
}
118119

119-
VgaInitParams params;
120+
VgaInitParams params = { 0 };
121+
params.params = vgaGetParams(VGA_640_480_60HZ, 2);
120122
params.scanlineFn = tmsScanline;
121123
params.endOfFrameFn = animateSprites;
122124

episodes/ep02-tms/ep02-tms-03-gfx2/main.c

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
#include "vga.h"
13+
#include "vga-modes.h"
1314

1415
#include "vrEmuTms9918Util.h"
1516
#include "breakout.h"
@@ -74,13 +75,15 @@ void animateSprites(uint64_t frameNumber)
7475
for (int i = 0; i < 16; ++i)
7576
{
7677
float x = sin(frameNumber / 20.0f + i / 3.0f);
77-
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_SPRITE_ATTR_ADDRESS + (8 * i));
78+
79+
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_SPRITE_ATTR_ADDRESS + (8 * i) + 4);
7880
uint8_t yPos = (frameNumber / 2 + i * 10 + 24);
7981
if (yPos == 0xd0) ++yPos;
8082
vrEmuTms9918WriteData(tms, yPos);
8183
vrEmuTms9918WriteData(tms, 128 - 8 + (x * 80.0f));
84+
85+
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_SPRITE_ATTR_ADDRESS + (8 * i));
8286
if (yPos - 2 == 0xd0) ++yPos;
83-
vrEmuTms9918SetAddressWrite(tms, TMS_DEFAULT_VRAM_SPRITE_ATTR_ADDRESS + (8 * i) + 4);
8487
vrEmuTms9918WriteData(tms, yPos - 2);
8588
vrEmuTms9918WriteData(tms, 128 - 8 + (x * 80.0f) - 2);
8689
}
@@ -114,18 +117,19 @@ int main(void)
114117
const char* str = "Hello, World!";
115118
for (int i = 0; i < strlen(str); ++i)
116119
{
117-
vrEmuTms9918WriteData(tms, i * 10 + 24);
118-
vrEmuTms9918WriteData(tms, i * 10);
119-
vrEmuTms9918WriteData(tms, str[strlen(str) - (i + 1)]);
120-
vrEmuTms9918WriteData(tms, 1);
121-
122120
vrEmuTms9918WriteData(tms, i * 10 + 24 - 2);
123121
vrEmuTms9918WriteData(tms, i * 10 - 2);
124122
vrEmuTms9918WriteData(tms, str[strlen(str) - (i + 1)]);
125123
vrEmuTms9918WriteData(tms, i + 2);
124+
125+
vrEmuTms9918WriteData(tms, i * 10 + 24);
126+
vrEmuTms9918WriteData(tms, i * 10);
127+
vrEmuTms9918WriteData(tms, str[strlen(str) - (i + 1)]);
128+
vrEmuTms9918WriteData(tms, 1);
126129
}
127130

128-
VgaInitParams params;
131+
VgaInitParams params = { 0 };
132+
params.params = vgaGetParams(VGA_640_480_60HZ, 2);
129133
params.scanlineFn = tmsScanline;
130134
params.endOfFrameFn = animateSprites;
131135

0 commit comments

Comments
 (0)