pwarren/PSDR
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
PSDR/Source/include/main.h

152 lines
3.6 KiB
C
Raw Normal View History

Initial commit to GitHub. Includes the Source (as an Eclipse project) and the Hardware files (including schematic, layout, gerbers, and bill of materials.) The firmware is extremely incomplete. At this point the DDS chips work (with controlled phase relationship), the LCD (with fast-ish SPI, scrolling, and GFX, modified from Adafruit's library), the encoder knob, and LED work. The ADC is capturing, but not in a usable way, but it's enough to feed the DSP code and see a nice pretty waterfall. Timers, interrupts, and DACs are not working yet.
2014-06-23 09:49:43 +10:00
#pragma once
Enclosure 3D files, Assembly Diagrams and Assembly Guide. Also so work on getting the firmware compatible with the PSDR2 hardware. Probably some junk as well. Lots of files.
2014-09-29 12:40:01 +10:00
//#define PSDR1 1
Progress on copying stuff over for the F7. I am making quite a mess, I think I sure hope I can reverse this all if I need to!!!
2016-04-24 13:53:10 +10:00
//#define PSDR2 2
//#define PSDR25 3
#define PSDR257 4
Merge branch 'master' into PSDR_F7 Conflicts: Source/.settings/language.settings.xml Source/Debug/PSDR.hex Source/PSDR F4.launch Source/src/main.c I2C is (finally working) ADC still not working.
2016-05-08 16:53:48 +10:00
//#define ARM_MATH_CM7
I don't know if I am closer or further away. This stuff is hugely frustrating sometimes.....
2016-04-24 16:54:47 +10:00
This is a major architectural change. It's based on STM32CubeMX building a Makefile project with a lot of the configuration already done automatically. The reasoning being that they'll get right on the first try what I have to torturously fiddle with. And the result? With minimal effort, I already have a build that is more portable to develop on, uses the latest drivers, includes FreeRTOS, and I've already got DMA video working pretty much perfectly (though not 100% optimized and tested). This is also giving me a convenient opportunity to massively clean up my code and just a few tricks I've learned since writing the old code. So far so good!! BUT! It can't do any radio like things yet, none of that is implemented at al, no interface, no audio, etc.
2019-05-25 07:28:07 +10:00
#include "stm32f7xx_hal.h"
//#include "stm32f7xx_hal_def.h"
Enclosure 3D files, Assembly Diagrams and Assembly Guide. Also so work on getting the firmware compatible with the PSDR2 hardware. Probably some junk as well. Lots of files.
2014-09-29 12:40:01 +10:00
//#define PSDR_BOARD PSDR2
#ifdef PSDR1
#define STM32F415xx
#define HSE_VALUE=8000000 //did I do this right? Both of these were defined in the progect settings before in the several preprocessors
//#include "stm32f415xx.h"
#endif
#ifdef PSDR2
//#define HSE_VALUE 24000000
#include "stm32f429xx.h"
Initial commit to GitHub. Includes the Source (as an Eclipse project) and the Hardware files (including schematic, layout, gerbers, and bill of materials.) The firmware is extremely incomplete. At this point the DDS chips work (with controlled phase relationship), the LCD (with fast-ish SPI, scrolling, and GFX, modified from Adafruit's library), the encoder knob, and LED work. The ADC is capturing, but not in a usable way, but it's enough to feed the DSP code and see a nice pretty waterfall. Timers, interrupts, and DACs are not working yet.
2014-06-23 09:49:43 +10:00
#include "stm32f4xx.h"
A heroic effort to push things forward. Now working includes the I2C interface and the code to talk to and start up the frequency synth. Flip flops are on, frequencies are being divided. No luck on actually getting a signal all the way through though. I currently suspect the transformers or the mixers..... how high can a quadrature sampling detector go again? :/
2016-04-21 16:57:58 +10:00
#include "stm32f4xx_hal_conf.h"
Progress on copying stuff over for the F7. I am making quite a mess, I think I sure hope I can reverse this all if I need to!!!
2016-04-24 13:53:10 +10:00
#include "stm32f4xx_hal.h"
#include "stm32f4xx_hal_gpio.h"
#include "stm32f4xx_hal_def.h"
#include "stm32f4xx_it.h"
#include "stm32f4xx_hal_tim.h"
#include "stm32f4xx_hal_cortex.h"
#include "stm32f4xx_hal_dma.h"
#include "stm32f4xx_hal_dac.h"
#include "stm32f4xx_hal_uart.h"
#include "stm32f4xx_hal_usart.h"
Power Off works! click Reset button to power on
2017-01-01 17:19:59 +11:00
#include "stm32f4xx_hal_pwr.h"
Progress on copying stuff over for the F7. I am making quite a mess, I think I sure hope I can reverse this all if I need to!!!
2016-04-24 13:53:10 +10:00
#endif
#ifdef PSDR257
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
//#define HSE_VALUE 26000000
This fixes (I think) the ADC issue. Or rather, interprets the already correct values correctly. Anyway. I think we are good, though more testing would be nice. I compared the F4 display performance to the F7 to see if the flickering/shimmering effect was there. It was not..... because the display was scrolling so slowly by comparison! The F7 is so fast that it was sometimes calculating and drawing the waterfall twice! Should be better now, but I may want to slow it down further. Also some changes to the power up/clock settings functions. Turns out there were two, not sure which is better or more complete. They both work well enough for now. So with this, I think the F7 is now doing everything the F4 was doing, and can become the official chip of the next board revision.
2016-05-12 08:57:45 +10:00
//#define ARM_MATH_CM7
Progress on copying stuff over for the F7. I am making quite a mess, I think I sure hope I can reverse this all if I need to!!!
2016-04-24 13:53:10 +10:00
//#include "stm32f756xx.h"
This fixes (I think) the ADC issue. Or rather, interprets the already correct values correctly. Anyway. I think we are good, though more testing would be nice. I compared the F4 display performance to the F7 to see if the flickering/shimmering effect was there. It was not..... because the display was scrolling so slowly by comparison! The F7 is so fast that it was sometimes calculating and drawing the waterfall twice! Should be better now, but I may want to slow it down further. Also some changes to the power up/clock settings functions. Turns out there were two, not sure which is better or more complete. They both work well enough for now. So with this, I think the F7 is now doing everything the F4 was doing, and can become the official chip of the next board revision.
2016-05-12 08:57:45 +10:00
#define ART_ACCLERATOR_ENABLE 1
This is a major architectural change. It's based on STM32CubeMX building a Makefile project with a lot of the configuration already done automatically. The reasoning being that they'll get right on the first try what I have to torturously fiddle with. And the result? With minimal effort, I already have a build that is more portable to develop on, uses the latest drivers, includes FreeRTOS, and I've already got DMA video working pretty much perfectly (though not 100% optimized and tested). This is also giving me a convenient opportunity to massively clean up my code and just a few tricks I've learned since writing the old code. So far so good!! BUT! It can't do any radio like things yet, none of that is implemented at al, no interface, no audio, etc.
2019-05-25 07:28:07 +10:00
//#include "stm32f7xx.h"
//#include "stm32f7xx_hal_conf.h"
//#include "stm32f7xx_hal.h"
//#include "stm32f7xx_hal_gpio.h"
//#include "stm32f7xx_hal_def.h"
//#include "stm32f7xx_it.h"
//#include "stm32f7xx_hal_tim.h"
//#include "stm32f7xx_hal_cortex.h"
//#include "stm32f7xx_hal_dma.h"
//#include "stm32f7xx_hal_dac.h"
//#include "stm32f7xx_hal_uart.h"
//#include "stm32f7xx_hal_usart.h"
//#include "stm32f7xx_hal_i2c.h"
//#include "stm32f7xx_hal_i2c_ex.h"
//#include "stm32f7xx_hal_tim_ex.h"
//#include "stm32f7xx_hal_pwr.h"
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
#endif
Progress on copying stuff over for the F7. I am making quite a mess, I think I sure hope I can reverse this all if I need to!!!
2016-04-24 13:53:10 +10:00
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
#include "arm_math.h"
Initial commit to GitHub. Includes the Source (as an Eclipse project) and the Hardware files (including schematic, layout, gerbers, and bill of materials.) The firmware is extremely incomplete. At this point the DDS chips work (with controlled phase relationship), the LCD (with fast-ish SPI, scrolling, and GFX, modified from Adafruit's library), the encoder knob, and LED work. The ADC is capturing, but not in a usable way, but it's enough to feed the DSP code and see a nice pretty waterfall. Timers, interrupts, and DACs are not working yet.
2014-06-23 09:49:43 +10:00
#include <stdio.h>
Got a timer up and going, and it's firing interrupts! Next up is to change the audio capture to use the interrupt and some buffers. Basically separate the display loop stuff.
2014-06-23 16:00:31 +10:00
#include "stddef.h"
Initial commit to GitHub. Includes the Source (as an Eclipse project) and the Hardware files (including schematic, layout, gerbers, and bill of materials.) The firmware is extremely incomplete. At this point the DDS chips work (with controlled phase relationship), the LCD (with fast-ish SPI, scrolling, and GFX, modified from Adafruit's library), the encoder knob, and LED work. The ADC is capturing, but not in a usable way, but it's enough to feed the DSP code and see a nice pretty waterfall. Timers, interrupts, and DACs are not working yet.
2014-06-23 09:49:43 +10:00
#include "diag/Trace.h"
#include "hal.h"
#include "adc.h"
#include "dds.h"
#include "Timer.h"
#include "BlinkLed.h"
#include "Adafruit_GFX.h"
#include "Adafruit_ILI9340.h"
#include "string.h"
Haven't committed in a while :o . Currently waterfall is disabled while I work on audio processing. I am capturing, FFT, filter, IFFT, and output. It seems to be working partly. I don't think I am doing things right yet. Also, starting to implement the menu system. Oh, and fixed some indentation, so it looks like there was more changed to main() than there really was....
2014-07-07 13:20:00 +10:00
#include "math.h"
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
#include "images.h"
#include "i2c.h"
More compiler warnings fixes
2016-12-31 20:25:25 +11:00
#include "Adafruit_GFX.h"
#include "Adafruit_ILI9340.h"
#include "spi.h"
This is a major architectural change. It's based on STM32CubeMX building a Makefile project with a lot of the configuration already done automatically. The reasoning being that they'll get right on the first try what I have to torturously fiddle with. And the result? With minimal effort, I already have a build that is more portable to develop on, uses the latest drivers, includes FreeRTOS, and I've already got DMA video working pretty much perfectly (though not 100% optimized and tested). This is also giving me a convenient opportunity to massively clean up my code and just a few tricks I've learned since writing the old code. So far so good!! BUT! It can't do any radio like things yet, none of that is implemented at al, no interface, no audio, etc.
2019-05-25 07:28:07 +10:00
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
//#include "stm32f4xx_hal_rcc.h"
//#include "stm32f4xx_hal.h"
Initial commit to GitHub. Includes the Source (as an Eclipse project) and the Hardware files (including schematic, layout, gerbers, and bill of materials.) The firmware is extremely incomplete. At this point the DDS chips work (with controlled phase relationship), the LCD (with fast-ish SPI, scrolling, and GFX, modified from Adafruit's library), the encoder knob, and LED work. The ADC is capturing, but not in a usable way, but it's enough to feed the DSP code and see a nice pretty waterfall. Timers, interrupts, and DACs are not working yet.
2014-06-23 09:49:43 +10:00
//#include "stm32f4xx_hal_rtc.h"
//#include "stm32f4xx_hal_adc.h"
Progress, I think. The thing compiles and builds something, but it's only 1K and won't run. Trying to figure out what I am doing wrong. :/
2016-04-24 16:17:37 +10:00
//#include "misc.h"
A heroic effort to push things forward. Now working includes the I2C interface and the code to talk to and start up the frequency synth. Flip flops are on, frequencies are being divided. No luck on actually getting a signal all the way through though. I currently suspect the transformers or the mixers..... how high can a quadrature sampling detector go again? :/
2016-04-21 16:57:58 +10:00
//#include "stm32f4xx_hal_def.h"
Okay! I've got it compiling and largely running on the F7! Still not everything is right, but a lot of it is. I think I am almost there! Maybe I'll get to include the F7 after all :D
2016-04-26 16:21:16 +10:00
//#include "core_cmInstr.h"
Honestly, it's been a while since I did any coding, with getting the kickstarter ready, so I don't actually remember what the state of the code is right now. I think I was working on getting the UART up so we can use the GPS. I'm commiting this as more of a backup than anything.
2015-03-07 16:54:22 +11:00
Added some color bitmaps and some code to draw them (way prettier graphics, here we come!), fixed a minor bug in the mode selection menu.
2014-07-24 01:31:17 +10:00
Got a timer up and going, and it's firing interrupts! Next up is to change the audio capture to use the interrupt and some buffers. Basically separate the display loop stuff.
2014-06-23 16:00:31 +10:00
TIM_HandleTypeDef TimHandle;
The main thing here is moving the FFT/Filtering/IFFT to a timer interrupt that has a lower priority than the audio capture/playback timer interrupt. This way I don't care how slow the display code runs in the main loop (for now) enabling me to have the audio processing and the display working at the same time.
2014-07-14 17:41:46 +10:00
TIM_HandleTypeDef TimHandle4;
Starting to (slowly) make changes to the schematic for the next hardware version. Making/made a lot of changes to the graphics and some to the menu system. Want to do a commit before I change too much more, incase I screw things up, you see. Graphics look much better!
2014-07-27 11:07:45 +10:00
#define MASKRED 0b1111100000000000
#define MASKGREEN 0b0000011111100000
#define MASKBLUE 0b0000000000011111
#define MASKYELLOW 0b1111111111100000
#define MASKTEAL 0b0000011111111111
#define MASKWHITE 0b1111111111111111
#define MASKBLACK 0b0000000000000000
Enclosure 3D files, Assembly Diagrams and Assembly Guide. Also so work on getting the firmware compatible with the PSDR2 hardware. Probably some junk as well. Lots of files.
2014-09-29 12:40:01 +10:00
Semi working DMA code for the display driver! So excited! Now to work out the bugs :)
2017-06-25 15:42:12 +10:00
Dude, this DMA thing is killing me!!! I can write to the display at blistering speeds, but there are errors in the picture and I can't figure out why! <pulls all hair out!>
2018-06-22 15:51:59 +10:00
Semi working DMA code for the display driver! So excited! Now to work out the bugs :)
2017-06-25 15:42:12 +10:00
/* DMA */
static DMA_HandleTypeDef hdma_tx;
static DMA_HandleTypeDef hdma_rx;
Pretty big improvements to bitmap drawing code, and waterfall display code. Also a hack to deal with the red-things-stay-red bug (it's not ideal, it just blocks the encoder tick() if the display is drawing, doesn't seem to effect the feel of the interface in a bad way. Beginning to include GPS support. Working on some other display speedups (DMA and 16bit transfers, both are currently disabled)
2014-10-16 02:31:08 +11:00
/* Definition for SPIx's DMA */
#define SPIx_TX_DMA_CHANNEL DMA_CHANNEL_3
Semi working DMA code for the display driver! So excited! Now to work out the bugs :)
2017-06-25 15:42:12 +10:00
#define SPIx_TX_DMA_STREAM DMA2_Stream3
Pretty big improvements to bitmap drawing code, and waterfall display code. Also a hack to deal with the red-things-stay-red bug (it's not ideal, it just blocks the encoder tick() if the display is drawing, doesn't seem to effect the feel of the interface in a bad way. Beginning to include GPS support. Working on some other display speedups (DMA and 16bit transfers, both are currently disabled)
2014-10-16 02:31:08 +11:00
#define SPIx_RX_DMA_CHANNEL DMA_CHANNEL_3
#define SPIx_RX_DMA_STREAM DMA2_Stream2
/* Definition for SPIx's NVIC */
#define SPIx_DMA_TX_IRQn DMA2_Stream3_IRQn
Semi working DMA code for the display driver! So excited! Now to work out the bugs :)
2017-06-25 15:42:12 +10:00
#define SPIx_DMA_RX_IRQn DMA2_Stream2_IRQn
Pretty big improvements to bitmap drawing code, and waterfall display code. Also a hack to deal with the red-things-stay-red bug (it's not ideal, it just blocks the encoder tick() if the display is drawing, doesn't seem to effect the feel of the interface in a bad way. Beginning to include GPS support. Working on some other display speedups (DMA and 16bit transfers, both are currently disabled)
2014-10-16 02:31:08 +11:00
#define SPIx_DMA_TX_IRQHandler DMA2_Stream3_IRQHandler
Semi working DMA code for the display driver! So excited! Now to work out the bugs :)
2017-06-25 15:42:12 +10:00
#define SPIx_DMA_RX_IRQHandler DMA2_Stream2_IRQHandler
Enclosure 3D files, Assembly Diagrams and Assembly Guide. Also so work on getting the firmware compatible with the PSDR2 hardware. Probably some junk as well. Lots of files.
2014-09-29 12:40:01 +10:00
Pretty big improvements to bitmap drawing code, and waterfall display code. Also a hack to deal with the red-things-stay-red bug (it's not ideal, it just blocks the encoder tick() if the display is drawing, doesn't seem to effect the feel of the interface in a bad way. Beginning to include GPS support. Working on some other display speedups (DMA and 16bit transfers, both are currently disabled)
2014-10-16 02:31:08 +11:00
SPI_HandleTypeDef SpiHandle;
Honestly, it's been a while since I did any coding, with getting the kickstarter ready, so I don't actually remember what the state of the code is right now. I think I was working on getting the UART up so we can use the GPS. I'm commiting this as more of a backup than anything.
2015-03-07 16:54:22 +11:00
UART_HandleTypeDef UartHandle;
Useful Volume menu item. Compiler warnings in main.c
2016-12-31 16:02:50 +11:00
/* main.c functions */
void drawNumber(char c, uint16_t x, uint16_t y, uint16_t tintMask);
void drawNumberSmall(char c, uint16_t x, uint16_t y, uint16_t tintMask);
void TIM_Try(void);
void TIM3_IRQHandler(void);
void TIM4_IRQHandler(void);
void initDac1();
void dac1SetValue(uint16_t value);
void dac2SetValue(uint16_t value);
void drawSMeter(void);
void updateMenu();
void updateDisplay(uint8_t force);
void drawWaterfall(void);
void Tick(void);
void updateVfo(void);
void zeroSampleBank(float *samples);
Power Off works! click Reset button to power on
2017-01-01 17:19:59 +11:00
void shutDown(void);
Useful Volume menu item. Compiler warnings in main.c
2016-12-31 16:02:50 +11:00
Reference in a new issue Copy permalink