VS2019 fixes.

This commit is contained in:
Jonathan Naylor
2020-05-09 12:41:37 +01:00
parent 2a8e1ce9f4
commit 467140dbf8
3 changed files with 10 additions and 4 deletions

View File

@@ -66,9 +66,8 @@ bool CFMControl::writeModem(const unsigned char* data, unsigned int length)
} }
// De-emphasise the data and any other processing needed (maybe a low-pass filter to remove the CTCSS) // De-emphasise the data and any other processing needed (maybe a low-pass filter to remove the CTCSS)
for(unsigned int i = 0U; i < nSamples; i++) { for (unsigned int i = 0U; i < nSamples; i++)
samples[i] = m_deemphasis.filter(samples[i]); samples[i] = m_deemphasis.filter(samples[i]);
}
unsigned char out[350U]; unsigned char out[350U];
unsigned int nOut = 0U; unsigned int nOut = 0U;
@@ -104,9 +103,8 @@ unsigned int CFMControl::readModem(unsigned char* data, unsigned int space)
} }
// Pre-emphasise the data and other stuff. // Pre-emphasise the data and other stuff.
for(unsigned int i = 0U; i < nSamples; i++) { for (unsigned int i = 0U; i < nSamples; i++)
samples[i] = m_preemphasis.filter(samples[i]); samples[i] = m_preemphasis.filter(samples[i]);
}
// Pack the floating point data (+1.0 to -1.0) to packed 12-bit samples (+2047 - -2048) // Pack the floating point data (+1.0 to -1.0) to packed 12-bit samples (+2047 - -2048)
unsigned int pack = 0U; unsigned int pack = 0U;

View File

@@ -188,6 +188,7 @@
<ClInclude Include="Hamming.h" /> <ClInclude Include="Hamming.h" />
<ClInclude Include="DMRLookup.h" /> <ClInclude Include="DMRLookup.h" />
<ClInclude Include="I2CController.h" /> <ClInclude Include="I2CController.h" />
<ClInclude Include="IIRDirectForm1Filter.h" />
<ClInclude Include="LCDproc.h" /> <ClInclude Include="LCDproc.h" />
<ClInclude Include="Log.h" /> <ClInclude Include="Log.h" />
<ClInclude Include="MMDVMHost.h" /> <ClInclude Include="MMDVMHost.h" />
@@ -285,6 +286,7 @@
<ClCompile Include="Golay24128.cpp" /> <ClCompile Include="Golay24128.cpp" />
<ClCompile Include="Hamming.cpp" /> <ClCompile Include="Hamming.cpp" />
<ClCompile Include="I2CController.cpp" /> <ClCompile Include="I2CController.cpp" />
<ClCompile Include="IIRDirectForm1Filter.cpp" />
<ClCompile Include="LCDproc.cpp" /> <ClCompile Include="LCDproc.cpp" />
<ClCompile Include="Log.cpp" /> <ClCompile Include="Log.cpp" />
<ClCompile Include="MMDVMHost.cpp" /> <ClCompile Include="MMDVMHost.cpp" />

View File

@@ -305,6 +305,9 @@
<ClInclude Include="FMControl.h"> <ClInclude Include="FMControl.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="IIRDirectForm1Filter.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="BPTC19696.cpp"> <ClCompile Include="BPTC19696.cpp">
@@ -574,5 +577,8 @@
<ClCompile Include="FMControl.cpp"> <ClCompile Include="FMControl.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="IIRDirectForm1Filter.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>