Merge branch 'main' into decouple_vga

Author: arghunter

RISC-V-Scaffold-Basys3/RISC-V-Scaffold-Basys3.xpr

@@ -4,7 +4,7 @@
 <!-- Copyright 1986-2022 Xilinx, Inc. All Rights Reserved.                   -->
 <!-- Copyright 2022-2025 Advanced Micro Devices, Inc. All Rights Reserved.   -->
 
-<Project Product="Vivado" Version="7" Minor="71" Path="/home/arya/Documents/Github/RISC-V/RISC-V-Scaffold-Basys3/RISC-V-Scaffold-Basys3.xpr">
+<Project Product="Vivado" Version="7" Minor="71" Path="C:/Users/outer/OneDrive/Desktop/RISC-V/RISC-V-Scaffold-Basys3/RISC-V-Scaffold-Basys3.xpr">
   <DefaultLaunch Dir="$PRUNDIR"/>
   <Configuration>
     <Option Name="Id" Val="5ccae5db352846dd96f73584352a58b3"/>
@@ -260,15 +260,12 @@
     <Simulator Name="Questa">
       <Option Name="Description" Val="Questa Advanced Simulator"/>
     </Simulator>
-    <Simulator Name="Xcelium">
-      <Option Name="Description" Val="Xcelium Parallel Simulator"/>
-    </Simulator>
-    <Simulator Name="VCS">
-      <Option Name="Description" Val="Verilog Compiler Simulator (VCS)"/>
-    </Simulator>
     <Simulator Name="Riviera">
       <Option Name="Description" Val="Riviera-PRO Simulator"/>
     </Simulator>
+    <Simulator Name="ActiveHDL">
+      <Option Name="Description" Val="Active-HDL Simulator"/>
+    </Simulator>
   </Simulators>
   <Runs Version="1" Minor="22">
     <Run Id="synth_1" Type="Ft3:Synth" SrcSet="sources_1" Part="xc7a35tcpg236-1" ConstrsSet="constrs_1" Description="Vivado Synthesis Defaults" AutoIncrementalCheckpoint="true" IncrementalCheckpoint="$PSRCDIR/utils_1/imports/synth_1/Top.dcp" WriteIncrSynthDcp="false" State="current" Dir="$PRUNDIR/synth_1" IncludeInArchive="true" IsChild="false" AutoIncrementalDir="$PSRCDIR/utils_1/imports/synth_1" AutoRQSDir="$PSRCDIR/utils_1/imports/synth_1" ParallelReportGen="true">

programs/hello.c

@@ -7,6 +7,11 @@ __attribute__((naked)) void _start(void) {
 
 int main() {
     volatile unsigned char* frame = (volatile unsigned char*)0x0;
+    volatile unsigned char* btns = (volatile unsigned char*)0x4B000000;
+
+    int paddY1 = 120;
+    int paddY2 = 120;
+
     int ballX = 160;
     int ballY = 120;
     int dX = 1;
@@ -19,40 +24,92 @@ int main() {
         frame[0x4000 * (320 * i + 319)] = 0xFF;
     }
 
+    int counter = 0;
+
     while (1) {
-        for (int x = -2; x <= 2; x++) {
-            for (int y = -2; y <= 2; y++) {
-                frame[0x4000 * (320 * (ballY + y) + ballX + x)] = 0x00;
+        counter += 1;
+
+        if (counter == 8000) {
+            counter = 0;
+
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -2; y <= 2; y++) {
+                    frame[0x4000 * (320 * (ballY + y) + ballX + x)] = 0x00;
+                }
             }
-        }
 
-        ballX += dX;
-        ballY += dY;
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -20; y <= 20; y++) {
+                    frame[0x4000 * (320 * (paddY1 + y) + 20 + x)] = 0x00;
+                }
+            }
 
-        if (ballX == 319 - 6) {
-            dX = -1;
-        }
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -20; y <= 20; y++) {
+                    frame[0x4000 * (320 * (paddY2 + y) + 299 + x)] = 0x00;
+                }
+            }
 
-        if (ballX == 6) {
-            dX = 1;
-        }
+            if (*btns & 0b0001 && paddY1 < 239 - 21) {
+                paddY1 += 1;
+            }
 
-        if (ballY == 239 - 6) {
-            dY = -1;
-        }
+            if (*btns & 0b0010 && paddY1 > 21) {
+                paddY1 -= 1;
+            }
 
-        if (ballY == 6) {
-            dY = 1;
-        }
+            if (*btns & 0b0100 && paddY2 < 239 - 21) {
+                paddY2 += 1;
+            }
 
-        for (int x = -2; x <= 2; x++) {
-            for (int y = -2; y <= 2; y++) {
-                frame[0x4000 * (320 * (ballY + y) + ballX + x)] = 0xFF;
+            if (*btns & 0b1000 && paddY2 > 21) {
+                paddY2 -= 1;
             }
-        }
 
-        for (int i = 0; i < 4000; i++) {
-            __asm__("nop");
+            ballX += dX;
+            ballY += dY;
+
+            if (ballX == 319 - 6) {
+                dX = -1;
+            }
+
+            if (ballX == 6) {
+                dX = 1;
+            }
+
+            if (ballY == 239 - 6) {
+                dY = -1;
+            }
+
+            if (ballY == 6) {
+                dY = 1;
+            }
+
+            if (ballX <= 25 && ballX >= 15 && ballY <= paddY1 + 25 && ballY >= paddY1 - 25) {
+                dX = 1;
+            }
+
+            if (ballX <= 304 && ballX >= 294 && ballY <= paddY2 + 25 && ballY >= paddY2 - 25) {
+                dX = -1;
+            }
+
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -2; y <= 2; y++) {
+                    frame[0x4000 * (320 * (ballY + y) + ballX + x)] = 0xFF;
+                }
+            }
+
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -20; y <= 20; y++) {
+                    frame[0x4000 * (320 * (paddY1 + y) + 20 + x)] = 0x03;
+                }
+            }
+
+            for (int x = -2; x <= 2; x++) {
+                for (int y = -20; y <= 20; y++) {
+                    frame[0x4000 * (320 * (paddY2 + y) + 299 + x)] = 0xE0;
+                }
+            }
         }
     }
 }