Skip to content

Commit bf04ff7

Browse files
committed
Fix type errors on windows
1 parent 70043d5 commit bf04ff7

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

Source/Processors/DataThreads/RHD2000Thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1837,7 +1837,7 @@ int RHD2000Thread::setClockDivider(int divide_ratio)
18371837
if (divide_ratio == 1)
18381838
clockDivideFactor = 0;
18391839
else
1840-
clockDivideFactor = static_cast<uint16_t>(divide_ratio/2);
1840+
clockDivideFactor = static_cast<uint16>(divide_ratio/2);
18411841

18421842
if (isAcquisitionActive())
18431843
dacOutputShouldChange = true;

Source/Processors/DataThreads/RHD2000Thread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ class RHD2000Thread : public DataThread, public Timer
209209
bool ledsEnabled;
210210

211211
// Sync ouput divide factor
212-
int16_t clockDivideFactor;
212+
uint16 clockDivideFactor;
213213

214214
JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(RHD2000Thread);
215215
};

Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1670,7 +1670,7 @@ void Rhd2000EvalBoard::enableBoardLeds(bool enable)
16701670
// Ratio divide_factor
16711671
// 1 0
16721672
// >=2 Ratio/2
1673-
void Rhd2000EvalBoard::setClockDivider(uint16_t divide_factor)
1673+
void Rhd2000EvalBoard::setClockDivider(int divide_factor)
16741674
{
16751675

16761676
dev->SetWireInValue(WireInMultiUse, divide_factor);

Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class Rhd2000EvalBoard
166166
void resetFpga();
167167
bool isStreamEnabled(int streamIndex);
168168
void enableBoardLeds(bool enable);
169-
void setClockDivider(uint16_t divide_factor);
169+
void setClockDivider(int divide_factor);
170170
bool isUSB3();
171171
void printFIFOmetrics();
172172
bool readRawDataBlock(unsigned char** bufferPtr, int nSamples = -1);

0 commit comments

Comments
 (0)