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

Merge remote-tracking branch 'pwarren/PSDR_F7' into PSDR_F7

Browse source 
Conflicts:
	.gitignore
	Source/Debug/PSDR.hex
This commit is contained in:
Michael Colton 2017-01-19 00:23:42 -07:00
commit 26b7ef6f6d
8 changed files with 6073 additions and 5968 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
.gitignore vendored
View file

@ -1,4 +1,17 @@
/Debug
Hardware/~$PSDR.sch.inf
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
@ -27,3 +40,35 @@ Hardware/Enclosure/Bearing Stackup.PDF
Hardware/Enclosure/DeleteMe.SLDASM
Documentation/Parts List.indd
Hardware/ElementsOnLayersReport.txt
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

11836
Source/Debug/PSDR.hex
View file

File diff suppressed because it is too large Load diff

4
Source/include/hal.h
View file

@ -185,8 +185,8 @@ extern const Gpio_Pin FIVE_VOLT_REGULATOR_ENABLE;
// extern const Timer_Pin SERVO1;
// extern const Timer_Pin SERVO2;
extern inline bool
hal_checkTimeout (uint32_t startTime_ms, uint32_t interval_ms);
//extern inline bool
//hal_checkTimeout (uint32_t startTime_ms, uint32_t interval_ms);
// returns true if the interval has timed out
int

68
Source/include/images.h
View file

@ -10,38 +10,38 @@
#define BMPWIDTH 69;
#define BMPHEIGHT 33;
extern const unsigned short psdrLogo[];
extern const unsigned short bitmapMode[];
extern const unsigned short bitmapLSB[];
extern const unsigned short bitmapUSB[];
extern const unsigned short bitmapAM[];
extern const unsigned short bitmapPeriod[];
extern const unsigned short bitmapOne[];
extern const unsigned short bitmapTwo[];
extern const unsigned short bitmapThree[];
extern const unsigned short bitmapFour[];
extern const unsigned short bitmapFive[];
extern const unsigned short bitmapSix[];
extern const unsigned short bitmapSeven[];
extern const unsigned short bitmapEight[];
extern const unsigned short bitmapNine[];
extern const unsigned short bitmapZero[];
extern const unsigned short bitmapIronGradient[];
extern const unsigned short bitmapWebSdrGradient[];
extern const unsigned short bitmapFilter[];
extern const unsigned short bitmapHadLogo[];
extern const unsigned short bitmapSMeter[];
extern const unsigned short bitmapOff[];
extern unsigned short psdrLogo[];
extern unsigned short bitmapMode[];
extern unsigned short bitmapLSB[];
extern unsigned short bitmapUSB[];
extern unsigned short bitmapAM[];
extern unsigned short bitmapPeriod[];
extern unsigned short bitmapOne[];
extern unsigned short bitmapTwo[];
extern unsigned short bitmapThree[];
extern unsigned short bitmapFour[];
extern unsigned short bitmapFive[];
extern unsigned short bitmapSix[];
extern unsigned short bitmapSeven[];
extern unsigned short bitmapEight[];
extern unsigned short bitmapNine[];
extern unsigned short bitmapZero[];
extern unsigned short bitmapIronGradient[];
extern unsigned short bitmapWebSdrGradient[];
extern unsigned short bitmapFilter[];
extern unsigned short bitmapHadLogo[];
extern unsigned short bitmapSMeter[];
extern unsigned short bitmapOff[];
extern const unsigned short oneSmall[];
extern const unsigned short twoSmall[];
extern const unsigned short threeSmall[];
extern const unsigned short fourSmall[];
extern const unsigned short fiveSmall[];
extern const unsigned short sixSmall[];
extern const unsigned short sevenSmall[];
extern const unsigned short eightSmall[];
extern const unsigned short nineSmall[];
extern const unsigned short zeroSmall[];
extern const unsigned short hyphenSmall[];
extern const unsigned short tildeSmall[];
extern unsigned short oneSmall[];
extern unsigned short twoSmall[];
extern unsigned short threeSmall[];
extern unsigned short fourSmall[];
extern unsigned short fiveSmall[];
extern unsigned short sixSmall[];
extern unsigned short sevenSmall[];
extern unsigned short eightSmall[];
extern unsigned short nineSmall[];
extern unsigned short zeroSmall[];
extern unsigned short hyphenSmall[];
extern unsigned short tildeSmall[];

2
Source/src/Adafruit_GFX.c
View file

@ -393,7 +393,7 @@ void Adafruit_GFX_drawBitmap(int16_t x, int16_t y,
#endif
void Adafruit_GFX_drawColorBitmap(int16_t x, int16_t y, uint16_t *bitmap, int16_t w, int16_t h, uint16_t tintMask)
{
int16_t i, j, bmIndex;
int16_t i; //, j, bmIndex;
Adafruit_ILI9340_setAddrWindow(x,y,x+w-1, y+h-1);

68
Source/src/images.c
View file

@ -11,7 +11,7 @@
//Also, I wonder if I want to encode the height and width in the first two bytes or something? That seems like that's not a bad idea.
//86x20
const const unsigned short psdrLogo[]={
unsigned short psdrLogo[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0010 (16) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFF6, 0x6000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0336, // 0x0020 (32) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0336, // 0x0030 (48) pixels
@ -122,7 +122,7 @@ const const unsigned short psdrLogo[]={
0xFFFF, 0xFFFF, 0xFFF6, 0x6000, 0x0000, 0x0000, 0x0000, 0x0000
};
const const unsigned short bitmapMode[] = {
unsigned short bitmapMode[] = {
0x0000, 0x0000, 0x7BEF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0010 (16) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0020 (32) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x7BEF, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0030 (48) pixels
@ -157,7 +157,7 @@ const const unsigned short bitmapMode[] = {
//The three modes are 28 x 9
const unsigned short bitmapLSB[]={
unsigned short bitmapLSB[]={
0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, // 0x0010 (16) pixels
0x3800, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, // 0x0020 (32) pixels
0xDC87, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x01D2, 0xDFFF, // 0x0030 (48) pixels
@ -177,7 +177,7 @@ const unsigned short bitmapLSB[]={
};
const unsigned short bitmapUSB[]={
unsigned short bitmapUSB[]={
0x01D2, 0xDFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0010 (16) pixels
0xFED2, 0x3800, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xDC87, // 0x0020 (32) pixels
0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFB, 0x91C0, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x01D2, // 0x0030 (48) pixels
@ -197,7 +197,7 @@ const unsigned short bitmapUSB[]={
};
const unsigned short bitmapAM[]={
unsigned short bitmapAM[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, // 0x0010 (16) pixels
0xFFFF, 0xB320, 0x0000, 0x0336, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x3C9B, // 0x0030 (48) pixels
@ -220,7 +220,7 @@ const unsigned short bitmapAM[]={
//The numbers here (and the period) are 15 x 19 pixels.
const unsigned short bitmapPeriod[] = {
unsigned short bitmapPeriod[] = {
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -243,7 +243,7 @@ const unsigned short bitmapPeriod[] = {
const unsigned short bitmapOne[]={
unsigned short bitmapOne[]={
0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x39C7, // 0x0030 (48) pixels
@ -265,7 +265,7 @@ const unsigned short bitmapOne[]={
};
const unsigned short bitmapTwo[]={
unsigned short bitmapTwo[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0007, // 0x0020 (32) pixels
0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x0336, 0xFFFF, // 0x0030 (48) pixels
@ -287,7 +287,7 @@ const unsigned short bitmapTwo[]={
};
const unsigned short bitmapThree[]={
unsigned short bitmapThree[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xB320, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x0007, 0x96DF, // 0x0030 (48) pixels
@ -309,7 +309,7 @@ const unsigned short bitmapThree[]={
};
const unsigned short bitmapFour[]={
unsigned short bitmapFour[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -331,7 +331,7 @@ const unsigned short bitmapFour[]={
};
const unsigned short bitmapFive[]={
unsigned short bitmapFive[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0007, 0x96DF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -353,7 +353,7 @@ const unsigned short bitmapFive[]={
};
const unsigned short bitmapSix[]={
unsigned short bitmapSix[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3C9B, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFF, 0xFFFF, 0xB320, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -375,7 +375,7 @@ const unsigned short bitmapSix[]={
};
const unsigned short bitmapSeven[]={
unsigned short bitmapSeven[]={
0x0000, 0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, // 0x0010 (16) pixels
0x0336, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0336, // 0x0020 (32) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -397,7 +397,7 @@ const unsigned short bitmapSeven[]={
};
const unsigned short bitmapEight[]={
unsigned short bitmapEight[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x3C9B, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xDC87, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, // 0x0030 (48) pixels
@ -419,7 +419,7 @@ const unsigned short bitmapEight[]={
};
const unsigned short bitmapNine[]={
unsigned short bitmapNine[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x3C9B, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFED2, 0x3800, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x3C9B, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x000C, 0xB7FF, // 0x0030 (48) pixels
@ -441,7 +441,7 @@ const unsigned short bitmapNine[]={
};
const unsigned short bitmapZero[]={
unsigned short bitmapZero[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFB, 0x91C0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x65BF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFDAC, 0x0000, 0x0000, 0x0000, 0x01D2, 0xDFFF, // 0x0030 (48) pixels
@ -463,7 +463,7 @@ const unsigned short bitmapZero[]={
};
const unsigned short bitmapIronGradient[]={
unsigned short bitmapIronGradient[]={
0x0007, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000D, 0x000E, 0x100E, 0x180F, 0x200F, 0x2010, 0x2810, 0x2811, 0x3011, 0x3011, // 0x0010 (16) pixels
0x3811, 0x4011, 0x4812, 0x5012, 0x5812, 0x6012, 0x6012, 0x6812, 0x6812, 0x7012, 0x7812, 0x8012, 0x8812, 0x9012, 0x9012, 0x9012, // 0x0020 (32) pixels
0x9812, 0x9813, 0xA013, 0xA013, 0xA012, 0xA811, 0xB011, 0xB012, 0xB012, 0xB811, 0xB811, 0xC030, 0xB830, 0xC050, 0xC08F, 0xC08F, // 0x0030 (48) pixels
@ -474,7 +474,7 @@ const unsigned short bitmapIronGradient[]={
0xF706, 0xFF28, 0xFF29, 0xFF2A, 0xF72B, 0xFF4E, 0xFF90, 0xFF92, 0xFF93, 0xF795, 0xF797, 0xFFB8, 0xF7B9, 0xF7BA, 0xFFDC, 0xFFDE, // 0x0080 (128) pixels
};
const unsigned short bitmapWebSdrGradient[]={
unsigned short bitmapWebSdrGradient[]={
0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0002, 0x0003, 0x0003, 0x0004, 0x0004, 0x0005, 0x0005, 0x0006, 0x0006, 0x0007, 0x0007, // 0x0010 (16) pixels
0x0008, 0x0008, 0x0009, 0x0009, 0x000A, 0x080A, 0x080B, 0x080B, 0x100C, 0x100D, 0x180D, 0x180E, 0x200E, 0x280F, 0x280F, 0x3010, // 0x0020 (32) pixels
0x3010, 0x3811, 0x3811, 0x4012, 0x4012, 0x4012, 0x4813, 0x4813, 0x4813, 0x4813, 0x5013, 0x5014, 0x5014, 0x5014, 0x5814, 0x5814, // 0x0030 (48) pixels
@ -486,7 +486,7 @@ const unsigned short bitmapWebSdrGradient[]={
};
//47x12
const unsigned short bitmapFilter[]={
unsigned short bitmapFilter[]={
0x0000, 0x0000, 0x7BEF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0010 (16) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0020 (32) pixels
0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x7BEF, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -526,7 +526,7 @@ const unsigned short bitmapFilter[]={
};
//45x46
const unsigned short bitmapHadLogo[]={
unsigned short bitmapHadLogo[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x630C, 0xFFFF, 0xFFFF, 0x9492, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x3186, 0xD69A, 0xFFFF, 0xF7BE, 0x0020, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -660,7 +660,7 @@ const unsigned short bitmapHadLogo[]={
};
//155 x 10
const unsigned short bitmapSMeter[]={
unsigned short bitmapSMeter[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0030 (48) pixels
@ -760,91 +760,91 @@ const unsigned short bitmapSMeter[]={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x7BEF, 0x0000, 0xFFFF, 0xFFFF, 0x7BEF};
//8x9
const unsigned short oneSmall[] ={
unsigned short oneSmall[] ={
0x0000, 0x0000, 0x0000, 0x0418, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0000, 0x0000, 0x863F, 0xFFFF, 0xFFFF, 0xFFF8, 0x8000, 0x0000, // 0x0010 (16) pixels
0x0010, 0xC7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0010, 0xC7FF, 0xC400, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000, // 0x0030 (48) pixels
0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000, // 0x0040 (64) pixels
0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0000};
const unsigned short twoSmall[] ={
unsigned short twoSmall[] ={
0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0010 (16) pixels
0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, 0x0000, 0x0000, 0x0000, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xC400, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFF14, 0x5000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFFF, 0xFE30, 0x0000, 0x0000, // 0x0030 (48) pixels
0x0000, 0x553C, 0xFFFF, 0xFFFF, 0xC400, 0x0000, 0x0000, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xE52A, // 0x0040 (64) pixels
0x863F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xE52A};
const unsigned short threeSmall[] ={
unsigned short threeSmall[] ={
0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0010, 0xC7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, // 0x0010 (16) pixels
0x0418, 0xFFFF, 0xFFF8, 0x8000, 0x0418, 0xFFFF, 0xFFF8, 0x8000, 0x0000, 0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFF14, 0x5000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x0000, 0x863F, 0xFFFF, 0xFFFC, 0xA2A0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0xC7FF, 0xFFFF, 0xC400, // 0x0030 (48) pixels
0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, 0x0010, 0xC7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0040 (64) pixels
0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, 0x0000};
const unsigned short fourSmall[] ={
unsigned short fourSmall[] ={
0x0000, 0x0000, 0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFE30, 0x0000, 0x0000, 0x0000, 0x0000, 0x863F, 0xFFFF, 0xFFFF, 0xFE30, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFE30, 0x0000, 0x0000, 0x0418, 0xFFFF, 0xFFF8, 0x8418, 0xFFFF, 0xFE30, 0x0000, // 0x0020 (32) pixels
0x0418, 0xFFFF, 0xFFFC, 0xA2A0, 0x0418, 0xFFFF, 0xFE30, 0x0000, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, // 0x0030 (48) pixels
0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x0000, 0x0000, 0x0000, 0x0000, 0x0418, 0xFFFF, 0xFE30, 0x0000, // 0x0040 (64) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0418, 0xFFFF, 0xFE30, 0x0000};
const unsigned short fiveSmall[] ={
unsigned short fiveSmall[] ={
0x0000, 0x863F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0010 (16) pixels
0x0010, 0xC7FF, 0xFFFC, 0xA2A0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0xC7FF, 0xFFFC, 0xE71F, 0xFFFF, 0xFFFF, 0xC400, 0x0000, // 0x0020 (32) pixels
0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, // 0x0030 (48) pixels
0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0040 (64) pixels
0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, 0x0000};
const unsigned short sixSmall[] ={
unsigned short sixSmall[] ={
0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0010 (16) pixels
0x0418, 0xFFFF, 0xFFFF, 0xC400, 0x0000, 0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFFF8, 0xA53C, 0xFFFF, 0xFFFF, 0xC400, 0x0000, // 0x0020 (32) pixels
0x553C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, 0x553C, 0xFFFF, 0xFFFC, 0xA2A0, 0x000A, 0xA71F, 0xFFFF, 0xE52A, // 0x0030 (48) pixels
0x0418, 0xFFFF, 0xFFFC, 0xA2A0, 0x000A, 0xA71F, 0xFFFF, 0xE52A, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0040 (64) pixels
0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x0000};
const unsigned short sevenSmall[] ={
unsigned short sevenSmall[] ={
0x553C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xE52A, 0x553C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xE52A, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x553C, 0xFFFF, 0xFE30, 0x0000, 0x0000, 0x0000, 0x0000, 0x02B4, 0xE7FF, 0xFFF8, 0x8000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0x000A, 0xA71F, 0xFFFF, 0xE52A, 0x0000, 0x0000, 0x0000, 0x0000, 0x02B4, 0xE7FF, 0xFFF8, 0x8000, 0x0000, 0x0000, // 0x0030 (48) pixels
0x0000, 0x0000, 0x553C, 0xFFFF, 0xFF14, 0x5000, 0x0000, 0x0000, 0x0000, 0x000A, 0xA71F, 0xFFFF, 0xE52A, 0x0000, 0x0000, 0x0000, // 0x0040 (64) pixels
0x0000, 0x0010, 0xC7FF, 0xFFFF, 0xC400, 0x0000, 0x0000, 0x0000};
const unsigned short eightSmall[] ={
unsigned short eightSmall[] ={
0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0010 (16) pixels
0x02B4, 0xE7FF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFC, 0xA2A0, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFE30, 0x0000, // 0x0020 (32) pixels
0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFF, 0xC400, // 0x0030 (48) pixels
0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFC, 0xA2A0, // 0x0040 (64) pixels
0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x0000};
const unsigned short nineSmall[] ={
unsigned short nineSmall[] ={
0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, // 0x0010 (16) pixels
0x553C, 0xFFFF, 0xFF14, 0x5000, 0x02B4, 0xE7FF, 0xFFFF, 0xC400, 0x553C, 0xFFFF, 0xFF14, 0x5000, 0x02B4, 0xE7FF, 0xFFFF, 0xE52A, // 0x0020 (32) pixels
0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xE52A, 0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xC410, 0xC7FF, 0xFFFF, 0xE52A, // 0x0030 (48) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xC400, 0x02B4, 0xE7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, // 0x0040 (64) pixels
0x0000, 0x0418, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000};
const unsigned short zeroSmall[] ={
unsigned short zeroSmall[] ={
0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000, 0x0010, 0xC7FF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, // 0x0010 (16) pixels
0x0418, 0xFFFF, 0xFFFC, 0xA2A0, 0x02B4, 0xE7FF, 0xFFFF, 0xC400, 0x553C, 0xFFFF, 0xFF14, 0x5000, 0x0010, 0xC7FF, 0xFFFF, 0xE52A, // 0x0020 (32) pixels
0x553C, 0xFFFF, 0xFF14, 0x5000, 0x000A, 0xA71F, 0xFFFF, 0xE52A, 0x553C, 0xFFFF, 0xFFF8, 0x8000, 0x000A, 0xA71F, 0xFFFF, 0xE52A, // 0x0030 (48) pixels
0x0418, 0xFFFF, 0xFFFC, 0xA2A0, 0x02B4, 0xE7FF, 0xFFFF, 0xC400, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, // 0x0040 (64) pixels
0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000};
const unsigned short hyphenSmall[] ={
unsigned short hyphenSmall[] ={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0020 (32) pixels
0x0000, 0x0000, 0xA71F, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000, 0x0000, 0x0000, 0xA71F, 0xFFFF, 0xFFFF, 0xFF14, 0x5000, 0x0000, // 0x0030 (48) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0040 (64) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000};
const unsigned short tildeSmall[] ={
unsigned short tildeSmall[] ={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x000A, 0xA71F, 0xFFFF, 0xFFFC, 0xA2A0, 0x0000, 0x0418, 0xC400, // 0x0020 (32) pixels
0x553C, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xC400, 0x5538, 0xA2A0, 0x0000, 0x02B4, 0xE7FF, 0xFFFF, 0xFE30, 0x0000, // 0x0030 (48) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0040 (64) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000};
const unsigned short bitmapOff[] ={
unsigned short bitmapOff[] ={
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, // 0x0010 (16) pixels
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, // 0x0020 (32) pixels
0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, // 0x0030 (48) pixels

16
Source/src/main.c
View file

@ -268,10 +268,10 @@ void applyCoeficient(float *samples, int shift)
filterTemp[i * 2 + 1] = samples[i * 2 + 1] * fftFilterCoeficient[i * 2 + 1] + samples[i * 2] * fftFilterCoeficient[i * 2];
}
int shifter;
//int shifter;
for(i = 0; i < FFT_BUFFER_SIZE; i++)
{
shifter = i + 2 * shift;
//shifter = i + 2 * shift;
if(i < 0) samples[i] = 0;
if(i > FFT_BUFFER_SIZE - 1) samples[i] = 0;
samples[i] = filterTemp[i + 2 * shift];
@ -1080,7 +1080,7 @@ setFreq(vfoAFrequency);
//TIM_Config();
TIM_Try();
long long timeMeasurement = 0;
//long long timeMeasurement = 0;
updateDisplay(1);
@ -1115,9 +1115,9 @@ setFreq(vfoAFrequency);
//HAL_UART_Receive_IT(&UartHandle, (uint8_t*)aRxBuffer, 16);
int* p = UartHandle.pRxBuffPtr;
int* q = &aRxBuffer;
int difference = p- q;
//int* p = UartHandle.pRxBuffPtr;
//int* q = &aRxBuffer;
//int difference = p- q;
updateMenu();
@ -1550,7 +1550,7 @@ void drawWaterfall(void)
float fftMax = 0; //AH! These are being reset each time! Static makes them persistant right? Does it also ensure they are
float fftMin = 100; //only initialized once? Have to try it when I get home. It would certainly be nice if the waterfall
static float fftMaxMax = 0; //didn't change in brightness so much. Later, I may want to fix these values, or at least, make them
static float logMax; //manually controllable, sorta, you know?
//static float logMax; //manually controllable, sorta, you know?
uint8_t i;
for(i = 1; i < 255; i++) //If bin 0 is the DC offset, should we skip it in this calculation?
{
@ -1561,7 +1561,7 @@ void drawWaterfall(void)
//logMax = log2(fftMax);
if(fftMax > fftMaxMax) fftMaxMax += fftMax * 0.1;
logMax = log2(fftMaxMax);
//logMax = log2(fftMaxMax);
fftMaxMax *= 0.99;
if (fftMaxMax > fftMaxMaxMax) fftMaxMax = fftMaxMaxMax;
if (fftMaxMax < fftMaxMaxMin) fftMaxMax = fftMaxMaxMin;

2
Source/src/spi.c
View file

@ -22,7 +22,7 @@
void spi_init(void)
{
SPI_InitTypeDef spiInitStructure;
//SPI_InitTypeDef spiInitStructure;
GPIO_InitTypeDef gpioInitStructure;
HAL_SPI_MspInit(&SpiHandle);