Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 33:e7635c8a58a8, committed 2020-05-26
- Comitter:
- lukeocarwright
- Date:
- Tue May 26 14:32:06 2020 +0000
- Parent:
- 32:1049618104a2
- Commit message:
- Final Project submission
Changed in this revision
--- a/Front/Front.h Tue May 26 14:21:58 2020 +0000 +++ b/Front/Front.h Tue May 26 14:32:06 2020 +0000 @@ -34,12 +34,12 @@ /** Constructor */ Front(); - /** Destructior */ + /** Destructor */ ~Front(); /** Runs whole front pannel * @function to process whole front pannel - * Deals with ADSR and sound generation bby calling other classes */ + * Deals with ADSR and sound generation by calling other classes */ void frontrun(N5110 &lcd, Gamepad &pad, int submenu);
--- a/Sound/Sound.cpp Tue May 26 14:21:58 2020 +0000 +++ b/Sound/Sound.cpp Tue May 26 14:32:06 2020 +0000 @@ -5,16 +5,18 @@ volatile extern uint16_t tri_wavtable[1024]; volatile extern uint16_t pulse_wavtable[1024]; -//Constructor/Destructor + Sound::Sound() { } + Sound::~Sound() { } //PUBLIC:----------------------------------------------------------------------- + uint16_t Sound::sound_main(bool initial, int waveform, int frequency) { if (initial==true) { //initiialises @@ -45,6 +47,7 @@ } //PRIVATE:---------------------------------------------------------------------- + uint16_t Sound::wavetable_itt(uint16_t i, int frequency) { i_d = i + ((1024*frequency)/ 10000); //i+((samples*f)*Ts)
--- a/Sound/Sound.h Tue May 26 14:21:58 2020 +0000 +++ b/Sound/Sound.h Tue May 26 14:32:06 2020 +0000 @@ -25,7 +25,7 @@ //Methods -/**Main sound function +/** Main sound function * @Takes in waveform type and frequency. * @ Outputs Unsigned int of wavetable value. * @ (Self itterates)
--- a/Startup/startup.cpp Tue May 26 14:21:58 2020 +0000 +++ b/Startup/startup.cpp Tue May 26 14:32:06 2020 +0000 @@ -54,15 +54,20 @@ { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }, }; -//constructor/destructor +/**constructor +*/ startup::startup() { } + +/**destructor +*/ startup::~startup() { } -//methods +/** Initial Set up of apd and functions +*/ void startup::initialise(N5110 &lcd, Gamepad &pad) { pad.init(); //initiate Gamepad
--- a/Startup/startup.h Tue May 26 14:21:58 2020 +0000 +++ b/Startup/startup.h Tue May 26 14:32:06 2020 +0000 @@ -30,7 +30,7 @@ ~startup(); /** intitialsie function. - * @Initialises all main gmaepad components. + * @Initialises all main gamepad components. * @Also Generates Preliminary LUTs */ void initialise(N5110 &lcd, Gamepad &pad);