c64/pi1541
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #21 from penfold42/gpiosound

Browse source 
Gpio sound duration and frequency
This commit is contained in:
Stephen White 2018-06-12 22:42:33 +10:00 committed by GitHub
commit 8a25afaeb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.cpp
View file

@ -719,9 +719,8 @@ void emulator()
unsigned caddyIndex; unsigned caddyIndex;
int headSoundCounter = 0; int headSoundCounter = 0;
int headSoundFreqCounter = 0; int headSoundFreqCounter = 0;
//const int headSoundFreq = 3333; // 300Hz = 1/300 * 10^6; // const int headSoundFreq = 833; // 1200Hz = 1/1200 * 10^6;
//const int headSoundFreq = 1666; // 600Hz = 1/600 * 10^6; const int headSoundFreq = 1000000 / options.SoundOnGPIOFreq(); // 1200Hz = 1/1200 * 10^6;
const int headSoundFreq = 833; // 1200Hz = 1/1200 * 10^6;
unsigned char oldHeadDir; unsigned char oldHeadDir;
unsigned numberOfImages = diskCaddy.GetNumberOfImages(); unsigned numberOfImages = diskCaddy.GetNumberOfImages();
@ -801,7 +800,7 @@ void emulator()
oldHeadDir = headDir; oldHeadDir = headDir;
if (options.SoundOnGPIO()) if (options.SoundOnGPIO())
{ {
headSoundCounter = 1000000; headSoundCounter = 1000 * options.SoundOnGPIODuration();
headSoundFreqCounter = headSoundFreq; headSoundFreqCounter = headSoundFreq;
} }
else else

4
src/options.cpp
View file

@ -131,6 +131,8 @@ Options::Options(void)
, quickBoot(0) , quickBoot(0)
, displayPNGIcons(0) , displayPNGIcons(0)
, soundOnGPIO(0) , soundOnGPIO(0)
, soundOnGPIODuration(1000)
, soundOnGPIOFreq(1200)
, invertIECInputs(0) , invertIECInputs(0)
, invertIECOutputs(1) , invertIECOutputs(1)
, splitIECLines(0) , splitIECLines(0)
@ -192,6 +194,8 @@ void Options::Process(char* buffer)
ELSE_CHECK_DECIMAL_OPTION(quickBoot) ELSE_CHECK_DECIMAL_OPTION(quickBoot)
ELSE_CHECK_DECIMAL_OPTION(displayPNGIcons) ELSE_CHECK_DECIMAL_OPTION(displayPNGIcons)
ELSE_CHECK_DECIMAL_OPTION(soundOnGPIO) ELSE_CHECK_DECIMAL_OPTION(soundOnGPIO)
ELSE_CHECK_DECIMAL_OPTION(soundOnGPIODuration)
ELSE_CHECK_DECIMAL_OPTION(soundOnGPIOFreq)
ELSE_CHECK_DECIMAL_OPTION(invertIECInputs) ELSE_CHECK_DECIMAL_OPTION(invertIECInputs)
ELSE_CHECK_DECIMAL_OPTION(invertIECOutputs) ELSE_CHECK_DECIMAL_OPTION(invertIECOutputs)
ELSE_CHECK_DECIMAL_OPTION(splitIECLines) ELSE_CHECK_DECIMAL_OPTION(splitIECLines)

4
src/options.h
View file

@ -58,6 +58,8 @@ public:
inline unsigned int QuickBoot() const { return quickBoot; } inline unsigned int QuickBoot() const { return quickBoot; }
inline unsigned int DisplayPNGIcons() const { return displayPNGIcons; } inline unsigned int DisplayPNGIcons() const { return displayPNGIcons; }
inline unsigned int SoundOnGPIO() const { return soundOnGPIO; } inline unsigned int SoundOnGPIO() const { return soundOnGPIO; }
inline unsigned int SoundOnGPIODuration() const { return soundOnGPIODuration; }
inline unsigned int SoundOnGPIOFreq() const { return soundOnGPIOFreq; }
inline unsigned int SplitIECLines() const { return splitIECLines; } inline unsigned int SplitIECLines() const { return splitIECLines; }
inline unsigned int InvertIECInputs() const { return invertIECInputs; } inline unsigned int InvertIECInputs() const { return invertIECInputs; }
inline unsigned int InvertIECOutputs() const { return invertIECOutputs; } inline unsigned int InvertIECOutputs() const { return invertIECOutputs; }
@ -89,6 +91,8 @@ private:
unsigned int quickBoot; unsigned int quickBoot;
unsigned int displayPNGIcons; unsigned int displayPNGIcons;
unsigned int soundOnGPIO; unsigned int soundOnGPIO;
unsigned int soundOnGPIODuration;
unsigned int soundOnGPIOFreq;
unsigned int invertIECInputs; unsigned int invertIECInputs;
unsigned int invertIECOutputs; unsigned int invertIECOutputs;
unsigned int splitIECLines; unsigned int splitIECLines;