Difference between revisions of "F20: Treasure Diver"

Latest revision as of 00:05, 31 May 2021

Tiger Tiger Game from Xenoblade Chronicles 2

Treasure Diver

Abstract

Treasure Diver is a single player game in which the player descends into the watery depths on the hunt for treasure. The player must dodge obstacles and enemy creatures all while collecting treasure along the way. While descending, the player is able to attack enemies at a range which in turn increases the player's score. When they reach the bottom of the level, they can collect the large treasure chest called the Motherlode. Once the Motherlode is collected, they have to ascend the cavern and make it out before running out of air. Hitting an enemy causes the player to lose air, a treasure chest, and their score to decrease. When their air hits zero, it’s game over. At the end of a level the player is given their score based on treasure collected, and the amount of enemies destroyed, and can progress to the next level.

Objectives

The main objective of this project was to create the treasure diver video game displayed on an RGB LED matrix, one SJ2 board as a graphics processor/matrix controller, and another SJ2 board as a game pad controller. Other objectives are the following:

Design custom PCBs for both the game pad and matrix controller SJ2 boards.
Design custom 3D printed enclosures for both the matrix and game pad controller.
Use the FreeRTOS Real-Time Operating System on both SJ2 boards.
Use a wireless interface for communication between both SJ2 boards.
Incorporate an acceleration sensor as one of the options to control the game character's movement.
Add background music to the game to enhance gameplay experience.

Introduction

This project was divided into the following modules for each SJ2 board:

Matrix Controller Board: The matrix controller board is responsible for displaying the graphics of the treasure diver game, controlling the treasure diver game logic, playing MP3 tracks based on the current game/menu screen, receiving character movement and button press signals over a bluetooth interface, and sending controller type (accelerometer or joystick) signals over a bluetooth interface.
Game Pad Controller Board: The game pad controller board is responsible for processing input joystick, accelerometer and button press signals, controlling the treasure diver game controls logic, sending character movement and button press signals over a bluetooth interface, and receiving controller type (accelerometer or joystick) signals over a bluetooth interface.

How to Play Treasure Diver

The goal of the game is to descend to the bottom of each level, collect the Motherlode (big treasure chest), and make it all the way back to the top of the level before running out of air and with the highest score possible.

Using the joystick or accelerometer controls (chosen in options menu) on the game pad controller, move the game character down to the bottom of each screen in each game level.
Once the character reaches the bottom of a screen, the next screen of the level will appear.
Avoid all the obstacles while descending, collect as many treasure chests and shoot as many enemies as possible to increase your score.
You can shoot enemies by pressing the select button on the game pad controller (button on the left).
Try not to get hit by any enemies! Doing so will cause you to lose a chest, some air, and your score will decrease. If you run out of air, you lose the game and will have to restart at the first level.
Once you get to the last screen of the level, you must collect the big treasure chest at the bottom of the screen before you can start ascending. You get back half of your air when you collect this chest.
Now that you've got the Motherlode, move the game character back up to the top of the first screen of the level before you run out of air!
Once you reach the top of the first screen in the level, you will enter the next game level.
Beat all levels in order to win the treasure diver game!

Team Members & Responsibilities

Treasure Diver GitLab

Ameer Ali GitLab LinkedIn

LED Matrix Driver
Matrix Graphics Development
Game Logic Development
Gameplay Mechanics Design
Wiki Page Management

Jesus De Haro GitLab LinkedIn

Game Pad Controller
MP3 Decoder Driver
Matrix Graphics Development
PCB Design
GitLab Repo Management

Nicholas Kaiser GitLab LinkedIn

HC05 Bluetooth Driver and Interface
Matrix Collision Detection Development & Level Design
CAD Enclosure Design
PCB Design
Wiki Page Management

Schedule

Week #	Start Date	End Date	Tasks	Status
1	9/27/2020	10/3/2020	Decide on day/time for weekly meetings Decide on 2 game ideas Decide on using wireless or wired controllers Decide on PCB software and manufacturer to order from Finalize parts list Setup splitwise account for cost sharing Discuss 3D printing options Break project up into tasks and begin assigning tasks to team members Setup team GitLab repo with master and working master branches Submit Project Proposal assignment	Completed Completed Completed Completed Completed Completed Completed Completed Completed Completed Completed
2	10/4/2020	10/10/2020	Read past semester reports to decide on parts vendors	Completed
3	10/11/2020	10/17/2020	Choose game based on Preet's Project Proposal feedback Submit Group Questions assignment Choose top picks for roles and responsibilities Finish schedule rough draft and upload to Wiki report	Completed Completed Completed Completed
4	10/18/2020	10/24/2020	Assign project tasks to team members Order project parts Submit Wiki schedule assignment Complete project GitLab Repo setup Obtain datasheets for all parts and upload to team Google Drive folder Brainstorm gameplay, rules, and level design on paper	Completed Completed Completed Completed Completed Completed
5	10/25/2020	10/31/2020	Read datasheets and conduct research for driver writing Plan CAD enclosure design on paper Finalize gameplay, rules, and level design on paper	Completed Completed Completed
6	11/1/2020	11/7/2020	Parts arrive Test all parts to ensure proper functionality Begin developing graphics driver for LED matrix Begin developing MP3 decoder board driver Begin developing bluetooth board driver Finalize CAD enclosure design on paper and begin designing in AutoCAD software	Completed Completed Completed Completed Completed Completed
7	11/8/2020	11/14/2020	LED matrix can light a pixel(s) at specified locations LED matrix can display our game character and obstacles MP3 decoder can play a song from the SD card MP3 decoder can play/pause, jump to next/previous song, and increase/decrease volume Bluetooth modules can send controls data back and forth between game pad board and master board Controls data can be accessed using "get" and "set" API Plan PCB design on paper Game pad controller can read joystick and accelerometer values and detect switch presses	Completed Completed Completed Completed Completed Completed Completed Completed
8	11/15/2020	11/21/2020	Decide how to handle each collision detection case (character/enemy, bullet/enemy, etc.) MP3 decoder folder structure is finalized MP3 decoder can play a song at a specified index Analog thumbstick and accelerometer values are read by game pad board and sent over bluetooth Button press logic is implemented on game pad board and sent over bluetooth Finish enclosure design in AutoCAD software and start printing Order PCB components (resistors, capacitors, etc.) Finalize PCB design on paper and design in PCB software	Completed Completed Completed Completed Completed Completed Completed Completed
9	11/22/2020	11/28/2020	LED matrix top bar data (health, power ups) is displayed and updates correctly LED matrix displays character orientation correctly depending on current movement direction Controller input (joystick or accelerometer) option is implemented on game pad controller Character moves on LED matrix based on received direction controls Bullet moves on LED matrix when button is pressed Finalize PCB design in software and order PCB	Completed Completed Completed Completed Completed Completed
10	11/29/2020	12/5/2020	LED matrix menu screens and game over/victory screens are implemented on matrix Volume controls and controller input select in the options menu are implemented Integrate circuitry with 3D printed enclosure PCB arrives, conduct PCB testing to ensure proper connections Solder PCB and integrate with existing project circuitry LED matrix can scroll to next screen when character reaches the bottom of current screen Finalize MP3 track selection for each screen and during gameplay Collision detection logic is fully functional and displays correctly on LED matrix	Completed Completed Completed Completed Completed Completed Completed Completed
11	12/6/2020	12/12/2020	Finish rough draft of project report Write gameplay logic code on master controller. Gameplay logic should update the score and status bar items correctly LED matrix graphics design for all levels is complete MP3 decoder plays correct song/track during gameplay and for each menu/game over screen Gameplay state machine switches to next state based on user button presses and gameplay progression	Completed Completed Completed Completed Completed
12	12/13/2020	12/19/2020	Film demo video and upload. Create link on Wiki report Demo Day Finalize project report and submit	Completed Completed Completed

Parts Lists & Cost

General Parts

Item #	Part	Vendor	Qty	Cost
1	64x64 RGB LED Matrix	Adafruit	1	$54.95
2	SJTwo Boards	SJSU	2	$100.00
3	HC-05 Bluetooth Boards	Amazon	2	$12.59
4	MP3 Decoder/Player Board	Amazon	1	$7.39
5	Speakers (with audio jack connection)	already had	1	$0
6	Audio Jack Cable	already had	1	$0
7	MicroSD Card & Adapter (32GB or smaller)	Amazon	1	$5.99
8	Power Supply for LED Matrix (5V 5A)	Amazon	1	$14.99
9	Tactile Push Buttons	Amazon	2	$7.98
10	Analog Thumbstick	Amazon	1	$4.89
11	Power Bank	already had	1	$0
12	6" USB to Micro-USB Cable	Amazon	1	$5.19

Game Pad PCB Components

Item #	Part	Vendor	Qty	Cost
1	M3 Size (or smaller) Screws & Nuts	Amazon	4	$11.99
2	5-pin Right Angle Male Header	Amazon	1	$4.99
3	6-pin Right Angle Female Header	Amazon	1	$7.99
4	1K Through-Hole Resistors	Amazon	2	$5.69
5	2x20 Female Header	Amazon	1	$6.99
6	Male Header Pins	Amazon	16	$4.99

Matrix Controller PCB Components

Item #	Part	Vendor	Qty	Cost
1	2.1mm DC Power Jack (Breadboard Compatible)	Adafruit	1	$0.95
2	2-pin Screw Terminal Block	Amazon	1	$5.99
3	2x20 Female Header	Amazon	1	$6.99
4	4-pin Right Angle Male Header	Amazon	1	$4.99
5	6-pin Right Angle Female Header	Amazon	1	$7.99
6	Male Header Pins	Amazon	20	$4.99
7	2x8 Box Header	Amazon	1	$9.99

Matrix & Game Pad Enclosure Parts

Item #	Part	Vendor	Qty	Cost
1	Game Pad and Matrix Enclosures	custom design	1	$153.34
2	M3 Size (or smaller) Screws & PCB Standoffs	Amazon	18	$11.99
3	#8-32 x 1/2 inch Machine Screws & Nuts	Home Depot	8	$1.18
4	Male Header Pins	Amazon	12	$4.99
5	Hot Glue Gun & Hot Glue Sticks	already had	1	$0
6	6" Slim Headphone Jack Extender (Male to Female)	Amazon	1	$6.99
7	6" DC Power Jack Extender (Male to Female)	Amazon	1	$9.89
8	Velcro Straps (20mm wide)	Amazon	2	$6.59

Design & Implementation

PCB Design

We chose EasyEDA as our PCB designing software since it is completely free to use with no trial period. Additionally, EasyEDA has a handy auto-routing feature, and the ability to create a PCB from a schematic. We designed two PCBs, one for our game pad controller and one for our matrix controller. First, we created separate schematics for both controllers that included all connections. We included extra GND, 3.3V, 5V, and SJ2 pins to accommodate any design changes down the road. We made these extra pins available as header pins on the PCBs.

Matrix Controller Board PCB Schematic

Game Pad Board PCB Schematic

Once our schematics were done and checked by each group member several times, we manually checked the footprint for each part we included in the schematic. Some of the parts we chose didn't have a footprint and so we had to search EasyEDA's library to find one. Also, the connections for several of the default footprints were incorrect for our design and had to be manually edited so that each pin corresponded to the correct solder pad. Once the footprints were all verified, we dragged and dropped the footprints onto the PCBs in precisely measured locations to ensure compatibility with our 3D printed enclosures. Next, EasyEDA's auto-routing feature was used and then manually checked to ensure proper connections.

Matrix Controller PCB Design in EasyEDA

Game Pad PCB Design in EasyEDA

We chose to order our PCBs from JLCPCB due to their fast manufacturing and shipping times, and reasonable PCB and shipping prices. As an added bonus, JLCPCB is integrated into EasyEDA, so ordering your PCB is extremely simple. Once we placed the order, our PCBs only took a week to arrive. We used a multimeter to continuity tested all the connections on the PCBs before hooking them up and didn't run into any incorrect connections during this testing.

Matrix Controller Board PCB (Front)

Matrix Controller Board PCB (Back)

Game Pad PCB (Front)

Game Pad PCB (Back)

Once the PCBs were verified, we soldered them up to integrate into our existing circuitry. The game pad PCB has precisely positioned holes so that the joystick can be screwed into the PCB, allowing for a very secure fit. The push buttons on the game pad PCBs were mounted on 10mm nylon standoffs and had header pins soldered to extend their pins. This was done in order to raise the height of the push buttons in order to match the height of the joystick.

Matrix Controller PCB (Top)

Matrix Controller PCB (Bottom)

Game Pad PCB (Top) View 1

Game Pad PCB (Bottom)

Game Pad PCB (Top) View 2

Game Pad PCB (Top) View 3

CAD Enclosures Design

We used the FreeCAD software in order to design our custom enclosures for both the matrix and game pad. We decided to use FreeCAD because it is completely free with no trial period, and lots of documentation and help videos are available online. This software is not without bugs and inefficiencies but this was the only free option we could find that didn't have a trial period, design limitations, or size restrictions. FreeCAD also includes tons of user made workbenches that include pre-made designs for specific parts (screws, nuts, standoffs, etc) which can be useful and a time saver.

Our matrix enclosure design includes a casing slightly larger than the matrix. A lip was created on the inside for the matrix to rest on. Through taking precise measurements and using a thinner but more flexible outer wall, we were able to make the matrix "snap fit" into the enclosure. We designed tabs on the bottom of the matrix enclosure to place screw nuts into in order to make our enclosure screw shut. Our matrix enclosure design also included a back plate for all the circuitry components to be fastened to. The back plate has screw holes and cutouts for the power and audio cables.

Matrix Enclosure Design in AutoCAD Software

Matrix Enclosure Back Plate Design in AutoCAD Software

Our game pad enclosure design includes a top and bottom cover for the game pad controller circuitry to sit in. Through taking precise measurements, our game pad controller circuitry fits snugly into the enclosure and is held in place by the SJ2 board's micro-USB port sticking through the cutout in the enclosure's bottom cover. This allows for easy installation and removal which was helpful for debugging. The enclosure's top cover has cutouts for the joystick and two push buttons while the bottom cover has cutouts on its bottom face for velcro straps to secure the power source to the bottom of the game pad enclosure. We designed an inner lip (top cover) and an outer lip (bottom cover) so that the two covers would fit together securely. We designed matching screw hole cutouts for each cover so that the game pad enclosure could be screwed shut.

Game Pad Enclosure Top Cover Design in AutoCAD Software

Game Pad Enclosure Bottom Cover Design in AutoCAD Software

Getting our enclosures printed proved to be a challenge. Normally, the SJSU library offers free 3D Printing services to students and the SCE club offers free 3D printing services to members, but due to the COVID pandemic, SJSU and all of it's services were shutdown and so we had to explore other options. Online 3D Printing services were incredibly expensive so we chose a local place that printed our enclosures for about $155. Due to the limitations of FDM 3D printing, the screw hole and joystick cutouts on the game pad enclosure and the power jack cutout on the matrix enclosure had to be manually made larger using a needle file but this was the only post-printing modification that had to be made.

Matrix Enclosure (Front)

Matrix Enclosure (Back)

Matrix Enclosure Side View

Matrix Enclosure Back Plate (Front)

Matrix Enclosure Back Plate (Back)

Game Pad Enclosure Top Cover (Front)

Game Pad Enclosure Top Cover (Back)

Game Pad Enclosure Bottom Cover (Front)

Game Pad Enclosure Bottom Cover (Back)

Assembly of the matrix enclosure included using hot glue to glue a screw nut into each tab so that screws could be threaded through the back plate to fasten it to the main body of the matrix enclosure. We chose a screw shut design because it would make assembly and disassembly easier during debugging. Assembly of the game pad enclosure included placing standoffs between the top and bottom covers so that screws could be threaded through each cover and into one end of the standoff to hold the game pad enclosure together. Velcro straps were threaded through the cutouts in the bottom cover to hold the power source securely in place. A short 6" USB to micro-USB cable was used to connect the power source to the SJ2 via the cutout in the side of the bottom cover.

Matrix Enclosure Assembled (Front)

Matrix Enclosure Assembled (Back)

Matrix Enclosure Assembled Side View 1

Matrix Enclosure Assembled Side View 2

Game Pad Enclosure Assembled (Front)

Game Pad Enclosure Assembled (Back)

Game Pad Enclosure Assembled Side View

The SJ2 board and MP3 decoder board are mounted on the matrix enclosure's back plate, and 6" power and audio cables are run through to the outside of the enclosure for easy plug in access. The game pad enclosure's SJ2 board sits in the bottom cover, and a 6" USB to micro-USB cable runs from the power supply and plugs into the SJ2 board by plugging in through the cutout in the bottom cover.

Matrix Enclosure Inside View

Game Pad Enclosure Inside View

Game Pad Enclosure Inside Side View

Gameplay

The matrix controller board has a total of 9 tasks running in order to transmit/receive bluetooth data, manage the LED matrix graphics, manage and update the game play, and play background music.

Matrix Controller Tasks

Bluetooth Transmit - transmits controller type that the player selects in the options menu.
Bluetooth Receive - receives the button presses and character movement direction data from the game pad.
Update Board - updates the graphics displayed on the LED matrix.
Draw Character - draws the character on the LED matrix based on the direction data received from the game pad.
Collision Detection - calls our collision detection function which checks for all types of collision between game objects.
Bullet Handler - draws and clears the bullet, and calls a function that checks for any collisions between the bullet and another game object.
Character Status Handler - updates the character's "hurt" status, and decrements the air (health) bar.
State Machine - calls our state machine function which manages our gameplay and screen transitions.
Play Music - plays a specific MP3 track based on the current game state.

State Machine

A State Machine was developed to control the flow of the gameplay to both synchronize the games various Tasks but also give the player an enjoyable User Interface in between levels.

The main states of the game are:

The title screen which lets people start the game or go to the options menu
The option screen which lets users pick the volume level of the game or pick the control type they want to play with.
The four screens which compromise a level
The Victory Screen if the player happens to make it out of the level with the big chest
The Game Over Screen which shows up if the player dies

As the player moves between States, various bool flags are checked based on various factors to see if the Player should be allowed to move on to the next screen.

Software Design

The Game Logic of Treasure Diver

From this State Machine a Player begins in the TITLE State. From there they can move an on screen cursor using the Joystick Controls and select button to start the game or go to OPTIONS. From OPTIONS the player can also move the cursor to adjust volume, set the controls to motion controls or use the cancel button to return to TITLE. If start Game is selected then initial parameters for the Game are set and the task that draws and controls the Character is given the flag to turn on, SCREEN1 is then jumped to. Screen1 is where the game starts properly; within it the levels are drawn which include the enemies, obstacles, chests, and UI elements. The music that played on the TITLE screen will also swatch to active game music. The player must move to the bottom of the screen to descend into the next SCREEN2, SECREEN3, and finally SCREEN4. If the player collides with enemies or takes too long, they lose a bit of air. Once a player runs out of air on any of the SCREENs they get a GAMEOVER and return to the TITLE screen. Descending until SCREEN4, the player than has to collect a big Chest known as the Motherload. Once they collect that chest they can begin their ascent back up the SCREENS. If the Player manages to ascend past SCREEN1 they go the VICTORY screen. There score is displayed to them and they can hit any button to go the next level back on SCREEN1 or if they have competed all levels, back to the TITLE screen

Implementation

A switch case statement was used to implement this game as follows

switch (State) {
 case TITLE:
 switch (menu_select) {
   case START_GAME:
     SetInitalGameValues()
     GoTo(Screen1)
   case GO_TO_OPTIONS:
     ResetCursor();
     GoTo(OPTIONS);

 case SCREEN1:
   drawLevel()
   checkForAir()
   CheckforCollsions()
   if(at the bottom)
   GoTo(SCREEN2 then to SCREEN3)
   if(bigChestGotten && At the top)
   VICTORRRRRY!!!

 case SCREEN 2 ||3
   drawLevel()
   checkForAir()
   CheckforCollsions()
   if(at the bottom)
   GoTo(SCREEN2 || SCREEN3)
   if(Big Chest Gotten)
    ASCEND!!!!

 case SCREEN4
   drawLevel()
   checkForAir()
   CheckforCollsions()
   if(Big Chest Gotten)
    ASCEND!!!!

 case Victory
   resetLevel&Charcter();
   if(More LEVELS?)
    GoTo(Screen1)
   else
    GoTo(TITLE)

 case Game over
   resetLevel&Charcter();
   if(any BUTTON)
    GoTo(TITLE)

Collision Detection

We have several different types of collisions that we check for in our treasure diver game:

Character collides with obstacle
Character collides with enemy
Character collides with treasure chest
Bullet collides with obstacle
Bullet collides with enemy

We only check for collisions between objects where we need a specific event to occur. We don't check for a collision between the bullet and treasure chest for example because we don't need anything to happen in that case. The bullet just simply passes over the treasure chest and we don't need to deduct points, adjust air level, or anything. The collisions we do check for are ones that involve increasing/decreasing the player's score or air level, or have an effect on the game character's movement or status.

Software Design

The software design for each collision detection is described in the below flowcharts. The coding implementation is very lengthy and can be viewed in our GitLab repository.

RGB LED Matrix

The Adafruit 64 X 64 LED matrix is responsible for displaying our Game elements to the player.

Hardware Design

The Technical Specifications of our Matrix are as follows:

Brightness: 2800cd/square meter
Size: 160x160mm
Pitch: 2.5M
5 Addressable Pins
Compatible with M3 mounting screws
Scan: 1/32
Refresh Frequency: >=400HZ

Two pin Sets, Input & Output, are located on the back of the Matrix along with a 2 VCC & 2 GND pins. The power pins require an external power supply capable of providing 5v at a bare minimum 4A of current, which were hooked up to a power supply via the spade connectors provided with the board . Any less than that will be insufficient if the whole board must be lit up. The input pins are where the Sjtwo microcontroller connects to drive this board. The output Pins are for chaining together multiple matrices together and was unused for this project. To drive the matrix, 14 GPIO pins were selected and made into output pins to control the input block of the matrix and two GND pins were used. The Pins and their connections are as follows:

S.NO	RGB LED pins	Function
1	R1	High R data
2	G1	High G data
3	B1	High B data
4	R2	Low R data
5	G2	Low G data
6	B2	Low B data
7	A	Row select A
8	B	Row select B
9	C	Row select C
10	D	Row select D
11	E	Row select E
12	CLK	Clock signal.
13	OE	Output enables to cascade LED panel.
14	LAT	Latch denotes the end of data.
15	VCC	5V
16	GND	GND

The LEDs on the matrix are tricolor RGBs which means we have 8 color combinations at our disposal. Each color of each register is driven by one bit in a 3 bit shift register (3 bits for 3 colors). Those bits are then controlled by the RGB pins on the matrix. The board contains 4096 LEDs and has a scan rate of 1:32. A scan rate simply states what percentage of the LEDs are ON at any given time. So 4096/32 means that 128 LEDs are active on the board at any given time. This number divided by two neatly translates into 64 which is one row of our LED Matrix. The matrix is spilt into two halves, a lower and upper portion, and data is sent to those halves through the RGB pins. RGB1 denotes the upper 32 rows of the board and RGB2 denotes the bottom 32 rows. Of our 128 active LEDs, one row in the lower and upper portions is lit up each. The shift registers for each LED are daisy chained together to allow us to drive all LEDs in a row at the same time. To select which row we light up we use the 5 address pins A,B,C,D,E. 5 pins means we have 2^5 = 32 addressable rows we can select.

LED selection process

Scan Rate of the Board

The CLK pin is used to signal the arrival of one bit of data. The CLK must be toggled every time data is entered for one LED. The LATCH pin is used to signal the end of a row of data. Latch must be pulled high to control the Address Pins and then pulled back down to signal that the row has been selected. Output Enable (OE) is also set high with Latch to turn off the LEDs while the row is being selected and then clr low to turn them back on.

Software Design

Implementation

Now knowing what the hardware is like we can set the steps to draw one pixel on the board like so:

Represent what color you wish to draw to board using 3 bits
Now determine if the LED you want to light up is in the UPPER or LOWER parts of the board and choose RGB1 or RGB2 pins respectively to set
Set the bits and Clock them in with the rest of the LEDs by toggling the CLK (You can set the other LEDs to be off by clocking in zero)
Once a full row has been entered, disable Output and set Latch High
Using A,B,C,D,E pins, specify the row your target LED is on
Set Latch back down to low and re-enable the Output

Representing our colors is done by driving (or not driving) the RGB pins on the matrix. R means red, G means blue, and B means blue and setting those bits together results in a color combo of the set set bits. Three pins means we only need three bits to represent the color we want. If the Sjtwo board is going to be picking the LEDs to draw it would be very handy if it had its own internal representation of the matrix. We can do so with a matrix!

uint8_t led_matrix[ROW_LENGTH][COL_LENGTH];

In this 2d array we can say in each column of each row represent one LED. Now we also know that if an LED is located in the upper portion of the Board(Rows 0 - 31) its going to need to use the RGB1 and if in the lower portion (Rows 32-63) then its going to use the RGB2 pins. Since the color to write to the board is only 3 bits why not say the location of those bits determines which set of pins to drive?

//If RGB denotes my color and I want to light up red and my LED is at the first Row then I can say the entry for that matrix looks like
uint8_t color = 0b100 //Red, but not blue or green
led_matrix[0][desired_led] = color;

//But if my LED is in the upper portion I can shift the bits up three positions
led_matrix[35][desired_led] = color<<3;

This gives the Sjtwo board the ability to distinguish which Pins it must set to get the desired color at the desired location and so now we can update all the values of our board like so:

void led_driver__updateDisplay(void) {
 for (uint8_t row = 0; row < 64; row++) {
   for (uint8_t col = 0; col < 64; col++) {
     if (led_matrix[row][col] & 0x1) {
       gpio__set(B1);
     } else {
       gpio__reset(B1);
     }
     if (led_matrix[row][col] & 0x2) {
       gpio__set(G1);
     } else {
       gpio__reset(G1);
     }
     if (led_matrix[row][col] & 0x4) {
       gpio__set(R1);
     } else {
       gpio__reset(R1);
     }
     if (led_matrix[row][col] & 0x8) {
       gpio__set(B2);
     } else {
       gpio__reset(B2);
     }
     if (led_matrix[row][col] & 0x10) {
       gpio__set(G2);
     } else {
       gpio__reset(G2);
     }
     if (led_matrix[row][col] & 0x20) {
       gpio__set(R2);
     } else {
       gpio__reset(R2);
     }
     ClockToggle();
   }

   disableOutput();
   LatchEnable();

   ClearAddressLines();

   if (row & 0x1) {
     gpio__set(A);
   }
   if (row & 0x2) {
     gpio__set(B);
   }
   if (row & 0x4) {
     gpio__set(C);
   }
   if (row & 0x8) {
     gpio__set(D);
   }
   if (row & 0x10) {
     gpio__set(E);
   }
   LatchDisable();
   enableOutput();
 }
}

The last problem to solve is that our board requires a refresh frequency >=400HZ. We can use tasks calls this function constantly to update the board at a frequency dependent on the VtaskDelay():

void updateBoard(void *p) {

 while (1) {
   led_driver__updateDisplay();
   vTaskDelay(3);
 }
}

MP3 Decoder

The YX5300 MP3 Music Player Module is used in the project to play music at the menu, gameplay and at the Victory/Gameover screen. Although we use it to decode MP3 files, it can also decode MAV files. This board contains a slot for SD card mounting, which we command the module to read from. Insert diagram of MP3 decoder connected to sj2 (using pictures of actual modules)

Image of MP3 Decoder board used in our project from Amazon

Hardware Design

This module is easy to interface since it only uses UART pins (Rx and Tx), excluding the Vcc and Ground. A voltage level of 3.3V was used to power the board, and was supplied from the SJ2 board. The MP3 decoder was connected to 2 of SJ2's port 2 pins that have UART functionality. The baud rate required for communication is 9600 bps. This decoder also contains an audio jack to connect headphones or speakers.

Connection diagram of MP3 decoder to SJ2 board.

Software Design

For ease of code reading, memory was unionized so it may be accessed as an array and by variable names that correspond to the command packet format that is specified in the module's datasheet. The SJ2 board initializes UART for communicating to the MP3 decoder and allocates memory to load packet information before sending via Tx line. Before sending any other command, we must command the decoder to select device 2 (as described in the datasheet).

In the project we wait for an event, such as entering the title screen or game to start playing music.

MP3 Decoder flowchart

Below, are snippets of the code used to setup the commands and send them. A command we used in our Treasure Diver project was to cycle through music in one folder. The function that send this command is called mp3_decoder__Cycle_play_folder(). Within commands, there are two function calls for setting up the packet (set_command_and_data()) and the other for sending the packet over UART (send_command()). For more information on the command packet, see the implementation section.

void mp3_decoder__cycle_play_folder(uint8_t folder) {
  set_command_and_data(mp3_decoder__cycle_folder, folder, no_data);
  send_command();
}

static void set_command_and_data(uint8_t command, uint8_t data0, uint8_t data1) {
  command_message.decoder_command_byte.command_byte = command;
  command_message.decoder_command_byte.data_byte0 = data0;
  command_message.decoder_command_byte.data_byte1 = data1;
}

static void send_command(void) {
  uint8_t i = 0;
  while (i < 8) {
    if (uart__polled_put(uart, command_message.decoder_command.bytes[i])) {
      i++;
    }
  }
}

Implementation

The datasheet specifies the command packet to the MP3 decoder to be a minimum size of 8 bytes composed of the START, VERSION, LENGTH, COMMAND, FEEDBACK, DATA (min of 2 bytes), and END bytes. To make the implementation self explanatory and easy to use (via array), the commands were placed in a unionized memory location (shown below). This approach made it easier

typedef struct {
  uint8_t bytes[8]; ///< 8 bytes of a mp3 decoder message
} mp3_decoder__command_t;

typedef union {
  mp3_decoder__command_t decoder_command; ///< 64-bit command message to decoder
  struct {
    uint64_t start_byte : 8;    // Will be set to 0x7E
    uint64_t version_byte : 8;  // Will be set to 0xFF
    uint64_t data_length : 8;   // Will be set to 0x06
    uint64_t command_byte : 8;  // Varies
    uint64_t feedback_byte : 8; // Will be set to 0x00
    uint64_t data_byte0 : 8;    // Varies
    uint64_t data_byte1 : 8;    // Varies
    uint64_t end_byte : 8;      // Will be set to 0xxEF
  } decoder_command_byte;
} mp3_decoder__msg_t;

The commands were structured as an enum for dedicated functions to use in setting command_byte in the command packet via decoder_command_byte members. Once the command is set, the packet is accessed as an array to simplify sending over UART.

Bluetooth Interface

We used two HC-05 bluetooth modules for our project, one on the game pad controller board acting as master, and one on the matrix controller board acting as slave. The master bluetooth module transmitted joystick, accelerometer, and button press data to the slave bluetooth module. The slave bluetooth module transmitted controller input type data (accelerometer or joystick) to the master bluetooth module.

We decided to go with the HC-05 variant of bluetooth modules because they are easy to setup, easy to use, and extremely reliable to the point that we didn't have a single issue with either of these modules. We liked the configurability of the HC-05 because it could be adapted to suit the needs of different projects through its many configuration options. Configuration was done by using AT commands to configure one bluetooth module as master, the other as slave, and to set the UART baud rate to 38400. Additionally, we chose to "lock" the master bluetooth module to its corresponding slave module to prevent it from pairing with another bluetooth device in range.

HC-05 Bluetooth Module

Hardware Design

The HC-05 modules were connected to each board using the same SJ2 pin numbers (UART peripheral #3 on P0.0 and P0.1). Each HC-05 communicates with its respective SJ2 board through a UART interface. The game pad controller SJ2 board processes the button press and joystick signals and sends them to it's bluetooth module via UART. This bluetooth module then send this data to the other bluetooth module. The received button press and joystick signals are then sent to the matrix controller SJ2 board via UART in order for them to be processed. The same logic applies for sending controller input type data (joystick or accelerometer) from the matrix controller SJ2 board to the game pad controller SJ2 board.

HC-05 Bluetooth Module to SJ2 Connections

Software Design

Before the tasks are started on each board, the UART3 peripheral is initialized and the SJ2's P0.0 and P0.1 pins are set to UART pin functions. Each SJ2 board has a "transmit to bluetooth" and "receive from bluetooth" task in order to constantly transmit and receive commands to/from its connected bluetooth module. The matrix controller board's transmit task transmits the controller input type data that the user has selected in the options menu. The matrix controller's receive task receives all data sent from the game pad controller's bluetooth device and passes the received data into a handler function. The handler determines what string was received and then calls our controls API to set the proper button presses and character movement.

Matrix Controller Board Bluetooth Software Flow Chart

The game pad controller board's transmit task transmits the joystick/accelerometer direction data, and button press data. The transmit task has a function that calls transmit functions for each type of data to be sent; select button, cancel button, joystick button, and accelerometer/joystick direction data. The game pad controller's receive task receives all data sent from the matrix controller's bluetooth device and passes the received data into a handler function. The handler determines what string was received and then calls our controls API to set the proper controller input type.

Game Pad Controller Board Bluetooth Software Flow Chart

Implementation

The bluetooth driver implementation consisted of initializing the UART3 interface (with transmit and receive queues enabled) between the SJ2 and bluetooth module, and comparing the string received from the bluetooth module with several pre-defined strings in order to determine what command was actually received. For example, if the joystick is tilted upward, the game pad's bluetooth module sends the string "N\r\n", which is the exact string that the matrix controller's bluetooth module receives. This received string is compared against all of the commands we have defined to find a match. In this case, a match will be found with pre-defined string "N\r\n", and so the "set character movement direction to N" function is called.

The matrix controller's received strings are processed by the handler function below that compares the received string against every command that we have defined.

Matrix Controller Received Bluetooth Commands

SELECT - select button on the game pad was pressed
CANCEL - cancel button on the game pad was pressed
CENTERED - character shouldn't move
N - move character up (N direction)
NE - move character NE (not used)
E - move character right (E direction)
SE - move character SE (not used)
S - move character down (S direction)
SW - move character SW (not used)
W - move character left (W direction)
NW - move character NW (not used)

void bluetooth_handler__process_received_bluetooth_command(char string[]) {
  if (strcmp(string, "SELECT\r\n") == 0) {
    controls__set_SELECT_button_pressed(true);
  } else {
    controls__set_SELECT_button_pressed(false);
  }

  if (strcmp(string, "CANCEL\r\n") == 0) {
    controls__set_CANCEL_button_pressed(true);
  } else {
    controls__set_CANCEL_button_pressed(false);
  }

  if (strcmp(string, "CENTERED\r\n") == 0) {
    controls__set_joystick_direction(CENTERED);
  } else if (strcmp(string, "N\r\n") == 0) {
    controls__set_joystick_direction(N);
  } else if (strcmp(string, "NE\r\n") == 0) {
    controls__set_joystick_direction(NE);
  } else if (strcmp(string, "E\r\n") == 0) {
    controls__set_joystick_direction(E);
  } else if (strcmp(string, "SE\r\n") == 0) {
    controls__set_joystick_direction(SE);
  } else if (strcmp(string, "S\r\n") == 0) {
    controls__set_joystick_direction(S);
  } else if (strcmp(string, "SW\r\n") == 0) {
    controls__set_joystick_direction(SW);
  } else if (strcmp(string, "W\r\n") == 0) {
    controls__set_joystick_direction(W);
  } else if (strcmp(string, "NW\r\n") == 0) {
    controls__set_joystick_direction(NW);
  }
}

The matrix controller's transmit strings are sent by the transmit function below. This function is called in a task to continuously transmit this data to the game pad controller board.

void bluetooth_driver__transmit_controller_input_type_data(void) {
  controller_t controller_input = controls__get_controller_input_type();
  char data_to_send[20];

  switch (controller_input) {
  case JOYSTICK:
    sprintf(data_to_send, "JOYSTICK\r\n");
    break;
  case ACCELEROMETER:
    sprintf(data_to_send, "ACCELEROMETER\r\n");
    break;
  default:
    sprintf(data_to_send, "JOYSTICK\r\n");
    break;
  }

  int buffer_index = 0;
  while (data_to_send[buffer_index] != '\0') {
    uart__put(UART__3, data_to_send[buffer_index], 0);
    buffer_index++;
  }
}

The game pad controller's received strings are processed by the handler function below that compares the received string against every command that we have defined.

Game Pad Controller Received Bluetooth Commands

JOYSTICK - set the controller input type to joystick
ACCELEROMETER - set the controller input type to accelerometer

void bluetooth_handler__process_received_bluetooth_command(char string[]) {
  if (strcmp(string, "JOYSTICK\r\n") == 0) {
    controls__set_controller_input_type(JOYSTICK);
  } else if (strcmp(string, "ACCELEROMETER\r\n") == 0) {
    controls__set_controller_input_type(ACCELEROMETER);
  }
}

The game pad controller's transmit strings are sent by the transmit functions below. These functions are called in a task to continuously transmit this data to the matrix controller board. For simplicity, only the select button's transmit function is shown below but the transmit function looks the same for all other button presses (the word "select" is just replaced with the other button press's signal name).

static void bluetooth_driver__transmit_SELECT_button_data(void) {
  char data_to_send[20];
  sprintf(data_to_send, "SELECT\r\n");

  int buffer_index = 0;
  while (data_to_send[buffer_index] != '\0') {
    uart__put(UART__3, data_to_send[buffer_index], 0);
    buffer_index++;
  }

  controls__set_SELECT_button_pressed(false);
}

static void bluetooth_driver__transmit_joystick_data(void) {
  joystick_direction_t joystick_direction = controls__get_joystick_direction();
  char data_to_send[20];

  switch (joystick_direction) {
  case CENTERED:
    sprintf(data_to_send, "CENTERED\r\n");
    break;
  case N:
    sprintf(data_to_send, "N\r\n");
    break;
  case NE:
    sprintf(data_to_send, "NE\r\n");
    break;
  case E:
    sprintf(data_to_send, "E\r\n");
    break;
  case SE:
    sprintf(data_to_send, "SE\r\n");
    break;
  case S:
    sprintf(data_to_send, "S\r\n");
    break;
  case SW:
    sprintf(data_to_send, "SW\r\n");
    break;
  case W:
    sprintf(data_to_send, "W\r\n");
    break;
  case NW:
    sprintf(data_to_send, "NW\r\n");
    break;
  default:
    sprintf(data_to_send, "CENTERED\r\n");
    break;
  }

  int buffer_index = 0;
  while (data_to_send[buffer_index] != '\0') {
    uart__put(UART__3, data_to_send[buffer_index], 0);
    buffer_index++;
  }

  controls__set_joystick_direction(CENTERED);
}

Game Pad Controller

The main components in Game Pad controller are a joystick, accelerometer, two buttons, and bluetooth. The controller is used to send commands and control Steve (the main character) in Treasure Diver, along with navigation of the menus, with the joystick or the SJ2's on-board accelerometer (user's choice). With bluetooth on the game pad, the controller is wireless.

Amazon image of the joystick

On-board accelerometer

Push buttons used for the select and cancel buttons of the Game Pad

Hardware Design

The setup of the game pad's hardware was very simple. The two push buttons (cancel and select) use the same configuration. Both are use a pull up resistor when open (not pressed) and short to ground when pressed. This was done to improve the signal and make sure the SJ2 gpio would read high or low. The accelerometer was easy to initialize since there was already existing API. So, all it required was was reading and properly handling the data to send the command to the master board to control Stave. The joystick require initializing. Although, the input of both was different, the output was essentially the same. The accelerometer and joystick both had analog outputs which would then be read by an analog to digital converter (ADC).

Schematic of Game Pad controller

The outputs would represent the X and Y positions of both devices. The analog stick was also a button that could be pressed, but it was not implemented in the project, due to time constraints.

Software Design

When the software is sending commands, it gets the ADC values and analyzes which direction the accelerometer or joystick is indicating. The flow primarily checks up/down and if it is one of these, then L/R is checked. If one of these is true, the software checks which direction is a greater magnitude. This approach is used for both the accelerometer and joystick.

HC-05 Bluetooth Module to SJ2 Connections

As an example for more clarity, if DOWN is true and RIGHT is true, we then check which directions has a greater value. If the joystick/accelerometer is leaning more in the DOWN direction, then the game pad will send this direction to the Master board.

 
joystick_direction_t joystick_controls__get_joystick_direction(void) {
  joystick_direction_t joysticks_direction = CENTERED;
  const joystick_s current_position = get_joystick_position();

  if (check_up(current_position.y)) {
    if (check_left(current_position.x)) {
      if (current_position.y < (-1 * current_position.x)) {
        joysticks_direction = W;
      } else {
        joysticks_direction = N;
      }
    } else if (check_right(current_position.x)) {
      if (current_position.y < current_position.x) {
        joysticks_direction = E;
      } else {
        joysticks_direction = N;
      }
    } else {
      joysticks_direction = N;
    }
  } else if (check_down(current_position.y)) {
    if (check_left(current_position.x)) {
      if ((-1 * current_position.y) < (-1 * current_position.x)) {
        joysticks_direction = W;
      } else {
        joysticks_direction = S;
      }
    } else if (check_right(current_position.x)) {
      if ((-1 * current_position.y) < current_position.x) {
        joysticks_direction = E;
      } else {
        joysticks_direction = S;
      }
    } else {
      joysticks_direction = S;
    }
  } else {
    if (check_left(current_position.x)) {
      joysticks_direction = W;
    } else if (check_right(current_position.x)) {
      joysticks_direction = E;
    }
  }

Implementation

The axis of the joystick did not match the X and Y of our board positioning. To "rotate" the axis, the function swap_and_shift_axis() was created. The swap really occurs if the ADC port of X-axis is passed to the function so it can return a value to the game pad's Y-axis. The purpose of the shift is to make it easier when checking magnitudes of two different directions, as explained in the previous section.

static uint16_t swap_and_shift_axis(adc_channel_e axis) {
  const uint16_t shift_value = 2250;
  int16_t axis_value = adc__get_channel_reading_w_burst_mode(axis) - shift_value;

  return axis_value;
}

static joystick_s get_joystick_position(void) {
  static joystick_s joystick_pos;

  joystick_pos.x = swap_and_shift_axis(Y_AXIS);
  joystick_pos.y = swap_and_shift_axis(X_AXIS);

  return joystick_pos;
}

Technical Challenges

CAD Enclosures Design

When we received the 3D printed enclosures, some of the holes were smaller than designed. This can happen in FDM printing because plastic is melted and placed layer by layer, which is only accurate to a certain thickness and height. In order to enlarge the holes, a needle file was used to file down the openings until the hole was big enough.
Due to the COVID pandemic, we were unable to access the free 3D printing services offered by SJSU and so we had to pay to get our enclosures printed. Our original design was extremely costly and so the enclosures had to be redesigned twice in order to bring the cost down to an affordable amount. All the redesigning we had to do took a lot of time away from the other aspects of our project and the resulting enclosures were not as fancy as we originally planned, but it was all we could afford.

PCB Design

Our first design of the matrix controller PCB had incorrect pin spacing for the led matrix pins because we accidentally used the wrong footprint. Unfortunately, we didn't notice this until after we had placed the PCB order and so we had to oder a second matrix controller PCB that had the correct matrix pin spacing. Fortunately, we noticed this before our order shipped and so we were able to add the corrected PCB design to our order without any additional delays.

LED Matrix

When testing the game, we observed that if the character hit an obstacle and the joystick direction moving the character towards the obstacle was held for over a second or so, the game character would actually start to move into the obstacle. We realized that this was because the collision detection wasn't updating quick enough, and so we changed the collision detection's task priority from low to high. Using high priority for the collision detection task solved this problem.
Ghosting was some time an issue in which an after image of an obstacle or image would sometimes linger on screen. This may happen because the GND pins on the Sjtwo board are not soldered correctly. After switching over to a PCB to connect the LED and board these issues stopped happening.

MP3 Decoder

The datasheet lacks some information and clarity on initializing the module and with some of the commands. When first using it, non of the commands appeared to work or have any effect. The issue was resolved after sending the command to select a device, which was not explicitly stated in the datasheet. Once this command is first sent, the MP3 decoder now begins accepting commands.

Bluetooth Interface

During testing, we realized that once a bluetooth command was sent, it would repeatedly send instead of just being sent once. For example, when the select button was pressed on the game pad, the select command would continuously send even though the button had been released and was no longer pressed. This is just how the bluetooth device works and so we had to make some modifications in our bluetooth handler code to accommodate this. In order to solve the button press data re-sending issue, we set button press to false immediately after receiving a button press command. In order to solve the joystick/accelerometer data re-sending issue, we defined a default state (CENTERED) which means no character movement, so it didn't matter that the centered command was being sent continuously.

Game Pad Controller

Originally, thresholds for each direction were checked without comparing to another, and it would cause the character to go in a direction that was not intended or not move. When adding comparisons of magnitudes, character control greatly improved.

Advice for Future Students

CAD Enclosures Design

If the 3D printing services offered by the library and SCE club aren't available (due to COVID pandemic), then use Jinxbot. They are the cheapest local option we found and offer shipping or you can pick up locally in Mountain View. They print extremely quickly, we got our prints 3 days after ordering.

PCB Design

Use EasyEDA to design your PCBs. It has an auto-routing feature so you don't have to perform any routing by hand which saves you so much time. It also automatically converts your schematic to components that you just "drag and drop" onto your PCB while the connections are automatically maintained.
Order your PCBs from JLCPCB (integrated into EasyEDA). You'll get them in 1 week.
In EasyEDA, may sure you check the connections for each footprint you're using. Sometimes the footprint's pinout won't exactly match your schematic.
Create a google sheet for all team members to fill out with the SJ2 pins they are using for there device/task. It will help prevent multiple people from using the same pins that may cause confusion down the road and include the voltage required for their device. This will help simplify PCB design when referencing this document. Also include an image of the SJ2 board's pins for referencing while filling out the sheet.

LED Matrix

START EARLY AND FINISH THE LED DRIVER ASAP The longer you take to implement the driver, the more time you have to wait before you can do any actual game development. You will really start feeling it towards the last week where you want to add polish to your game but you no longer have time. You do not want to catch yourself saying "Just one more week".

For the more artistically gifted amongst you, GIMP and MtPaint (open source) are fantastic resources for planning out levels and designing images. For example you can draw out your image and then using a python script or other image processing software you can get 2d array representation of your image that you can place your code. This is going to be much easier than writing entire screens out by hand:

Draw Your images...

And Put Them in a form you can use in Code

Additionally, there are other software tools that can be used to design these screens or other objects for the LED matrix. Pixelable was an app used on the iPad, which allowed exporting the created images and could be opened in MtPaint, if needed.

MP3 Decoder

We were not successful in getting the single cycle command to work for the MP3 decoder so that we would play a specific song in a folder in have it on repeat. So, instead of having SFX, Title/Menu music and level music in there own folders, I created a folder for each song (shown in image below). This allowed us to use the command that cycles all the music in one folder, essentially having the desired result.

Folder structure in SD card

Bluetooth Interface

Using this HC-05 bluetooth terminal app (also linked in reference section) will really help when you're trying to get your bluetooth modules configured initially and during testing/debugging of your bluetooth interface. We were also able to use this app as a game pad to control our character's movement on the LED matrix and send button press signals, which was useful for the members of our team who didn't have a second SJ2 board.

Game Pad Controller

Create a function that prints the X and Y values of the accelerometer and/or joystick. It will be useful for debugging and further understanding the device.

Conclusion

We really enjoyed the process of making this project and have learned so much. Our driver writing skills were honed through writing drivers for each module we used (LED matrix, MP3 decoder, Bluetooth, etc.), our understanding of FreeRTOS API has increased, and we gained some basic game and graphics development skills through the LED matrix aspects of this project. Throughout the entire duration of this project, we encountered numerous challenges such as difficulty getting the LED matrix driver up and running, figuring out how to implement collision detection with so many game objects, writing and maintaining our complex game logic state machine and much more. Additionally, we experienced challenges due to the COVID pandemic particularly for the 3D printing aspects of this project, as we did not have access to SJSU's 3D printing services for students and had to pay a premium price to get our enclosures printed. Due to time constraints, there were parts of our project that had to be changed or couldn't be implemented and so future improvements that we'd like to add would be a fancier matrix enclosure, auto-scrolling during gameplay, adding the in-between cardinal directions for character movement (NE, NW, SE, SW), and assigning a functionality to the switch button on our gamepad's joystick. Despite the challenges and setbacks we faced, we were able to overcome every single one of them in order to build a finished product that we are all proud of.

Project Video

Demo Video Link

Project Source Code

GitLab Code Link

Acknowledgements

We would like to thank our professor Preet and all the ISA's for putting together such a great class and for setting high expectations. This always inspired us to go above and beyond.

References

LED Matrix

MP3 Decoder

MP3 Decoder Datasheets

HC-05 Bluetooth Modules

3D Printing

@@ Line 1: / Line 1: @@
+[[File:Tiger_Tiger_Game_from_Xenoblade_Chronicles_2.png|thumb|1000px|caption|right|Tiger Tiger Game from Xenoblade Chronicles 2]]
 == Treasure Diver ==
+[[File:Final_Project_View_1.jpg|center|800px|thumb|Treasure Diver]]
 == Abstract ==
-Treasure Diver is a single player game in which the player descends into watery depths on the hunt for treasure. The player must dodge obstacles and enemy creatures all while collecting treasure along the way. While descending the player is able to attack enemies at a range which in turn may give them power ups such as extra air, faster move speed, or temporary invincibility. When they reach the bottom they can collect the Motherlode. After that they have to ascend the cavern and make it out with all their treasure in one piece. Hitting an enemy or obstacle causes the player to lose air and a treasure chest and when their air hits zero it’s game over. At the end of a level the player is given a score based on treasure collected, remaining air, and the amount of enemies destroyed.
+Treasure Diver is a single player game in which the player descends into the watery depths on the hunt for treasure. The player must dodge obstacles and enemy creatures all while collecting treasure along the way. While descending, the player is able to attack enemies at a range which in turn increases the player's score. When they reach the bottom of the level, they can collect the large treasure chest called the Motherlode. Once the Motherlode is collected, they have to ascend the cavern and make it out before running out of air. Hitting an enemy causes the player to lose air, a treasure chest, and their score to decrease. When their air hits zero, it’s game over. At the end of a level the player is given their score based on treasure collected, and the amount of enemies destroyed, and can progress to the next level.
 == Objectives ==
-Show list of your objectives.  This section includes the high level details of your project.  You can write about the various sensors or peripherals you used to get your project completed.
+The main objective of this project was to create the treasure diver video game displayed on an RGB LED matrix, one SJ2 board as a graphics processor/matrix controller, and another SJ2 board as a game pad controller. Other objectives are the following:
+* Design custom PCBs for both the game pad and matrix controller SJ2 boards.
+* Design custom 3D printed enclosures for both the matrix and game pad controller.
+* Use the FreeRTOS Real-Time Operating System on both SJ2 boards.
+* Use a wireless interface for communication between both SJ2 boards.
+* Incorporate an acceleration sensor as one of the options to control the game character's movement.
+* Add background music to the game to enhance gameplay experience.
 == Introduction ==
+This project was divided into the following modules for each SJ2 board:
+* Matrix Controller Board: The matrix controller board is responsible for displaying the graphics of the treasure diver game, controlling the treasure diver game logic, playing MP3 tracks based on the current game/menu screen, receiving character movement and button press signals over a bluetooth interface, and sending controller type (accelerometer or joystick) signals over a bluetooth interface.
+* Game Pad Controller Board: The game pad controller board is responsible for processing input joystick, accelerometer and button press signals, controlling the treasure diver game controls logic, sending character movement and button press signals over a bluetooth interface, and receiving controller type (accelerometer or joystick) signals over a bluetooth interface.
+=== How to Play Treasure Diver ===
+The goal of the game is to descend to the bottom of each level, collect the Motherlode (big treasure chest), and make it all the way back to the top of the level before running out of air and with the highest score possible.
+* Using the joystick or accelerometer controls (chosen in options menu) on the game pad controller, move the game character down to the bottom of each screen in each game level.
+* Once the character reaches the bottom of a screen, the next screen of the level will appear.
+* Avoid all the obstacles while descending, collect as many treasure chests and shoot as many enemies as possible to increase your score.
+* You can shoot enemies by pressing the select button on the game pad controller (button on the left).
+* Try not to get hit by any enemies! Doing so will cause you to lose a chest, some air, and your score will decrease. If you run out of air, you lose the game and will have to restart at the first level.
+* Once you get to the last screen of the level, you must collect the big treasure chest at the bottom of the screen before you can start ascending. You get back half of your air when you collect this chest.
+* Now that you've got the Motherlode, move the game character back up to the top of the first screen of the level before you run out of air!
+* Once you reach the top of the first screen in the level, you will enter the next game level.
+* Beat all levels in order to win the treasure diver game!
 === Team Members & Responsibilities ===
 '''Treasure Diver [https://gitlab.com/deharo27/treasure-diver GitLab]'''
-<BR/>
-* <font color="black"> '''Ameer Ali [https://gitlab.com/Ameer12  GitLab] [https://www.linkedin.com/in/_/ LinkedIn]'''
-** <font color="FUCHSIA"> '''LED Matrix Driver'''
-** <font color="orange"> '''Matrix Graphics Development'''
-** <font color="CDCC1C">'''Game Logic Development'''
-** <font color="brown"> '''Gameplay Design'''
-** <font color="B933FF"> '''Wiki Page Management'''
-* <font color="black"> '''Jesus De Haro [https://gitlab.com/deharo27 GitLab] [https://www.linkedin.com/in/jesus-de-haro-66342424 LinkedIn]'''
+'''Ameer Ali [https://gitlab.com/Ameer12  GitLab] [https://www.linkedin.com/in/ameer-ali-13703b127/ LinkedIn]'''
-** <font color="green"> '''Game Pad Controller'''
+* LED Matrix Driver
-** <font color="purple"> '''MP3 Decoder Driver'''
+* Matrix Graphics Development
-** <font color="orange"> '''Matrix Graphics Development'''
+* Game Logic Development
-** <font color="red"> '''PCB Design'''
+* Gameplay Mechanics Design
-** <font color="33BAFF"> '''GitLab Repo Management'''
+* Wiki Page Management
+'''Jesus De Haro [https://gitlab.com/deharo27 GitLab] [https://www.linkedin.com/in/jesus-de-haro-66342424 LinkedIn]'''
+* Game Pad Controller
+* MP3 Decoder Driver
+* Matrix Graphics Development
+* PCB Design
+* GitLab Repo Management
-*  <font color="black">''' Nicholas Kaiser [https://gitlab.com/nichokaiser  GitLab] [https://www.linkedin.com/in/nicholas-kaiser-20888713b/ LinkedIn]'''
+''' Nicholas Kaiser [https://gitlab.com/nichokaiser  GitLab] [https://www.linkedin.com/in/nicholas-kaiser-20888713b/ LinkedIn]'''
-** <font color="blue"> '''Bluetooth Interface'''
+* HC05 Bluetooth Driver and Interface
-** <font color="orange"> '''Matrix Graphics Development'''
+* Matrix Collision Detection Development & Level Design
-** <font color="indigo"> '''CAD Enclosure Design'''
+* CAD Enclosure Design
-** <font color="red"> '''PCB Design'''
+* PCB Design
-** <font color="B933FF"> '''Wiki Page Management'''
+* Wiki Page Management
-<BR/>
 == Schedule ==
@@ Line 40: / Line 65: @@
 ! scope="col"| Start Date
 ! scope="col"| End Date
-! scope="col"| Task
+! scope="col"| Tasks
 ! scope="col"| Status
 |-
@@ Line 147: / Line 172: @@
 * Completed
 * Completed
-*
+* Completed
 |-
@@ Line 190: / Line 215: @@
 * Completed
 * Completed
-*
+* Completed
-*
+* Completed
 * Completed
 * Completed
@@ Line 201: / Line 226: @@
 | 11/28/2020
 |
-* <font color="black">LED matrix side bar data (health, power ups) is displayed and updates correctly
+* <font color="black">LED matrix top bar data (health, power ups) is displayed and updates correctly
 * <font color="black">LED matrix displays character orientation correctly depending on current movement direction
 * <font color="black">Controller input (joystick or accelerometer) option is implemented on game pad controller
@@ Line 209: / Line 234: @@
 |
-*
+* Completed
+* Completed
 * Completed
 * Completed
 * Completed
-*
 * Completed
 |-
@@ Line 220: / Line 245: @@
 | 12/5/2020
 |
-* <font color="black">LED matrix menu screens and game over screens are implemented on matrix
+* <font color="black">LED matrix menu screens and game over/victory screens are implemented on matrix
-* <font color="black">Volume controls in menu are implemented
+* <font color="black">Volume controls and controller input select in the options menu are implemented
 * <font color="black">Integrate circuitry with 3D printed enclosure
 * <font color="black">PCB arrives, conduct PCB testing to ensure proper connections
@@ Line 230: / Line 255: @@
 |
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
 |-
@@ Line 245: / Line 270: @@
 |
 * <font color="black">Finish rough draft of project report
-* <font color="black">Finalize gameplay logic code on master controller
+* <font color="black">Write gameplay logic code on master controller. Gameplay logic should update the score and status bar items correctly
 * <font color="black">LED matrix graphics design for all levels is complete
 * <font color="black">MP3 decoder plays correct song/track during gameplay and for each menu/game over screen
+* <font color="black">Gameplay state machine switches to next state based on user button presses and gameplay progression
 |
-*
+* Completed
-*
+* Completed
-*
+* Completed
-*
+* Completed
+* Completed
 |-
 ! scope="row"| 12
@@ Line 264: / Line 291: @@
 |
-*
+* Completed
-*
+* Completed
-*
+* Completed
 |-
 |}
@@ Line 273: / Line 300: @@
 <BR/>
-== Parts List & Cost ==
+== Parts Lists & Cost ==
-<font color="black">
+=== General Parts ===
-Give a simple list of the cost of your project broken down by components.  Do not write long stories here.
+{| class="wikitable"
+|-
+! scope="col"| Item #
+! scope="col"| Part
+! scope="col"| Vendor
+! scope="col"| Qty
+! scope="col"| Cost
+|-
+! scope="row"| 1
+| 64x64 RGB LED Matrix
+| [https://www.adafruit.com/product/3649 Adafruit]
+| 1
+| $54.95
+|-
+! scope="row"| 2
+| SJTwo Boards
+| [https://www.amazon.com/Generic-SJTwo-SJ2-SJSU/dp/B08G9LRPZ8/ref=sr_1_4?dchild=1&keywords=sjsu+sj2+board&qid=1603064585&sr=8-4 SJSU]
+| 2
+| $100.00
+|-
+! scope="row"| 3
+| HC-05 Bluetooth Boards
+| [https://www.amazon.com/HiLetgo-Wireless-Bluetooth-Transceiver-Arduino/dp/B07VL725T8/ref=sr_1_1_sspa?crid=33A9FNACE2NIR&dchild=1&keywords=hc05%2Bbluetooth%2Bmodule&qid=1601166360&sprefix=hc05%2B%2Caps%2C332&sr=8-1-spons&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEzMzBXSVVINTFWSFVHJmVuY3J5cHRlZElkPUEwNDc3NzMyMzc0RFM0OEY5MDgyWiZlbmNyeXB0ZWRBZElkPUEwNjgxMDUxMjlXTU9IMEJZTzMyUyZ3aWRnZXROYW1lPXNwX2F0ZiZhY3Rpb249Y2xpY2tSZWRpcmVjdCZkb05vdExvZ0NsaWNrPXRydWU&th=1 Amazon]
+| 2
+| $12.59
+|-
+! scope="row"| 4
+| MP3 Decoder/Player Board
+| [https://www.amazon.com/dp/B07JCXWY9M/ref=dp_prsubs_1 Amazon]
+| 1
+| $7.39
+|-
+! scope="row"| 5
+| Speakers (with audio jack connection)
+| already had
+| 1
+| $0
+|-
+! scope="row"| 6
+| Audio Jack Cable
+| already had
+| 1
+| $0
+|-
+! scope="row"| 7
+| MicroSD Card & Adapter (32GB or smaller)
+| [https://www.amazon.com/Micro-Center-Class-Memory-Adapter/dp/B07YLYX4NL/ref=sr_1_1_sspa?crid=PQLNZKNA7P1G&dchild=1&keywords=micro%2Bsdhc%2Bcards&qid=1603065366&sprefix=micro%2Bsdhc%2Caps%2C201&sr=8-1-spons&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEzUlI1UURLSFhSRTVSJmVuY3J5cHRlZElkPUEwNDkwNzY2MjVIMU1TRUhST0hITCZlbmNyeXB0ZWRBZElkPUEwMDU3MTM5MURQV0tGMkdUTVZMVSZ3aWRnZXROYW1lPXNwX2F0ZiZhY3Rpb249Y2xpY2tSZWRpcmVjdCZkb05vdExvZ0NsaWNrPXRydWU&th=1 Amazon]
+| 1
+| $5.99
+|-
+! scope="row"| 8
+| Power Supply for LED Matrix (5V 5A)
+| [https://www.amazon.com/ALITOVE-Converter-5-5x2-1mm-100V-240V-Security/dp/B078RT3ZPS/ref=sr_1_4?crid=BALZOSLP5PLR&dchild=1&keywords=5v+4a+power+supply&qid=1603001570&sprefix=5v+4a+%2Caps%2C215&sr=8-4 Amazon]
+| 1
+| $14.99
+|-
+! scope="row"| 9
+| Tactile Push Buttons
+| [https://www.amazon.com/Gikfun-12x12x7-3-Tactile-Momentary-Arduino/dp/B01E38OS7K/ref=sr_1_8?crid=17JSIOHM6IY31&dchild=1&keywords=tactile+push+button&qid=1603001403&sprefix=tactile+push+%2Caps%2C200&sr=8-8 Amazon]
+| 2
+| $7.98
+|-
+! scope="row"| 10
+| Analog Thumbstick
+| [https://www.amazon.com/gp/product/B00P7QBGD2/ref=ppx_yo_dt_b_asin_title_o01_s00?ie=UTF8&psc=1 Amazon]
+| 1
+| $4.89
+|-
+! scope="row"| 11
+| Power Bank
+| already had
+| 1
+| $0
+|-
+! scope="row"| 12
+| 6" USB to Micro-USB Cable
+| [https://www.amazon.com/6in-Micro-USB-Cable-6-inches/dp/B003YKX6WM/ref=sr_1_2_sspa?crid=377W03YGYKNZK&dchild=1&keywords=micro+usb+cable&qid=1603063719&refinements=p_n_feature_keywords_three_browse-bin%3A7070220011&rnid=5462369011&s=electronics&sprefix=micro+usb%2Caps%2C207&sr=1-2-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUExNDRKMlRVTFhDMFAyJmVuY3J5cHRlZElkPUEwMjk4ODk0U1MxTUc4WTY2REdBJmVuY3J5cHRlZEFkSWQ9QTA3MTE2NTQzR1hOOEhQRzQ3NjFEJndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ== Amazon]
+| 1
+| $5.19
+|-
+|}
+=== Game Pad PCB Components ===
+{| class="wikitable"
+|-
+! scope="col"| Item #
+! scope="col"| Part
+! scope="col"| Vendor
+! scope="col"| Qty
+! scope="col"| Cost
+|-
+! scope="row"| 1
+| M3 Size (or smaller) Screws & Nuts
+| [https://www.amazon.com/Litorange-Standoff-Threaded-Motherboard-Assortment/dp/B07D7828LC/ref=sr_1_13?crid=2CJ6UINEGEGBD&dchild=1&keywords=pc%2Bstandoff&qid=1606031423&sprefix=pc%2Bstandoff%2Caps%2C210&sr=8-13&th=1 Amazon]
+| 4
+| $11.99
+|-
+! scope="row"| 2
+| 5-pin Right Angle Male Header
+| [https://www.amazon.com/MCIGICM-Header-2-45mm-Arduino-Connector/dp/B07PKKY8BX/ref=sr_1_6?dchild=1&keywords=angled+male+header&qid=1607909410&sr=8-6 Amazon]
+| 1
+| $4.99
+|-
+! scope="row"| 3
+| 6-pin Right Angle Female Header
+| [https://www.amazon.com/Generic-Female-Header-Arduino-LilyPad/dp/B00OE8GTQ8/ref=sr_1_1_sspa?dchild=1&keywords=right+angle+female+header&qid=1606031306&sr=8-1-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUExM0hVU0JJSDNUT1RJJmVuY3J5cHRlZElkPUEwOTQzNDYxMTFBNURMVlZFVkhRVCZlbmNyeXB0ZWRBZElkPUEwNzA5MjY1RzM5OFJOOFpDVkk5JndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ== Amazon]
+| 1
+| $7.99
+|-
+! scope="row"| 4
+| 1K Through-Hole Resistors
+| [https://www.amazon.com/EDGELEC-Resistor-Tolerance-Resistance-Optional/dp/B07HDDWFDD/ref=sr_1_2_sspa?dchild=1&keywords=1k+resistor&qid=1607910798&sr=8-2-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUEyTzVKVVlQUjNTOUtQJmVuY3J5cHRlZElkPUEwNzgzODA5M0RNQ01UMlFZOU1BJmVuY3J5cHRlZEFkSWQ9QTAzMDUwNTMzTUJGSE1HMFRMVUQ3JndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ== Amazon]
+| 2
+| $5.69
+|-
+! scope="row"| 5
+| 2x20 Female Header
+| [https://www.amazon.com/Antrader-2-54mm-2x20Pin-Female-Connector/dp/B07D48WZTR/ref=sr_1_2?crid=18T2XD2YN1Q4N&dchild=1&keywords=2x20+female+header&qid=1606031794&sprefix=2x20+female%2Caps%2C204&sr=8-2 Amazon]
+| 1
+| $6.99
+|-
+! scope="row"| 6
+| Male Header Pins
+| [https://www.amazon.com/MCIGICM-Header-2-45mm-Arduino-Connector/dp/B07PKKY8BX/ref=sr_1_1?dchild=1&keywords=male+header+pins&qid=1606031634&sr=8-1 Amazon]
+| 16
+| $4.99
+|-
+|}
+=== Matrix Controller PCB Components ===
+{| class="wikitable"
+|-
+! scope="col"| Item #
+! scope="col"| Part
+! scope="col"| Vendor
+! scope="col"| Qty
+! scope="col"| Cost
+|-
+! scope="row"| 1
+| 2.1mm DC Power Jack (Breadboard Compatible)
+| [https://www.adafruit.com/product/373?gclid=Cj0KCQiAqdP9BRDVARIsAGSZ8AmoqyEZ3ywLHCW-T8hu5uJwEp4wzboZfKUYKdlp0NmiShe7FXfPmS0aAr68EALw_wcB Adafruit]
+| 1
+| $0.95
+|-
+! scope="row"| 2
+| 2-pin Screw Terminal Block
+| [https://www.amazon.com/Tegg-Screw-Terminal-Connector-Arduino/dp/B07QRHJ489/ref=sr_1_10?crid=3JKM1QW5R745K&dchild=1&keywords=2+pin+screw+terminal+block&qid=1606029707&sprefix=2+pin+screw+termin%2Caps%2C207&sr=8-10 Amazon]
+| 1
+| $5.99
+|-
+! scope="row"| 3
+| 2x20 Female Header
+| [https://www.amazon.com/Antrader-2-54mm-2x20Pin-Female-Connector/dp/B07D48WZTR/ref=sr_1_2?crid=18T2XD2YN1Q4N&dchild=1&keywords=2x20+female+header&qid=1606031794&sprefix=2x20+female%2Caps%2C204&sr=8-2 Amazon]
+| 1
+| $6.99
+|-
+! scope="row"| 4
+| 4-pin Right Angle Male Header
+| [https://www.amazon.com/MCIGICM-Header-2-45mm-Arduino-Connector/dp/B07PKKY8BX/ref=sr_1_6?dchild=1&keywords=angled+male+header&qid=1607909410&sr=8-6 Amazon]
+| 1
+| $4.99
+|-
+! scope="row"| 5
+| 6-pin Right Angle Female Header
+| [https://www.amazon.com/Generic-Female-Header-Arduino-LilyPad/dp/B00OE8GTQ8/ref=sr_1_1_sspa?dchild=1&keywords=right+angle+female+header&qid=1606031306&sr=8-1-spons&psc=1&spLa=ZW5jcnlwdGVkUXVhbGlmaWVyPUExM0hVU0JJSDNUT1RJJmVuY3J5cHRlZElkPUEwOTQzNDYxMTFBNURMVlZFVkhRVCZlbmNyeXB0ZWRBZElkPUEwNzA5MjY1RzM5OFJOOFpDVkk5JndpZGdldE5hbWU9c3BfYXRmJmFjdGlvbj1jbGlja1JlZGlyZWN0JmRvTm90TG9nQ2xpY2s9dHJ1ZQ== Amazon]
+| 1
+| $7.99
+|-
+! scope="row"| 6
+| Male Header Pins
+| [https://www.amazon.com/MCIGICM-Header-2-45mm-Arduino-Connector/dp/B07PKKY8BX/ref=sr_1_1?dchild=1&keywords=male+header+pins&qid=1606031634&sr=8-1 Amazon]
+| 20
+| $4.99
+|-
+! scope="row"| 7
+| 2x8 Box Header
+| [https://www.amazon.com/uxcell-16-Pin-Straight-Shrouded-Connector/dp/B01N8XTFB5/ref=sr_1_4?dchild=1&keywords=box+header&qid=1606037460&sr=8-4 Amazon]
+| 1
+| $9.99
+|-
+|}
+=== Matrix & Game Pad Enclosure Parts ===
+{| class="wikitable"
+|-
+! scope="col"| Item #
+! scope="col"| Part
+! scope="col"| Vendor
+! scope="col"| Qty
+! scope="col"| Cost
+|-
+! scope="row"| 1
+| Game Pad and Matrix Enclosures
+| custom design
+| 1
+| $153.34
+|-
+! scope="row"| 2
+| M3 Size (or smaller) Screws & PCB Standoffs
+| [https://www.amazon.com/Litorange-Standoff-Threaded-Motherboard-Assortment/dp/B07D7828LC/ref=sr_1_13?crid=2CJ6UINEGEGBD&dchild=1&keywords=pc%2Bstandoff&qid=1606031423&sprefix=pc%2Bstandoff%2Caps%2C210&sr=8-13&th=1 Amazon]
+| 18
+| $11.99
+|-
+! scope="row"| 3
+| #8-32 x 1/2 inch Machine Screws & Nuts
+| [https://www.homedepot.com/p/8-32-x-1-2-in-Combo-Round-Head-Zinc-Plated-Machine-Screw-8-Pack-803091/204274611#overlay Home Depot]
+| 8
+| $1.18
+|-
+! scope="row"| 4
+| Male Header Pins
+| [https://www.amazon.com/MCIGICM-Header-2-45mm-Arduino-Connector/dp/B07PKKY8BX/ref=sr_1_1?dchild=1&keywords=male+header+pins&qid=1606031634&sr=8-1 Amazon]
+| 12
+| $4.99
+|-
+! scope="row"| 5
+| Hot Glue Gun & Hot Glue Sticks
+| already had
+| 1
+| $0
+|-
+! scope="row"| 6
+| 6" Slim Headphone Jack Extender (Male to Female)
+| [https://www.amazon.com/gp/product/B07JMTZZRY/ref=ox_sc_saved_title_1?smid=A3SP9D0HBLLG4I&psc=1 Amazon]
+| 1
+| $6.99
+|-
+! scope="row"| 7
+| 6" DC Power Jack Extender (Male to Female)
+| [https://www.amazon.com/gp/product/B017L2S3J4/ref=ox_sc_saved_title_2?smid=AT67SYRN64CNI&psc=1 Amazon]
+| 1
+| $9.89
+|-
+! scope="row"| 8
+| Velcro Straps (20mm wide)
+| [https://www.amazon.com/gp/product/B087LY9MSM/ref=ewc_pr_img_1?smid=AWJ2J4R8B8ZQN&psc=1 Amazon]
+| 2
+| $6.59
+|-
+|}
 == Design & Implementation ==
-Insert diagram of all modules connected to each sj2 board (using pictures of actual modules)
+=== PCB Design ===
+We chose EasyEDA as our PCB designing software since it is completely free to use with no trial period. Additionally, EasyEDA has a handy auto-routing feature, and the ability to create a PCB from a schematic. We designed two PCBs, one for our game pad controller and one for our matrix controller. First, we created separate schematics for both controllers that included all connections. We included extra GND, 3.3V, 5V, and SJ2 pins to accommodate any design changes down the road. We made these extra pins available as header pins on the PCBs.
+[[File:Matrix_Controller_Board_PCB_Schematic.png|center|800px|thumb|Matrix Controller Board PCB Schematic]]
+[[File:Game_Pad_Board_PCB_Schematic.png|center|800px|thumb|Game Pad Board PCB Schematic]]
+Once our schematics were done and checked by each group member several times, we manually checked the footprint for each part we included in the schematic. Some of the parts we chose didn't have a footprint and so we had to search EasyEDA's library to find one. Also, the connections for several of the default footprints were incorrect for our design and had to be manually edited so that each pin corresponded to the correct solder pad. Once the footprints were all verified, we dragged and dropped the footprints onto the PCBs in precisely measured locations to ensure compatibility with our 3D printed enclosures. Next, EasyEDA's auto-routing feature was used and then manually checked to ensure proper connections.
+[[File:Matrix_Controller_PCB_Design_in_EasyEDA.png|center|500px|thumb|Matrix Controller PCB Design in EasyEDA]]
+[[File:Game_Pad_PCB_Design_in_EasyEDA.png|center|700px|thumb|Game Pad PCB Design in EasyEDA]]
+We chose to order our PCBs from JLCPCB due to their fast manufacturing and shipping times, and reasonable PCB and shipping prices. As an added bonus, JLCPCB is integrated into EasyEDA, so ordering your PCB is extremely simple. Once we placed the order, our PCBs only took a week to arrive. We used a multimeter to continuity tested all the connections on the PCBs before hooking them up and didn't run into any incorrect connections during this testing.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Controller_Board_PCB_(Front).jpg|center|500px|thumb|Matrix Controller Board PCB (Front)]]
+|
+|[[File:Matrix_Controller_Board_PCB_(Back).jpg|center|500px|thumb|Matrix Controller Board PCB (Back)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_PCB_(Front).jpg|center|500px|thumb|Game Pad PCB (Front)]]
+|
+|[[File:Game_Pad_PCB_(Back).jpg|center|500px|thumb|Game Pad PCB (Back)]]
+|
+|}
+Once the PCBs were verified, we soldered them up to integrate into our existing circuitry. The game pad PCB has precisely positioned holes so that the joystick can be screwed into the PCB, allowing for a very secure fit. The push buttons on the game pad PCBs were mounted on 10mm nylon standoffs and had header pins soldered to extend their pins. This was done in order to raise the height of the push buttons in order to match the height of the joystick.
-=== PCB Design ===
+{| style="margin-left: auto; margin-right: auto; border: none;"
-Brief description. Insert PCB schematics and pictures of actual pcbs
+|[[File:Matrix_Controller_PCB_(Top)_View_2.jpg|center|500px|thumb|Matrix Controller PCB (Top)]]
+|
+|[[File:Matrix_Controller_PCB_(Bottom).jpg|center|500px|thumb|Matrix Controller PCB (Bottom)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_PCB_(Top)_View_1.jpg|center|500px|thumb|Game Pad PCB (Top) View 1]]
+|
+|[[File:Game_Pad_PCB_(Bottom).jpg|center|500px|thumb|Game Pad PCB (Bottom)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_PCB_(Top)_View_2.jpg|center|500px|thumb|Game Pad PCB (Top) View 2]]
+|
+|[[File:Game_Pad_PCB_(Top)_View_3.jpg|center|500px|thumb|Game Pad PCB (Top) View 3]]
+|
+|}
 === CAD Enclosures Design ===
-Brief description. Insert CAD design screenshots and pics of actual enclosures
+We used the FreeCAD software in order to design our custom enclosures for both the matrix and game pad. We decided to use FreeCAD because it is completely free with no trial period, and lots of documentation and help videos are available online. This software is not without bugs and inefficiencies but this was the only free option we could find that didn't have a trial period, design limitations, or size restrictions. FreeCAD also includes tons of user made workbenches that include pre-made designs for specific parts (screws, nuts, standoffs, etc) which can be useful and a time saver.
+Our matrix enclosure design includes a casing slightly larger than the matrix. A lip was created on the inside for the matrix to rest on. Through taking precise measurements and using a thinner but more flexible outer wall, we were able to make the matrix "snap fit" into the enclosure. We designed tabs on the bottom of the matrix enclosure to place screw nuts into in order to make our enclosure screw shut. Our matrix enclosure design also included a back plate for all the circuitry components to be fastened to. The back plate has screw holes and cutouts for the power and audio cables.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Enclosure_Design_in_AutoCAD_Software.png|center|500px|thumb|Matrix Enclosure Design in AutoCAD Software]]
+|
+|[[File:Matrix_Enclosure_Back_Plate_Design_in_AutoCAD_Software.png|center|500px|thumb|Matrix Enclosure Back Plate Design in AutoCAD Software]]
+|
+|}
+Our game pad enclosure design includes a top and bottom cover for the game pad controller circuitry to sit in. Through taking precise measurements, our game pad controller circuitry fits snugly into the enclosure and is held in place by the SJ2 board's micro-USB port sticking through the cutout in the enclosure's bottom cover. This allows for easy installation and removal which was helpful for debugging. The enclosure's top cover has cutouts for the joystick and two push buttons while the bottom cover has cutouts on its bottom face for velcro straps to secure the power source to the bottom of the game pad enclosure. We designed an inner lip (top cover) and an outer lip (bottom cover) so that the two covers would fit together securely. We designed matching screw hole cutouts for each cover so that the game pad enclosure could be screwed shut.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_Enclosure_Top_Cover_Design_in_AutoCAD_Software.png|center|500px|thumb|Game Pad Enclosure Top Cover Design in AutoCAD Software]]
+|
+|[[File:Game_Pad_Enclosure_Bottom_Cover_Design_in_AutoCAD_Software.png|center|500px|thumb|Game Pad Enclosure Bottom Cover Design in AutoCAD Software]]
+|
+|}
+Getting our enclosures printed proved to be a challenge. Normally, the SJSU library offers free 3D Printing services to students and the SCE club offers free 3D printing services to members, but due to the COVID pandemic, SJSU and all of it's services were shutdown and so we had to explore other options. Online 3D Printing services were incredibly expensive so we chose a local place that printed our enclosures for about $155. Due to the limitations of FDM 3D printing, the screw hole and joystick cutouts on the game pad enclosure and the power jack cutout on the matrix enclosure had to be manually made larger using a needle file but this was the only post-printing modification that had to be made.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Enclosure_(Front).jpg|center|300px|thumb|Matrix Enclosure (Front)]]
+|
+|[[File:Matrix_Enclosure_(Back).jpg|center|300px|thumb|Matrix Enclosure (Back)]]
+|
+|[[File:Matrix_Enclosure_Side_View.jpg|center|400px|thumb|Matrix Enclosure Side View]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Enclosure_Back_Plate_(Front).jpg|center|500px|thumb|Matrix Enclosure Back Plate (Front)]]
+|
+|[[File:Matrix_Enclosure_Back_Plate_(Back).jpg|center|500px|thumb|Matrix Enclosure Back Plate (Back)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_Enclosure_Top_Cover_(Front).jpg|center|500px|thumb|Game Pad Enclosure Top Cover (Front)]]
+|
+|[[File:Game_Pad_Enclosure_Top_Cover_(Back).jpg|center|500px|thumb|Game Pad Enclosure Top Cover (Back)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_Enclosure_Bottom_Cover_(Front).jpg|center|500px|thumb|Game Pad Enclosure Bottom Cover (Front)]]
+|
+|[[File:Game_Pad_Enclosure_Bottom_Cover_(Back).jpg|center|500px|thumb|Game Pad Enclosure Bottom Cover (Back)]]
+|
+|}
+Assembly of the matrix enclosure included using hot glue to glue a screw nut into each tab so that screws could be threaded through the back plate to fasten it to the main body of the matrix enclosure. We chose a screw shut design because it would make assembly and disassembly easier during debugging. Assembly of the game pad enclosure included placing standoffs between the top and bottom covers so that screws could be threaded through each cover and into one end of the standoff to hold the game pad enclosure together. Velcro straps were threaded through the cutouts in the bottom cover to hold the power source securely in place. A short 6" USB to micro-USB cable was used to connect the power source to the SJ2 via the cutout in the side of the bottom cover.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Enclosure_Assembled_(Front).jpg|center|500px|thumb|Matrix Enclosure Assembled (Front)]]
+|
+|[[File:Matrix_Enclosure_Assembled_(Back).jpg|center|500px|thumb|Matrix Enclosure Assembled (Back)]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Matrix_Enclosure_Assembled_Side_View_1.jpg|center|500px|thumb|Matrix Enclosure Assembled Side View 1]]
+|
+|[[File:Matrix_Enclosure_Assembled_Side_View_2.jpg|center|500px|thumb|Matrix Enclosure Assembled Side View 2]]
+|
+|}
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_Enclosure_Assembled_(Front).jpg|center|500px|thumb|Game Pad Enclosure Assembled (Front)]]
+|
+|[[File:Game_Pad_Enclosure_Assembled_(Back).jpg|center|500px|thumb|Game Pad Enclosure Assembled (Back)]]
+|
+|}
+[[File:Game_Pad_Enclosure_Assembled_Side_View.jpg|center|500px|thumb|Game Pad Enclosure Assembled Side View]]
+The SJ2 board and MP3 decoder board are mounted on the matrix enclosure's back plate, and 6" power and audio cables are run through to the outside of the enclosure for easy plug in access. The game pad enclosure's SJ2 board sits in the bottom cover, and a 6" USB to micro-USB cable runs from the power supply and plugs into the SJ2 board by plugging in through the cutout in the bottom cover.
+[[File:Matrix_Enclosure_Inside_View.jpg|center|400px|thumb|Matrix Enclosure Inside View]]
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Game_Pad_Enclosure_Inside_View.jpg|center|500px|thumb|Game Pad Enclosure Inside View]]
+|
+|[[File:Game_Pad_Enclosure_Inside_Side_View.jpg|center|500px|thumb|Game Pad Enclosure Inside Side View]]
+|
+|}
+=== Gameplay ===
+The matrix controller board has a total of 9 tasks running in order to transmit/receive bluetooth data, manage the LED matrix graphics, manage and update the game play, and play background music.
+'''Matrix Controller Tasks'''
+*Bluetooth Transmit - transmits controller type that the player selects in the options menu.
+* Bluetooth Receive - receives the button presses and character movement direction data from the game pad.
+* Update Board - updates the graphics displayed on the LED matrix.
+* Draw Character - draws the character on the LED matrix based on the direction data received from the game pad.
+* Collision Detection - calls our collision detection function which checks for all types of collision between game objects.
+* Bullet Handler - draws and clears the bullet, and calls a function that checks for any collisions between the bullet and another game object.
+* Character Status Handler - updates the character's "hurt" status, and decrements the air (health) bar.
+* State Machine - calls our state machine function which manages our gameplay and screen transitions.
+* Play Music - plays a specific MP3 track based on the current game state.
+==== State Machine ====
+A State Machine was developed to control the flow of the gameplay to both synchronize the games various Tasks but also give the player an enjoyable User Interface in between levels.
+The main states of the game are:
+#The title screen which lets people start the game or go to the options menu
+#The option screen which lets users pick the volume level of the game or pick the control type they want to play with.
+#The four screens which compromise a level
+#The Victory Screen if the player happens to make it out of the level with the big chest
+#The Game Over Screen which shows up if the player dies
+As the player moves between States, various bool flags are checked based on various factors to see if the Player should be allowed to move on to the next screen.
+===== Software Design =====
+[[File:Treasure_diver_State_machine.jpg|center|1000px|thumb|The Game Logic of Treasure Diver]]
+From this State Machine a Player begins in the TITLE State. From there they can move an on screen cursor using the Joystick Controls and select button to start the game or go to OPTIONS. From OPTIONS the player can also move the cursor to adjust volume, set the controls to motion controls or use the cancel button to return to TITLE. If start Game is selected then initial parameters for the Game are set and the task that draws and controls the Character is given the flag to turn on, SCREEN1 is then jumped to. Screen1 is where the game starts properly; within it the levels are drawn which include the enemies, obstacles, chests, and UI elements. The music that played on the TITLE screen will also swatch to active game music. The player must move to the bottom of the screen to descend into the next SCREEN2, SECREEN3, and finally SCREEN4. If the player collides with enemies or takes too long, they lose a bit of air. Once a player runs out of air on any of the SCREENs they get a GAMEOVER and return to the TITLE screen. Descending until SCREEN4, the player than has to collect a big Chest known as the Motherload. Once they collect that chest they can begin their ascent back up the SCREENS. If the Player manages to ascend past SCREEN1 they go the VICTORY screen. There score is displayed to them and they can hit any button to go the next level back on SCREEN1 or if they have competed all levels, back to the TITLE screen
+===== Implementation =====
+A switch case statement was used to implement this game as follows
+ switch (State) {
+  case TITLE:
+  switch (menu_select) {
+    case START_GAME:
+      SetInitalGameValues()
+      GoTo(Screen1)
+    case GO_TO_OPTIONS:
+      ResetCursor();
+      GoTo(OPTIONS);
+  case SCREEN1:
+    drawLevel()
+    checkForAir()
+    CheckforCollsions()
+    if(at the bottom)
+    GoTo(SCREEN2 then to SCREEN3)
+    if(bigChestGotten && At the top)
+    VICTORRRRRY!!!
+  case SCREEN 2 ||3
+    drawLevel()
+    checkForAir()
+    CheckforCollsions()
+    if(at the bottom)
+    GoTo(SCREEN2 || SCREEN3)
+    if(Big Chest Gotten)
+     ASCEND!!!!
+  case SCREEN4
+    drawLevel()
+    checkForAir()
+    CheckforCollsions()
+    if(Big Chest Gotten)
+     ASCEND!!!!
+  case Victory
+    resetLevel&Charcter();
+    if(More LEVELS?)
+     GoTo(Screen1)
+    else
+     GoTo(TITLE)
+  case Game over
+    resetLevel&Charcter();
+    if(any BUTTON)
+     GoTo(TITLE)
+==== Collision Detection ====
+We have several different types of collisions that we check for in our treasure diver game:
+* Character collides with obstacle
+* Character collides with enemy
+* Character collides with treasure chest
+* Bullet collides with obstacle
+* Bullet collides with enemy
+We only check for collisions between objects where we need a specific event to occur. We don't check for a collision between the bullet and treasure chest for example because we don't need anything to happen in that case. The bullet just simply passes over the treasure chest and we don't need to deduct points, adjust air level, or anything. The collisions we do check for are ones that involve increasing/decreasing the player's score or air level, or have an effect on the game character's movement or status.
+===== Software Design =====
+The software design for each collision detection is described in the below flowcharts. The coding implementation is very lengthy and can be viewed in our GitLab repository.
+[[File:Character-Obstacle_Collision_Detection.png|700px|center|Character-Obstacle Collision Detection]]
+[[File:Character-Enemy_Collision_Detection.png|700px|center|Character-Enemy Collision Detection]]
+[[File:Character-Treasure_Chest_Collision_Detection.png|700px|center|Character-Treasure Chest Collision Detection]]
+[[File:Bullet-Obstacle_&_Bullet-Enemy_Collision_Detection.png|700px|center|Bullet-Obstacle & Bullet-Enemy Collision Detection]]
 === RGB LED Matrix ===
-Brief description of what this module does. Insert diagram of led matrix connected to sj2 (using pictures of actual modules)
+The Adafruit 64 X 64 LED matrix is responsible for displaying our Game elements to the player.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+ |[[File:Treasure_Diver_LED_Matrix_backplate.jpg|400px|center]]
+ |[[File:Treasure_Diver_LED_Matrix_front.jpg|400px|center]]
+ |[[File:Treasure_diver_Raw_connection.jpg|575px|center]]
+|}
 ==== Hardware Design ====
-Discuss your hardware design here.  Show detailed schematics, and the interface here. In this section, you can describe how your hardware communicates, such as which BUSes used.  You can discuss your driver implementation here, such that the '''Software Design''' section is isolated to talk about high level workings rather than inner working of your project.
+The Technical Specifications of our Matrix are as follows:
+*Brightness: 2800cd/square meter
+*Size: 160x160mm
+*Pitch: 2.5M
+*5 Addressable Pins
+*Compatible with M3 mounting screws
+*Scan: 1/32
+*Refresh Frequency: >=400HZ
+Two pin Sets, Input & Output, are located on the back of the Matrix along with a 2 VCC & 2 GND pins. The power pins require an external power supply capable of providing 5v at a bare minimum 4A of current, which were hooked up to a power supply via the spade connectors provided with the board . Any less than that will be insufficient if the whole board must be lit up. The input pins are where the Sjtwo microcontroller connects to drive this board. The output Pins are for chaining together multiple matrices together and was unused for this project. To drive the matrix, 14 GPIO pins were selected and made into output pins to control the input block of the matrix and two GND pins were used. The Pins and their connections are as follows:
+[[File:Treasure_diver_Pin_connections.png|500px|right]]
+{| class="wikitable"
+|-
+! align="center"|S.NO
+! align="center"|RGB LED pins
+! align="center"|Function
+|-
+| scope="row" align="center"|1
+| scope="row" align="center"|R1
+| scope="row" align="center"|High R data
+|-
+| scope="row" align="center"|2
+| scope="row" align="center"|G1
+| scope="row" align="center"|High G data
+|-
+| scope="row" align="center"|3
+| scope="row" align="center"|B1
+| scope="row" align="center"|High B data
+|-
+| scope="row" align="center"|4
+| scope="row" align="center"|R2
+| scope="row" align="center"|Low R data
+|-
+| scope="row" align="center"|5
+| scope="row" align="center"|G2
+| scope="row" align="center"|Low G data
+|-
+| scope="row" align="center"|6
+| scope="row" align="center"|B2
+| scope="row" align="center"|Low B data
+|-
+| scope="row" align="center"|7
+| scope="row" align="center"|A
+| scope="row" align="center"|Row select A
+|-
+| scope="row" align="center"|8
+| scope="row" align="center"|B
+| scope="row" align="center"|Row select B
+|-
+| scope="row" align="center"|9
+| scope="row" align="center"|C
+| scope="row" align="center"|Row select C
+|-
+| scope="row" align="center"|10
+| scope="row" align="center"|D
+| scope="row" align="center"|Row select D
+|-
+|-
+| scope="row" align="center"|11
+| scope="row" align="center"|E
+| scope="row" align="center"|Row select E
+|-
+| scope="row" align="center"|12
+| scope="row" align="center"|CLK
+| scope="row" align="center"|Clock signal.
+|-
+| scope="row" align="center"|13
+| scope="row" align="center"|OE
+| scope="row" align="center"|Output enables to cascade LED panel.
+|-
+| scope="row" align="center"|14
+| scope="row" align="center"|LAT
+| scope="row" align="center"|Latch denotes the end of data.
+|-
+| scope="row" align="center"|15
+| scope="row" align="center"|VCC
+| scope="row" align="center"|5V
+|-
+| scope="row" align="center"|16
+| scope="row" align="center"|GND
+| scope="row" align="center"|GND
+|-
+|}
+The LEDs on the matrix are tricolor RGBs which means we have 8 color combinations at our disposal. Each color of each register is driven by one bit in a  3 bit shift register (3 bits for 3 colors). Those bits are then controlled by the RGB pins on the matrix. The board contains 4096 LEDs and has a scan rate of 1:32. A scan rate simply states what percentage of the LEDs are ON at any given time. So 4096/32 means that 128 LEDs are active on the board at any given time. This number divided by two neatly translates into 64 which is one row of our LED Matrix. The matrix is spilt into two halves, a lower and upper portion, and data is sent to those halves through the RGB pins. RGB1 denotes the upper 32 rows of the board and RGB2 denotes the bottom 32 rows. Of our 128 active LEDs, one row in the lower and upper portions is lit up each.  The shift registers for each LED are daisy chained together to allow us to drive all LEDs in a row at the same time. To select '''which''' row we light up we use the 5 address pins A,B,C,D,E. 5 pins means we have 2^5 = 32 addressable rows we can select.
+{|style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:Treasure_diver_Scan_rate.gif|left|400px|thumb|LED selection process]]
+|[[File:Scan116.gif|right|400px|thumb|Scan Rate of the Board]]
+|}
+The CLK pin is used to signal the arrival of one bit of data. The CLK must be toggled every time data is entered for one LED. The LATCH pin is used to signal the end of a row of data. Latch must be pulled high to control the Address Pins and then pulled back down to signal that the row has been selected. Output Enable (OE) is also set high with Latch to turn off the LEDs while the row is being selected and then clr low to turn them back on.
 ==== Software Design ====
-Use a flowchart(s)
 ==== Implementation ====
-Short code snippets or pseudo-code with explanations
+Now knowing what the hardware is like we can set the steps to draw one pixel on the board like so:
+#Represent what color you wish to draw to board using 3 bits
+#Now determine if the LED you want to light up is in the UPPER or LOWER parts of the board and choose RGB1 or RGB2 pins respectively  to set
+#Set the bits and Clock them in with the rest of the LEDs by toggling the CLK (You can set the other LEDs to be off by clocking in zero)
+#Once a full row has been entered, disable Output and set Latch High
+#Using A,B,C,D,E pins, specify the row your target LED is on
+#Set Latch back down to low and re-enable the Output
+Representing our colors is done by driving (or not driving) the RGB pins on the matrix. R means red, G means blue, and B means blue and setting those bits together results in a color combo of the set set bits. Three pins means we only need three bits to represent the color we want. If the Sjtwo board is going to be picking the LEDs to draw it would be very handy if it had its own internal representation of the matrix. We can do so with a matrix!
+ uint8_t led_matrix[ROW_LENGTH][COL_LENGTH];
+In this 2d array we can say in each column of each row represent one LED. Now we also know that if an LED is located in the upper portion of the Board(Rows 0 - 31) its going to need to use the RGB1 and if in the lower portion (Rows 32-63) then its going to use the RGB2 pins. Since the color to write to the board is only 3 bits why not say the location of those bits determines which set of pins to drive?
+ //If RGB denotes my color and I want to light up red and my LED is at the first Row then I can say the entry for that matrix looks like
+ uint8_t color = 0b100 //Red, but not blue or green
+ led_matrix[0][desired_led] = color;
+ //But if my LED is in the upper portion I can shift the bits up three positions
+ led_matrix[35][desired_led] = color<<3;
+This gives the Sjtwo board the ability to distinguish which Pins it must set to get the desired color at the desired location  and so now we can update all the values of our board like so:
+ void led_driver__updateDisplay(void) {
+  for (uint8_t row = 0; row < 64; row++) {
+    for (uint8_t col = 0; col < 64; col++) {
+      if (led_matrix[row][col] & 0x1) {
+        gpio__set(B1);
+      } else {
+        gpio__reset(B1);
+      }
+      if (led_matrix[row][col] & 0x2) {
+        gpio__set(G1);
+      } else {
+        gpio__reset(G1);
+      }
+      if (led_matrix[row][col] & 0x4) {
+        gpio__set(R1);
+      } else {
+        gpio__reset(R1);
+      }
+      if (led_matrix[row][col] & 0x8) {
+        gpio__set(B2);
+      } else {
+        gpio__reset(B2);
+      }
+      if (led_matrix[row][col] & 0x10) {
+        gpio__set(G2);
+      } else {
+        gpio__reset(G2);
+      }
+      if (led_matrix[row][col] & 0x20) {
+        gpio__set(R2);
+      } else {
+        gpio__reset(R2);
+      }
+      ClockToggle();
+    }
+    disableOutput();
+    LatchEnable();
+    ClearAddressLines();
+    if (row & 0x1) {
+      gpio__set(A);
+    }
+    if (row & 0x2) {
+      gpio__set(B);
+    }
+    if (row & 0x4) {
+      gpio__set(C);
+    }
+    if (row & 0x8) {
+      gpio__set(D);
+    }
+    if (row & 0x10) {
+      gpio__set(E);
+    }
+    LatchDisable();
+    enableOutput();
+  }
+ }
+The last problem to solve is that our board requires a refresh frequency >=400HZ. We can use tasks calls this function constantly to update the board at a frequency dependent on the VtaskDelay():
+ void updateBoard(void *p) {
+  while (1) {
+    led_driver__updateDisplay();
+    vTaskDelay(3);
+  }
+ }
 === MP3 Decoder ===
-Brief description of what this module does. Insert diagram of MP3 decoder connected to sj2 (using pictures of actual modules)
+The YX5300 MP3 Music Player Module is used in the project to play music at the menu, gameplay and at the Victory/Gameover screen. Although we use it to decode MP3 files, it can also decode MAV files. This board contains a slot for SD card mounting, which we command the module to read from. Insert diagram of MP3 decoder connected to sj2 (using pictures of actual modules)
+[[File:MP3_Decoder_board.JPG|300px|thumb|center|Image of MP3 Decoder board used in our project from Amazon]]
 ==== Hardware Design ====
-Discuss your hardware design here.  Show detailed schematics, and the interface here. In this section, you can describe how your hardware communicates, such as which BUSes used.  You can discuss your driver implementation here, such that the '''Software Design''' section is isolated to talk about high level workings rather than inner working of your project.
+This module is easy to interface since it only uses UART pins (Rx and Tx), excluding the Vcc and Ground. A voltage level of 3.3V was used to power the board, and was supplied from the SJ2 board. The MP3 decoder was connected to 2 of SJ2's port 2 pins that have UART functionality. The baud rate required for communication is 9600 bps. This decoder also contains an audio jack to connect headphones or speakers.
+[[File:MP3_Decoder_Schematic.JPG|700px|thumb|center|Connection diagram of MP3 decoder to SJ2 board.]]
 ==== Software Design ====
-Use a flowchart(s)
+For ease of code reading, memory was unionized so it may be accessed as an array and by variable names that correspond to the command packet format that is specified in the module's datasheet. The SJ2 board initializes UART for communicating to the MP3 decoder and allocates memory to load packet information before sending via Tx line. Before sending any other command, we must command the decoder to select device 2 (as described in the datasheet).
+In the project we wait for an event, such as entering the title screen or game to start playing music.
+[[File:MP3DecoderFlowChart.JPG|center|250px|thumb|MP3 Decoder flowchart]]
+Below, are snippets of the code used to setup the commands and send them. A command we used in our Treasure Diver project was to cycle through music in one folder. The function that send this command is called mp3_decoder__Cycle_play_folder(). Within commands, there are two function calls for setting up the packet (set_command_and_data()) and the other for sending the packet over UART (send_command()). For more information on the command packet, see the implementation section.
+<pre>
+void mp3_decoder__cycle_play_folder(uint8_t folder) {
+  set_command_and_data(mp3_decoder__cycle_folder, folder, no_data);
+  send_command();
+}
+static void set_command_and_data(uint8_t command, uint8_t data0, uint8_t data1) {
+  command_message.decoder_command_byte.command_byte = command;
+  command_message.decoder_command_byte.data_byte0 = data0;
+  command_message.decoder_command_byte.data_byte1 = data1;
+}
+static void send_command(void) {
+  uint8_t i = 0;
+  while (i < 8) {
+    if (uart__polled_put(uart, command_message.decoder_command.bytes[i])) {
+      i++;
+    }
+  }
+}
+</pre>
 ==== Implementation ====
-Short code snippets or pseudo-code with explanations
+The datasheet specifies the command packet to the MP3 decoder to be a minimum size of 8 bytes composed of the START, VERSION, LENGTH, COMMAND, FEEDBACK, DATA (min of 2 bytes), and END bytes. To make the implementation self explanatory and easy to use (via array), the commands were placed in a unionized memory location (shown below). This approach made it easier
+<pre>
+typedef struct {
+  uint8_t bytes[8]; ///< 8 bytes of a mp3 decoder message
+} mp3_decoder__command_t;
+typedef union {
+  mp3_decoder__command_t decoder_command; ///< 64-bit command message to decoder
+  struct {
+    uint64_t start_byte : 8;    // Will be set to 0x7E
+    uint64_t version_byte : 8;  // Will be set to 0xFF
+    uint64_t data_length : 8;   // Will be set to 0x06
+    uint64_t command_byte : 8;  // Varies
+    uint64_t feedback_byte : 8; // Will be set to 0x00
+    uint64_t data_byte0 : 8;    // Varies
+    uint64_t data_byte1 : 8;    // Varies
+    uint64_t end_byte : 8;      // Will be set to 0xxEF
+  } decoder_command_byte;
+} mp3_decoder__msg_t;
+</pre>
+The commands were structured as an enum for dedicated functions to use in setting command_byte in the command packet via decoder_command_byte members. Once the command is set, the packet is accessed as an array to simplify sending over UART.
 === Bluetooth Interface ===
-Brief description of what this module does. Insert diagram of bluetooth connected to each sj2 (using pictures of actual modules)
+We used two HC-05 bluetooth modules for our project, one on the game pad controller board acting as master, and one on the matrix controller board acting as slave. The master bluetooth module transmitted joystick, accelerometer, and button press data to the slave bluetooth module. The slave bluetooth module transmitted controller input type data (accelerometer or joystick) to the master bluetooth module.
+We decided to go with the HC-05 variant of bluetooth modules because they are easy to setup, easy to use, and extremely reliable to the point that we didn't have a single issue with either of these modules. We liked the configurability of the HC-05 because it could be adapted to suit the needs of different projects through its many configuration options. Configuration was done by using AT commands to configure one bluetooth module as master, the other as slave, and to set the UART baud rate to 38400. Additionally, we chose to "lock" the master bluetooth module to its corresponding slave module to prevent it from pairing with another bluetooth device in range.
+[[File:HC-05_Bluetooth_Module.png|700px|thumb|center|HC-05 Bluetooth Module]]
 ==== Hardware Design ====
-Discuss your hardware design here.  Show detailed schematics, and the interface here. In this section, you can describe how your hardware communicates, such as which BUSes used.  You can discuss your driver implementation here, such that the '''Software Design''' section is isolated to talk about high level workings rather than inner working of your project.
+The HC-05 modules were connected to each board using the same SJ2 pin numbers (UART peripheral #3 on P0.0 and P0.1). Each HC-05 communicates with its respective SJ2 board through a UART interface. The game pad controller SJ2 board processes the button press and joystick signals and sends them to it's bluetooth module via UART. This bluetooth module then send this data to the other bluetooth module. The received button press and joystick signals are then sent to the matrix controller SJ2 board via UART in order for them to be processed. The same logic applies for sending controller input type data (joystick or accelerometer) from the matrix controller SJ2 board to the game pad controller SJ2 board.
+[[File:HC-05_Bluetooth_Module_to_SJ2_Connections.png|700px|thumb|center|HC-05 Bluetooth Module to SJ2 Connections]]
 ==== Software Design ====
-Use a flowchart(s)
+Before the tasks are started on each board, the UART3 peripheral is initialized and the SJ2's P0.0 and P0.1 pins are set to UART pin functions. Each SJ2 board has a "transmit to bluetooth" and "receive from bluetooth" task in order to constantly transmit and receive commands to/from its connected bluetooth module. The matrix controller board's transmit task transmits the controller input type data that the user has selected in the options menu. The matrix controller's receive task receives all data sent from the game pad controller's bluetooth device and passes the received data into a handler function. The handler determines what string was received and then calls our controls API to set the proper button presses and character movement.
+[[File:Matrix_Controller_Board_Bluetooth_Flow_Chart.png|700px|thumb|center|Matrix Controller Board Bluetooth Software Flow Chart]]
+The game pad controller board's transmit task transmits the joystick/accelerometer direction data, and button press data. The transmit task has a function that calls transmit functions for each type of data to be sent; select button, cancel button, joystick button, and accelerometer/joystick direction data. The game pad controller's receive task receives all data sent from the matrix controller's bluetooth device and passes the received data into a handler function. The handler determines what string was received and then calls our controls API to set the proper controller input type.
+[[File:Game_Pad_Controller_Board_Bluetooth_Flow_Chart.png|700px|thumb|center|Game Pad Controller Board Bluetooth Software Flow Chart]]
 ==== Implementation ====
-Short code snippets or pseudo-code with explanations
+The bluetooth driver implementation consisted of initializing the UART3 interface (with transmit and receive queues enabled) between the SJ2 and bluetooth module, and comparing the string received from the bluetooth module with several pre-defined strings in order to determine what command was actually received. For example, if the joystick is tilted upward, the game pad's bluetooth module sends the string "N\r\n", which is the exact string that the matrix controller's bluetooth module receives. This received string is compared against all of the commands we have defined to find a match. In this case, a match will be found with pre-defined string "N\r\n", and so the "set character movement direction to N" function is called.
+The matrix controller's received strings are processed by the handler function below that compares the received string against every command that we have defined.
+'''Matrix Controller Received Bluetooth Commands'''
+* SELECT - select button on the game pad was pressed
+* CANCEL - cancel button on the game pad was pressed
+* CENTERED - character shouldn't move
+* N - move character up (N direction)
+* NE - move character NE (not used)
+* E - move character right (E direction)
+* SE - move character SE (not used)
+* S - move character down (S direction)
+* SW - move character SW (not used)
+* W - move character left (W direction)
+* NW - move character NW (not used)
+<pre>
+void bluetooth_handler__process_received_bluetooth_command(char string[]) {
+  if (strcmp(string, "SELECT\r\n") == 0) {
+    controls__set_SELECT_button_pressed(true);
+  } else {
+    controls__set_SELECT_button_pressed(false);
+  }
+  if (strcmp(string, "CANCEL\r\n") == 0) {
+    controls__set_CANCEL_button_pressed(true);
+  } else {
+    controls__set_CANCEL_button_pressed(false);
+  }
+  if (strcmp(string, "CENTERED\r\n") == 0) {
+    controls__set_joystick_direction(CENTERED);
+  } else if (strcmp(string, "N\r\n") == 0) {
+    controls__set_joystick_direction(N);
+  } else if (strcmp(string, "NE\r\n") == 0) {
+    controls__set_joystick_direction(NE);
+  } else if (strcmp(string, "E\r\n") == 0) {
+    controls__set_joystick_direction(E);
+  } else if (strcmp(string, "SE\r\n") == 0) {
+    controls__set_joystick_direction(SE);
+  } else if (strcmp(string, "S\r\n") == 0) {
+    controls__set_joystick_direction(S);
+  } else if (strcmp(string, "SW\r\n") == 0) {
+    controls__set_joystick_direction(SW);
+  } else if (strcmp(string, "W\r\n") == 0) {
+    controls__set_joystick_direction(W);
+  } else if (strcmp(string, "NW\r\n") == 0) {
+    controls__set_joystick_direction(NW);
+  }
+}
+</pre>
+The matrix controller's transmit strings are sent by the transmit function below. This function is called in a task to continuously transmit this data to the game pad controller board.
+<pre>
+void bluetooth_driver__transmit_controller_input_type_data(void) {
+  controller_t controller_input = controls__get_controller_input_type();
+  char data_to_send[20];
+  switch (controller_input) {
+  case JOYSTICK:
+    sprintf(data_to_send, "JOYSTICK\r\n");
+    break;
+  case ACCELEROMETER:
+    sprintf(data_to_send, "ACCELEROMETER\r\n");
+    break;
+  default:
+    sprintf(data_to_send, "JOYSTICK\r\n");
+    break;
+  }
+  int buffer_index = 0;
+  while (data_to_send[buffer_index] != '\0') {
+    uart__put(UART__3, data_to_send[buffer_index], 0);
+    buffer_index++;
+  }
+}
+</pre>
+The game pad controller's received strings are processed by the handler function below that compares the received string against every command that we have defined.
+'''Game Pad Controller Received Bluetooth Commands'''
+* JOYSTICK - set the controller input type to joystick
+* ACCELEROMETER - set the controller input type to accelerometer
+<pre>
+void bluetooth_handler__process_received_bluetooth_command(char string[]) {
+  if (strcmp(string, "JOYSTICK\r\n") == 0) {
+    controls__set_controller_input_type(JOYSTICK);
+  } else if (strcmp(string, "ACCELEROMETER\r\n") == 0) {
+    controls__set_controller_input_type(ACCELEROMETER);
+  }
+}
+</pre>
+The game pad controller's transmit strings are sent by the transmit functions below. These functions are called in a task to continuously transmit this data to the matrix controller board. For simplicity, only the select button's transmit function is shown below but the transmit function looks the same for all other button presses (the word "select" is just replaced with the other button press's signal name).
+<pre>
+static void bluetooth_driver__transmit_SELECT_button_data(void) {
+  char data_to_send[20];
+  sprintf(data_to_send, "SELECT\r\n");
+  int buffer_index = 0;
+  while (data_to_send[buffer_index] != '\0') {
+    uart__put(UART__3, data_to_send[buffer_index], 0);
+    buffer_index++;
+  }
+  controls__set_SELECT_button_pressed(false);
+}
+static void bluetooth_driver__transmit_joystick_data(void) {
+  joystick_direction_t joystick_direction = controls__get_joystick_direction();
+  char data_to_send[20];
+  switch (joystick_direction) {
+  case CENTERED:
+    sprintf(data_to_send, "CENTERED\r\n");
+    break;
+  case N:
+    sprintf(data_to_send, "N\r\n");
+    break;
+  case NE:
+    sprintf(data_to_send, "NE\r\n");
+    break;
+  case E:
+    sprintf(data_to_send, "E\r\n");
+    break;
+  case SE:
+    sprintf(data_to_send, "SE\r\n");
+    break;
+  case S:
+    sprintf(data_to_send, "S\r\n");
+    break;
+  case SW:
+    sprintf(data_to_send, "SW\r\n");
+    break;
+  case W:
+    sprintf(data_to_send, "W\r\n");
+    break;
+  case NW:
+    sprintf(data_to_send, "NW\r\n");
+    break;
+  default:
+    sprintf(data_to_send, "CENTERED\r\n");
+    break;
+  }
+  int buffer_index = 0;
+  while (data_to_send[buffer_index] != '\0') {
+    uart__put(UART__3, data_to_send[buffer_index], 0);
+    buffer_index++;
+  }
+  controls__set_joystick_direction(CENTERED);
+}
+</pre>
 === Game Pad Controller ===
-Brief description of what this module does. Insert diagram of joystick and buttons connected to sj2 (using pictures of actual modules)
+The main components in Game Pad controller are a joystick, accelerometer, two buttons, and bluetooth. The controller is used to send commands and control Steve (the main character) in Treasure Diver, along with navigation of the menus, with the joystick or the SJ2's on-board accelerometer (user's choice). With bluetooth on the game pad, the controller is wireless.
+{| style="margin-left: auto; margin-right: auto; border: none;"
+[[File:Joystick.JPG|200px|thumb|center|Amazon image of the joystick]]
+[[File:CmpE244 F19 T4 Accelerometer.png|200px|thumb|center|On-board accelerometer]]
+[[File:PushButtons.JPG|200px|thumb|center|Push buttons used for the select and cancel buttons of the Game Pad]]
+|}
 ==== Hardware Design ====
-Discuss your hardware design here.  Show detailed schematics, and the interface here. In this section, you can describe how your hardware communicates, such as which BUSes used.  You can discuss your driver implementation here, such that the '''Software Design''' section is isolated to talk about high level workings rather than inner working of your project.
+The setup of the game pad's hardware was very simple. The two push buttons (cancel and select) use the same configuration. Both are use a pull up resistor when open (not pressed) and short to ground when pressed. This was done to improve the signal and make sure the SJ2 gpio would read high or low.
+The accelerometer was easy to initialize since there was already existing API. So, all it required was was reading and properly handling the data to send the command to the master board to control Stave. The joystick require  initializing. Although, the input of both was different, the output was essentially the same. The accelerometer and joystick both had analog outputs which would then be read by an analog to digital converter (ADC).
+[[File:GamePadSchematic.JPG|700px|thumb|center|Schematic of Game Pad controller]]
+The outputs would represent the X and Y positions of both devices. The analog stick was also a button that could be pressed, but it was not implemented in the project, due to time constraints.
 ==== Software Design ====
-Use a flowchart(s)
+When the software is sending commands, it gets the ADC values and analyzes which direction the accelerometer or joystick is indicating. The flow primarily checks up/down and if it is one of these, then L/R is checked. If one of these is true, the software checks which direction is a greater magnitude. This approach is used for both the accelerometer and joystick.
+[[File:GamePadFlowChart.JPG|500px|thumb|center|HC-05 Bluetooth Module to SJ2 Connections]]
+As an example for more clarity, if DOWN is true and RIGHT is true, we then check which directions has a greater value. If the joystick/accelerometer is leaning more in the DOWN direction, then the game pad will send this direction to the Master board.
+<pre>
+joystick_direction_t joystick_controls__get_joystick_direction(void) {
+  joystick_direction_t joysticks_direction = CENTERED;
+  const joystick_s current_position = get_joystick_position();
+  if (check_up(current_position.y)) {
+    if (check_left(current_position.x)) {
+      if (current_position.y < (-1 * current_position.x)) {
+        joysticks_direction = W;
+      } else {
+        joysticks_direction = N;
+      }
+    } else if (check_right(current_position.x)) {
+      if (current_position.y < current_position.x) {
+        joysticks_direction = E;
+      } else {
+        joysticks_direction = N;
+      }
+    } else {
+      joysticks_direction = N;
+    }
+  } else if (check_down(current_position.y)) {
+    if (check_left(current_position.x)) {
+      if ((-1 * current_position.y) < (-1 * current_position.x)) {
+        joysticks_direction = W;
+      } else {
+        joysticks_direction = S;
+      }
+    } else if (check_right(current_position.x)) {
+      if ((-1 * current_position.y) < current_position.x) {
+        joysticks_direction = E;
+      } else {
+        joysticks_direction = S;
+      }
+    } else {
+      joysticks_direction = S;
+    }
+  } else {
+    if (check_left(current_position.x)) {
+      joysticks_direction = W;
+    } else if (check_right(current_position.x)) {
+      joysticks_direction = E;
+    }
+  }
+</pre>
 ==== Implementation ====
-Short code snippets or pseudo-code with explanations
+The axis of the joystick did not match the X and Y of our board positioning. To "rotate" the axis, the function swap_and_shift_axis() was created. The swap really occurs if the ADC port of X-axis is passed to the function so it can return a value to the game pad's Y-axis. The purpose of the shift is to make it easier when checking magnitudes of two different directions, as explained in the previous section.
+<pre>
+static uint16_t swap_and_shift_axis(adc_channel_e axis) {
+  const uint16_t shift_value = 2250;
+  int16_t axis_value = adc__get_channel_reading_w_burst_mode(axis) - shift_value;
+  return axis_value;
+}
+static joystick_s get_joystick_position(void) {
+  static joystick_s joystick_pos;
+  joystick_pos.x = swap_and_shift_axis(Y_AXIS);
+  joystick_pos.y = swap_and_shift_axis(X_AXIS);
+  return joystick_pos;
+}
+</pre>
 == Technical Challenges ==
-Describe the challenges of your project.  What advise would you give yourself or someone else if your project can be started from scratch again?
-Make a smooth transition to testing section and described what it took to test your project.
-Include sub-sections that list out a problem and solution, such as:
 === CAD Enclosures Design ===
-* Discuss issue and resolution 1.
+* When we received the 3D printed enclosures, some of the holes were smaller than designed. This can happen in FDM printing because plastic is melted and placed layer by layer, which is only accurate to a certain thickness and height. In order to enlarge the holes, a needle file was used to file down the openings until the hole was big enough.
-* Discuss issue and resolution 2.
+* Due to the COVID pandemic, we were unable to access the free 3D printing services offered by SJSU and so we had to pay to get our enclosures printed. Our original design was extremely costly and so the enclosures had to be redesigned twice in order to bring the cost down to an affordable amount. All the redesigning we had to do took a lot of time away from the other aspects of our project and the resulting enclosures were not as fancy as we originally planned, but it was all we could afford.
-* Discuss issue and resolution n.
 === PCB Design ===
-* Discuss issue and resolution 1.
+* Our first design of the matrix controller PCB had incorrect pin spacing for the led matrix pins because we accidentally used the wrong footprint. Unfortunately, we didn't notice this until after we had placed the PCB order and so we had to oder a second matrix controller PCB that had the correct matrix pin spacing. Fortunately, we noticed this before our order shipped and so we were able to add the corrected PCB design to our order without any additional delays.
-* Discuss issue and resolution 2.
-* Discuss issue and resolution n.
 === LED Matrix ===
-* Discuss issue and resolution 1.
+* When testing the game, we observed that if the character hit an obstacle and the joystick direction moving the character towards the obstacle was held for over a second or so, the game character would actually start to move into the obstacle. We realized that this was because the collision detection wasn't updating quick enough, and so we changed the collision detection's task priority from low to high. Using high priority for the collision detection task solved this problem.
-* Discuss issue and resolution 2.
+* Ghosting was some time an issue in which an after image of an obstacle or image would sometimes linger on screen. This may happen because the GND pins on the Sjtwo board are not soldered correctly. After switching over to a PCB to connect the LED and board these issues stopped happening.
-* Discuss issue and resolution n.
 === MP3 Decoder ===
-* Discuss issue and resolution 1.
+* The datasheet lacks some information and clarity on initializing the module and with some of the commands. When first using it, non of the commands appeared to work or have any effect. The issue was resolved after sending the command to select a device, which was not explicitly stated in the datasheet. Once this command is first sent, the MP3 decoder now begins accepting commands.
-* Discuss issue and resolution 2.
-* Discuss issue and resolution n.
 === Bluetooth Interface ===
-* Discuss issue and resolution 1.
+* During testing, we realized that once a bluetooth command was sent, it would repeatedly send instead of just being sent once. For example, when the select button was pressed on the game pad, the select command would continuously send even though the button had been released and was no longer pressed. This is just how the bluetooth device works and so we had to make some modifications in our bluetooth handler code to accommodate this. In order to solve the button press data re-sending issue, we set button press to false immediately after receiving a button press command. In order to solve the joystick/accelerometer data re-sending issue, we defined a default state (CENTERED) which means no character movement, so it didn't matter that the centered command was being sent continuously.
-* Discuss issue and resolution 2.
-* Discuss issue and resolution n.
 === Game Pad Controller ===
-* Discuss issue and resolution 1.
+* Originally, thresholds for each direction were checked without comparing to another, and it would cause the character to go in a direction that was not intended or not move. When adding comparisons of magnitudes, character control greatly improved.
-* Discuss issue and resolution 2.
-* Discuss issue and resolution n.
 == Advice for Future Students ==
@@ Line 380: / Line 1,349: @@
 === CAD Enclosures Design ===
-* Advice/tip #1
+* If the 3D printing services offered by the library and SCE club aren't available (due to COVID pandemic), then use [https://jinxbot.com Jinxbot]. They are the cheapest local option we found and offer shipping or you can pick up locally in Mountain View. They print extremely quickly, we got our prints 3 days after ordering.
-* Advice/tip #2
-* Advice/tip #n
 === PCB Design ===
@@ Line 389: / Line 1,356: @@
 * Order your PCBs from JLCPCB (integrated into EasyEDA). You'll get them in 1 week.
 * In EasyEDA, may sure you check the connections for each footprint you're using. Sometimes the footprint's pinout won't exactly match your schematic.
-* Advice/tip #n
+* Create a google sheet for all team members to fill out with the SJ2 pins they are using for there device/task. It will help prevent multiple people from using the same pins that may cause confusion down the road and include the voltage required for their device. This will help simplify PCB design when referencing this document. Also include an image of the SJ2 board's pins for referencing while filling out the sheet.
 === LED Matrix ===
-* Advice/tip #1
+* '''START EARLY AND FINISH THE LED DRIVER ASAP''' The longer you take to implement the driver, the more time you have to wait before you can do any actual game development. You will really start feeling it towards the last week where you want to add polish to your game but you no longer have time. You do not want to catch yourself saying "Just one more week".
-* Advice/tip #2
-* Advice/tip #n
+* For the more artistically gifted amongst you, GIMP and MtPaint (open source) are fantastic resources for planning out levels and designing images. For example you can draw out your image and then using a python script or other image processing software you can get 2d array representation of your image that you can place your code. This is going to be much easier than writing entire screens out by hand:
+{| style="margin-left: auto; margin-right: auto; border: none;"
+|[[File:MTPaint.jpg|500px|thumb|center| Draw Your images...]]
+|[[File:array_conversion.jpg|650px|thumb|center| And Put Them in a form you can use in Code]]
+|}
+* Additionally, there are other software tools that can be used to design these screens or other objects for the LED matrix. Pixelable was an app used on the iPad, which allowed exporting the created images and could be opened in MtPaint, if needed.
 === MP3 Decoder ===
-* Advice/tip #1
+* We were not successful in getting the single cycle command to work for the MP3 decoder so that we would play a specific song in a folder in have it on repeat. So, instead of having SFX, Title/Menu music and level music in there own folders, I created a folder for each song (shown in image below). This allowed us to use the command that cycles all the music in one folder, essentially having the desired result.
-* Advice/tip #2
+[[File:SDfolderStructure.JPG|500px|thumb|center|Folder structure in SD card]]
-* Advice/tip #n
 === Bluetooth Interface ===
-* Advice/tip #1
+* Using [https://play.google.com/store/apps/details?id=project.bluetoothterminal&hl=en_US&gl=US this] HC-05 bluetooth terminal app (also linked in reference section) will really help when you're trying to get your bluetooth modules configured initially and during testing/debugging of your bluetooth interface. We were also able to use this app as a game pad to control our character's movement on the LED matrix and send button press signals, which was useful for the members of our team who didn't have a second SJ2 board.
-* Advice/tip #2
-* Advice/tip #n
 === Game Pad Controller ===
-* Advice/tip #1
+* Create a function that prints the X and Y values of the accelerometer and/or joystick. It will be useful for debugging and further understanding the device.
-* Advice/tip #2
-* Advice/tip #n
-=== General ===
-* Advice/tip #1
-* Advice/tip #2
-* Advice/tip #n
 == Conclusion ==
-Conclude your project here.  You can recap your testing and problems.  You should address the "so what" part here to indicate what you ultimately learnt from this project.  How has this project increased your knowledge?
+We really enjoyed the process of making this project and have learned so much. Our driver writing skills were honed through writing drivers for each module we used (LED matrix, MP3 decoder, Bluetooth, etc.), our understanding of FreeRTOS API has increased, and we gained some basic game and graphics development skills through the LED matrix aspects of this project. Throughout the entire duration of this project, we encountered numerous challenges such as difficulty getting the LED matrix driver up and running, figuring out how to implement collision detection with so many game objects, writing and maintaining our complex game logic state machine and much more. Additionally, we experienced challenges due to the COVID pandemic particularly for the 3D printing aspects of this project, as we did not have access to SJSU's 3D printing services for students and had to pay a premium price to get our enclosures printed. Due to time constraints, there were parts of our project that had to be changed or couldn't be implemented and so future improvements that we'd like to add would be a fancier matrix enclosure, auto-scrolling during gameplay, adding the in-between cardinal directions for character movement (NE, NW, SE, SW), and assigning a functionality to the switch button on our gamepad's joystick. Despite the challenges and setbacks we faced, we were able to overcome every single one of them in order to build a finished product that we are all proud of.
 === Project Video ===
-*  [https://sourceforge.net/projects/sjsu/files/CmpE_S2016/ Demo Video Link]
+*  [https://www.youtube.com/watch?v=IARjHJE1ZEg&feature=youtu.be Demo Video Link]
 === Project Source Code ===
 *  [https://gitlab.com/deharo27/treasure-diver GitLab Code Link]
+=== Acknowledgements ===
+We would like to thank our professor Preet and all the ISA's for putting together such a great class and for setting high expectations. This always inspired us to go above and beyond.
 == References ==
-=== Acknowledgement ===
+LED Matrix
-Any acknowledgement that you may wish to provide can be included here.
+* [https://www.sparkfun.com/news/2650 Everything You Didn't Want to Know About RGB Matrix Panels]
+* [http://mtpaint.sourceforge.net/ Mtpaint Source & Documentation]
+* [https://learn.adafruit.com/32x16-32x32-rgb-led-matrix/new-wiring AdaFruit walk Through for LED Matrix Wiring]
+MP3 Decoder
+* [https://github.com/cefaloide/ArduinoSerialMP3Player MP3 Decoder Datasheets]
-=== References Used ===
+HC-05 Bluetooth Modules
-List any references used in project.
+* [https://www.teachmemicro.com/hc-05-bluetooth-command-list/ HC-05 Bluetooth AT Commands]
+* [https://howtomechatronics.com/tutorials/arduino/how-to-configure-pair-two-hc-05-bluetooth-module-master-slave-commands/ HC-05 Bluetooth Configuration & Pairing]
+* [https://play.google.com/store/apps/details?id=project.bluetoothterminal&hl=en_US&gl=US HC-05 Bluetooth Terminal App for Testing]
-=== Appendix ===
+D Printing
-You can list the references you used.
+* [https://www.cati.com/blog/2018/05/3d-cad-design-3d-printing-tips-tricks-techniques-part-1/ Design Tips]
+* [https://www.3dhubs.com/knowledge-base/key-design-considerations-3d-printing/ Design Limitations]
+* [https://jinxbot.com Local 3D Printing Shop]

Difference between revisions of "F20: Treasure Diver"

Latest revision as of 00:05, 31 May 2021

Contents

Treasure Diver

Abstract

Objectives

Introduction

How to Play Treasure Diver

Team Members & Responsibilities

Schedule

Parts Lists & Cost

General Parts

Game Pad PCB Components

Matrix Controller PCB Components

Matrix & Game Pad Enclosure Parts

Design & Implementation

PCB Design

CAD Enclosures Design

Gameplay

State Machine

Software Design

Implementation

Collision Detection

Software Design

RGB LED Matrix

Hardware Design

Software Design

Implementation

MP3 Decoder

Hardware Design

Software Design

Implementation

Bluetooth Interface

Hardware Design

Software Design

Implementation

Game Pad Controller

Hardware Design

Software Design

Implementation

Technical Challenges

CAD Enclosures Design

PCB Design

LED Matrix

MP3 Decoder

Bluetooth Interface

Game Pad Controller

Advice for Future Students

CAD Enclosures Design

PCB Design

LED Matrix

MP3 Decoder

Bluetooth Interface

Game Pad Controller

Conclusion

Project Video

Project Source Code

Acknowledgements

References

Navigation menu

Search