More compiler warnings fixes

This commit is contained in:
Paul Warren 2016-12-31 20:25:25 +11:00
parent af4d1fa94e
commit 1381f544d0
17 changed files with 10535 additions and 10433 deletions

50
.gitignore vendored
View file

@ -1,49 +1 @@
Hardware/~$PSDR.sch.inf /Debug
Hardware/ElementsOnLayersReport.txt
Source/BlankF4.launch
Source/BlankF4-2.launch
Source/StereoTurnerOnner.launch
Hardware/~$PSDR.pcb.inf
Hardware/Test Boards/~$MultiTestBoard2.pcb.inf
Hardware/PSDR.eco
Hardware/PSDR.rep
Hardware/PSDR_Layou1.pcb
Hardware/PSDR_Layou2.pcb
Hardware/PSDR_Layou3.pcb
Hardware/PSDR_Layout.pcb
Hardware/PSDR_Logic0.sch
Hardware/PSDR_Logic1.sch
Hardware/PSDR_Logic2.sch
Hardware/PSDR_Logic3.sch
Hardware/PSDR_PCB/3D/3DSettings.xml
Hardware/PSDR_PCB/PSDR_3DViewer.cce
Hardware/STM32F756_Config.ioc
Source/STM32F4 Test.launch
Hardware/Enclosure/~$PSDR2.SLDDRW
Hardware/Enclosure/Face Cover.x_t
Hardware/Enclosure/~$2.2in_LCD_Module.SLDPRT
Hardware/Enclosure/~$604561 Battery.SLDPRT
Hardware/Enclosure/~$7x3x3 Bearing.SLDPRT
Hardware/Enclosure/~$92029A208_TYPE 316 STAINLESS STEEL CUP POINT SET SCREW.SLDPRT
Hardware/Enclosure/~$92095A185_18-8 SS BUTTON-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$92095A471_18-8 SS BUTTON-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$93395A213_TYPE 316 SS FLAT-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$94205A220_TYPE 316 STAINLESS STEEL NYLON-INSERT LOCKNUT.SLDPRT
Hardware/Enclosure/~$BNC_Adapter.SLDPRT
Hardware/Enclosure/~$Battery Connector.SLDPRT
Hardware/Enclosure/~$BottomHalf2.sldprt
Hardware/Enclosure/~$Earphone_Jack.SLDPRT
Hardware/Enclosure/~$Encoder.SLDPRT
Hardware/Enclosure/~$EncoderBoard.SLDPRT
Hardware/Enclosure/~$Face Cover.SLDPRT
Hardware/Enclosure/~$GPS_Antenna.SLDPRT
Hardware/Enclosure/~$LCD_Standoff.SLDPRT
Hardware/Enclosure/~$LeeSpring-LTL015B08S.SLDPRT
Hardware/Enclosure/~$PSDR2.SLDASM
Hardware/Enclosure/~$PSDR26PCB.SLDPRT
Hardware/Enclosure/~$SMA_Connector.SLDPRT
Hardware/Enclosure/~$Slotted_Knob2.SLDPRT
Hardware/Enclosure/~$Speaker.SLDPRT
Hardware/Enclosure/~$USB_Connector.SLDPRT
Hardware/Enclosure/~$paddle.SLDPRT
Hardware/Enclosure/~$paddle_Mirrored.SLDPRT

Binary file not shown.

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

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="1667527611833262756" 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="-200514443441660323" 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="1686478988606720526" 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="-251466579097329229" 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>

File diff suppressed because it is too large Load diff

View file

@ -94,3 +94,9 @@
//}; //};
#endif // _ADAFRUIT_GFX_H #endif // _ADAFRUIT_GFX_H
/* function declerations to help the compiler */
void Adafruit_GFX_drawColorBitmap(int16_t x, int16_t y, uint16_t *bitmap, int16_t w, int16_t h, uint16_t tintMask);
void Adafruit_GFX_fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
uint16_t color);
void Adafruit_GFX_fillScreen(uint16_t color);

View file

@ -177,3 +177,10 @@
//}; //};
#endif #endif
/* Function declarations to keep the compiler happy */
void Adafruit_ILI9340_setVerticalScrollDefinition(uint16_t topFixedArea,
uint16_t verticalScrollArea, uint16_t bottomFixedArea);
void Adafruit_ILI9340_setVerticalScrollStartAddress(uint16_t address);

View file

@ -25,3 +25,5 @@ timer_sleep (timer_ticks_t ticks);
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
#endif // TIMER_H_ #endif // TIMER_H_
void timer_tick (void);

View file

@ -73,3 +73,8 @@ volatile uint8_t sampleRun;
#endif /* ADC_H_ */ #endif /* ADC_H_ */
void adcGetConversion(void);
void adcStartConversion(void);

View file

@ -9,3 +9,8 @@
I2C_HandleTypeDef handleI2C; I2C_HandleTypeDef handleI2C;
#endif /* DDS_H_ */ #endif /* DDS_H_ */
void clearStuckBusyFlag(void);
void i2cSetup(void);
void setFreq(unsigned long frequency);

View file

@ -74,6 +74,10 @@
#include "math.h" #include "math.h"
#include "images.h" #include "images.h"
#include "i2c.h" #include "i2c.h"
#include "Adafruit_GFX.h"
#include "Adafruit_ILI9340.h"
#include "spi.h"
//#include "stm32f4xx_hal_rcc.h" //#include "stm32f4xx_hal_rcc.h"
//#include "stm32f4xx_hal.h" //#include "stm32f4xx_hal.h"
//#include "stm32f4xx_hal_rtc.h" //#include "stm32f4xx_hal_rtc.h"

View file

@ -31,6 +31,9 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <stdlib.h>
#include <stdbool.h>
#include "Adafruit_GFX.h" #include "Adafruit_GFX.h"
#include "glcdfont.c" #include "glcdfont.c"
#ifdef __AVR__ #ifdef __AVR__

View file

@ -585,7 +585,7 @@ uint16_t Adafruit_ILI9340_Color565(uint8_t r, uint8_t g, uint8_t b) {
} }
void Adafruit_ILI9340_setVertialScrollStartAddress(uint16_t address) void Adafruit_ILI9340_setVerticalScrollStartAddress(uint16_t address)
{ {
Adafruit_ILI9340_writecommand(ILI9340_VSCRSADD); Adafruit_ILI9340_writecommand(ILI9340_VSCRSADD);
Adafruit_ILI9340_writedata((address >> 8) & 0xFF); Adafruit_ILI9340_writedata((address >> 8) & 0xFF);

View file

@ -124,7 +124,7 @@ void initAdc()
} }
} }
void adcGetConversion() void adcGetConversion(void)
{ {
HAL_StatusTypeDef result = HAL_ADC_PollForConversion(&AdcHandle1, 100); HAL_StatusTypeDef result = HAL_ADC_PollForConversion(&AdcHandle1, 100);
result = HAL_ADC_PollForConversion(&AdcHandle2, 100); result = HAL_ADC_PollForConversion(&AdcHandle2, 100);
@ -156,7 +156,7 @@ void initAdc()
} }
void adcStartConversion() void adcStartConversion(void)
{ {
if(HAL_ADC_Start(&AdcHandle1) != HAL_OK) if(HAL_ADC_Start(&AdcHandle1) != HAL_OK)
{ {

View file

@ -3,7 +3,7 @@
HAL_I2C_MspInit(I2C_HandleTypeDef hi2c) void HAL_I2C_MspInit(I2C_HandleTypeDef *hi2c)
{ {
//Ensure that appropriate GPIO and I2C hardware is powered up //Ensure that appropriate GPIO and I2C hardware is powered up
//um, they are elsewhere. Good enough for now. //um, they are elsewhere. Good enough for now.
@ -68,7 +68,7 @@ HAL_I2C_MspInit(I2C_HandleTypeDef hi2c)
} }
clearStuckBusyFlag() void clearStuckBusyFlag(void)
{ {
//disable I2C peripheral //disable I2C peripheral
//__I2C2_CLK_DISABLE(); //__I2C2_CLK_DISABLE();
@ -503,7 +503,7 @@ void write_Si5338(unsigned char address, unsigned char value)
txBuf[0] = address; txBuf[0] = address;
txBuf[1] = value; txBuf[1] = value;
HAL_I2C_Master_Transmit(&handleI2C, 0xE0, &txBuf, 2, 100); HAL_I2C_Master_Transmit(&handleI2C, 0xE0, txBuf, 2, 100);
//HAL_I2C_Mem_Write(&handleI2C, 0xE0, address, 1, value, 1, 100); //HAL_I2C_Mem_Write(&handleI2C, 0xE0, address, 1, value, 1, 100);
// Wire.beginTransmission(SI5338_ADDRESS); // Wire.beginTransmission(SI5338_ADDRESS);
@ -609,7 +609,7 @@ void sendRegToSi5338(int increment)
} }
void i2cSetup() { void i2cSetup(void) {
// put your setup code here, to run once: // put your setup code here, to run once:
//pinMode(A3, INPUT); //pinMode(A3, INPUT);

View file

@ -9,7 +9,6 @@
#include "main.h" #include "main.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// //
// Standalone STM32F4 led blink sample (trace via NONE). // Standalone STM32F4 led blink sample (trace via NONE).
@ -1570,11 +1569,10 @@ void drawWaterfall(void)
waterfallScanLine++; waterfallScanLine++;
if(waterfallScanLine > 119) waterfallScanLine = 0; if(waterfallScanLine > 119) waterfallScanLine = 0;
Adafruit_ILI9340_setVertialScrollStartAddress((/*119 -*/ waterfallScanLine) /*+ 200*/); Adafruit_ILI9340_setVerticalScrollStartAddress((/*119 -*/ waterfallScanLine) /*+ 200*/);
newWaterFallData = 0; newWaterFallData = 0;
} }
} }
void fillSamepleWithTone(int tone, float *samples) void fillSamepleWithTone(int tone, float *samples)