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

Updated gpio sound options

Browse source 
soundOnGPIODuration = 1000 // in mSecs (1000 = 1 second)
soundOnGPIOFreq = 1200	// in Hz as it should be
This commit is contained in:
penfold42 2018-06-12 21:39:08 +10:00
parent cd7f8e3fef
commit e05d6b0f28
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main.cpp
View file

@ -719,10 +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 = 1666; // 600Hz = 1/600 * 10^6;
// const int headSoundFreq = 833; // 1200Hz = 1/1200 * 10^6; // const int headSoundFreq = 833; // 1200Hz = 1/1200 * 10^6;
const int headSoundFreq = options.SoundOnGPIOFreq(); // 1200Hz = 1/1200 * 10^6; const int headSoundFreq = 1000000 / options.SoundOnGPIOFreq(); // 1200Hz = 1/1200 * 10^6;
unsigned char oldHeadDir; unsigned char oldHeadDir;
unsigned numberOfImages = diskCaddy.GetNumberOfImages(); unsigned numberOfImages = diskCaddy.GetNumberOfImages();
@ -802,7 +800,7 @@ void emulator()
oldHeadDir = headDir; oldHeadDir = headDir;
if (options.SoundOnGPIO()) if (options.SoundOnGPIO())
{ {
headSoundCounter = options.SoundOnGPIOCounter(); headSoundCounter = 1000 * options.SoundOnGPIODuration();
headSoundFreqCounter = headSoundFreq; headSoundFreqCounter = headSoundFreq;
} }
else else

6
src/options.cpp
View file

@ -129,8 +129,8 @@ Options::Options(void)
, quickBoot(0) , quickBoot(0)
, displayPNGIcons(0) , displayPNGIcons(0)
, soundOnGPIO(0) , soundOnGPIO(0)
, soundOnGPIOCounter(1000000) , soundOnGPIODuration(1000)
, soundOnGPIOFreq(833) , soundOnGPIOFreq(1200)
, invertIECInputs(0) , invertIECInputs(0)
, invertIECOutputs(1) , invertIECOutputs(1)
, splitIECLines(0) , splitIECLines(0)
@ -185,7 +185,7 @@ 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(soundOnGPIOCounter) ELSE_CHECK_DECIMAL_OPTION(soundOnGPIODuration)
ELSE_CHECK_DECIMAL_OPTION(soundOnGPIOFreq) 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)

4
src/options.h
View file

@ -58,7 +58,7 @@ 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 SoundOnGPIOCounter() const { return soundOnGPIOCounter; } inline unsigned int SoundOnGPIODuration() const { return soundOnGPIODuration; }
inline unsigned int SoundOnGPIOFreq() const { return soundOnGPIOFreq; } 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; }
@ -90,7 +90,7 @@ private:
unsigned int quickBoot; unsigned int quickBoot;
unsigned int displayPNGIcons; unsigned int displayPNGIcons;
unsigned int soundOnGPIO; unsigned int soundOnGPIO;
unsigned int soundOnGPIOCounter; unsigned int soundOnGPIODuration;
unsigned int soundOnGPIOFreq; unsigned int soundOnGPIOFreq;
unsigned int invertIECInputs; unsigned int invertIECInputs;
unsigned int invertIECOutputs; unsigned int invertIECOutputs;