pwarren/PSDR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Oops, didn't actually commit the files.

Browse source
This commit is contained in:
Michael Colton 2016-05-01 00:50:49 -06:00
parent 8b02d73d1c
commit 155b2700d4
6 changed files with 8077 additions and 7500 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Source/.settings/language.settings.xml
View file

@ -5,7 +5,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1682456878355093301" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="3299444413646052" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>
@ -16,7 +16,7 @@
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/> <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/> <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="1654378201599459276" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true"> <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-24779232341987973" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings Cross ARM" parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
<language-scope id="org.eclipse.cdt.core.gcc"/> <language-scope id="org.eclipse.cdt.core.gcc"/>
<language-scope id="org.eclipse.cdt.core.g++"/> <language-scope id="org.eclipse.cdt.core.g++"/>
</provider> </provider>

15449
Source/Debug/PSDR.hex
View file

File diff suppressed because it is too large Load diff

66
Source/PSDR F4.launch Normal file
View file

@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.openocd.launchConfigurationType">
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;peripherals&gt;&#13;&#10;&lt;peripheral name=&quot;I2C2&quot;/&gt;&#13;&#10;&lt;/peripherals&gt;&#13;&#10;"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doContinue" value="true"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doDebugInRam" value="false"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doFirstReset" value="true"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateConsole" value="true"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doGdbServerAllocateTelnetConsole" value="false"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doSecondReset" value="true"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doStartGdbServer" value="true"/>
<booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.enableSemihosting" value="true"/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.firstResetType" value="init"/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherCommands" value="set mem inaccessible-by-default off"/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbClientOtherOptions" value=""/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerConnectionAddress" value=""/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerExecutable" value="${openocd_path}/${openocd_executable}"/>
<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerGdbPortNumber" value="3333"/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerLog" value=""/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerOther" value="-f interface/stlink-v2.cfg -f target/stm32f4x.cfg"/>
<intAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.gdbServerTelnetPortNumber" value="4444"/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherInitCommands" value=""/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.otherRunCommands" value=""/>
<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.secondResetType" value="halt"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageFileName" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.imageOffset" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.ipAddress" value="localhost"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.jtagDevice" value="GNU ARM OpenOCD"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadImage" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.loadSymbols" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.pcRegister" value=""/>
<intAttribute key="org.eclipse.cdt.debug.gdbjtag.core.portNumber" value="3333"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setPcRegister" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setResume" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.setStopAt" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.stopAt" value="main"/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsFileName" value=""/>
<stringAttribute key="org.eclipse.cdt.debug.gdbjtag.core.symbolsOffset" value=""/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForImage" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useFileForSymbols" value="false"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForImage" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useProjBinaryForSymbols" value="true"/>
<booleanAttribute key="org.eclipse.cdt.debug.gdbjtag.core.useRemoteTarget" value="true"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.commandFactory" value="Standard (Windows)"/>
<stringAttribute key="org.eclipse.cdt.debug.mi.core.protocol" value="mi"/>
<booleanAttribute key="org.eclipse.cdt.debug.mi.core.verboseMode" value="false"/>
<stringAttribute key="org.eclipse.cdt.dsf.gdb.DEBUG_NAME" value="${cross_prefix}gdb${cross_suffix}"/>
<booleanAttribute key="org.eclipse.cdt.dsf.gdb.UPDATE_THREADLIST_ON_SUSPEND" value="false"/>
<intAttribute key="org.eclipse.cdt.launch.ATTR_BUILD_BEFORE_LAUNCH_ATTR" value="2"/>
<stringAttribute key="org.eclipse.cdt.launch.COREFILE_PATH" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.DEBUGGER_REGISTER_GROUPS" value=""/>
<stringAttribute key="org.eclipse.cdt.launch.PROGRAM_NAME" value="Debug/PSDR.elf"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_ATTR" value="PSDR"/>
<booleanAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_AUTO_ATTR" value="true"/>
<stringAttribute key="org.eclipse.cdt.launch.PROJECT_BUILD_CONFIG_ID_ATTR" value="ilg.gnuarmeclipse.managedbuild.cross.config.elf.debug.1375704298"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/PSDR"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
</listAttribute>
<stringAttribute key="org.eclipse.dsf.launch.MEMORY_BLOCKS" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;memoryBlockExpressionList context=&quot;Context string&quot;/&gt;&#13;&#10;"/>
<stringAttribute key="process_factory_id" value="org.eclipse.cdt.dsf.gdb.GdbProcessFactory"/>
</launchConfiguration>

1
Source/include/i2c.h
View file

@ -2,6 +2,7 @@
#define I2C_H_ #define I2C_H_
#include <hal.h> #include <hal.h>
//#include "register_map.h"
//#include "stm32f4xx_hal_i2c.h" //#include "stm32f4xx_hal_i2c.h"
#define SI5338_ADDRESS 0x70 #define SI5338_ADDRESS 0x70

29
Source/src/i2c.c
View file

@ -191,13 +191,13 @@ unsigned char Reg_Store[][3] = {
{ 45,0x00,0xFF}, { 45,0x00,0xFF},
{ 46,0x00,0xFF}, { 46,0x00,0xFF},
{ 47,0x14,0x3F}, { 47,0x14,0x3F},
{ 48,0x38,0xFF}, { 48,0x37,0xFF},
{ 49,0x00,0xFF}, { 49,0x00,0xFF},
{ 50,0xC4,0xFF}, { 50,0xC4,0xFF},
{ 51,0x07,0xFF}, { 51,0x07,0xFF},
{ 52,0x10,0xFF}, { 52,0x10,0xFF},
{ 53,0x00,0xFF}, { 53,0x00,0xFF},
{ 54,0xB0,0xFF}, { 54,0x57,0xFF},
{ 55,0x00,0xFF}, { 55,0x00,0xFF},
{ 56,0x00,0xFF}, { 56,0x00,0xFF},
{ 57,0x00,0xFF}, { 57,0x00,0xFF},
@ -240,20 +240,20 @@ unsigned char Reg_Store[][3] = {
{ 94,0x00,0xFF}, { 94,0x00,0xFF},
{ 95,0x00,0x3F}, { 95,0x00,0x3F},
{ 96,0x10,0x00}, { 96,0x10,0x00},
{ 97,0x0F,0xFF}, { 97,0x21,0xFF},
{ 98,0x2E,0xFF}, { 98,0x2E,0xFF},
{ 99,0x24,0xFF}, { 99,0x80,0xFF},
{100,0x00,0xFF}, {100,0x8F,0xFF},
{101,0x00,0xFF}, {101,0x50,0xFF},
{102,0x00,0xFF}, {102,0x01,0xFF},
{103,0x19,0xFF}, {103,0xA0,0xFF},
{104,0x00,0xFF}, {104,0x2E,0xFF},
{105,0x00,0xFF}, {105,0x63,0xFF},
{106,0x80,0xBF}, {106,0x80,0xBF},
{107,0x00,0xFF}, {107,0x00,0xFF},
{108,0x00,0xFF}, {108,0x00,0xFF},
{109,0x00,0xFF}, {109,0x00,0xFF},
{110,0xC0,0xFF}, {110,0x00,0xFF},
{111,0x00,0xFF}, {111,0x00,0xFF},
{112,0x00,0xFF}, {112,0x00,0xFF},
{113,0x00,0xFF}, {113,0x00,0xFF},
@ -492,6 +492,8 @@ unsigned char Reg_Store[][3] = {
{ 93,0x00,0x00}, { 93,0x00,0x00},
{ 94,0x00,0x00}, { 94,0x00,0x00},
{255, 0, 0xFF} }; // set page bit to 0 {255, 0, 0xFF} }; // set page bit to 0
//End of file
unsigned char hello = 1; unsigned char hello = 1;
@ -575,6 +577,9 @@ void sendRegToSi5338(int increment)
unsigned char addr = Reg_Store[increment][0]; unsigned char addr = Reg_Store[increment][0];
unsigned char data = Reg_Store[increment][1]; unsigned char data = Reg_Store[increment][1];
unsigned char mask = Reg_Store[increment][2]; unsigned char mask = Reg_Store[increment][2];
// unsigned char addr = Reg_Store[increment].Reg_Addr;
// unsigned char data = Reg_Store[increment].Reg_Val;
// unsigned char mask = Reg_Store[increment].Reg_Mask;
// ignore registers with masks of 0x00 // ignore registers with masks of 0x00
if(mask != 0x00){ if(mask != 0x00){
@ -739,7 +744,7 @@ long neumerator = 0;
//do //do
//{ //{
writeMultiSynthParameters(MULTISYNTH0, integer, neumerator, 10000UL); //writeMultiSynthParameters(MULTISYNTH0, integer, neumerator, 10000UL);
//neumerator += 1000; //neumerator += 1000;
//if(neumerator > 9999) //if(neumerator > 9999)
//{ //{

28
Source/src/main.c
View file

@ -756,18 +756,18 @@ void configUartPeripheral()
TinyGPS_init(); TinyGPS_init();
while(1) // while(1)
{ // {
if(HAL_UART_Receive(&UartHandle, (uint8_t *)aRxBuffer, 256, 5000) != HAL_OK) // if(HAL_UART_Receive(&UartHandle, (uint8_t *)aRxBuffer, 256, 5000) != HAL_OK)
{ // {
trace_puts("UART recieve didn't work. No sir."); // trace_puts("UART recieve didn't work. No sir.");
} else { // } else {
trace_puts(aRxBuffer); // trace_puts(aRxBuffer);
for(int i = 0; i < 256; i++) // for(int i = 0; i < 256; i++)
TinyGPS_encode(aRxBuffer[i]); // TinyGPS_encode(aRxBuffer[i]);
//
} // }
} // }
} }
@ -858,7 +858,7 @@ while(result!= HAL_OK)
//HAL_I2C_Master_Transmit(handleI2C, 230, 0x4F, 1, 1000); //write_Si5338(230, 0x10); //OEB_ALL = 1 //HAL_I2C_Master_Transmit(handleI2C, 230, 0x4F, 1, 1000); //write_Si5338(230, 0x10); //OEB_ALL = 1
i2cSetup(); i2cSetup();
i2cLoop(); //i2cLoop();
//trace_puts(( == HAL_OK ? "SI5338 Ready" : "SI5338 Not ready")); //trace_puts(( == HAL_OK ? "SI5338 Ready" : "SI5338 Not ready"));
@ -901,7 +901,7 @@ i2cLoop();
setGainPot(255, 255); setGainPot(250, 250);
//testing Uart //testing Uart
configUartPeripheral(); configUartPeripheral();