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

78 lines
2 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
#define PSDR2 2
//#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"
#endif
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"
//#include "core_cmInstr.h"
#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 "stm32f4xx_hal_rcc.h"
#include "stm32f4xx_hal_gpio.h"
#include "Adafruit_GFX.h"
#include "Adafruit_ILI9340.h"
#include "stm32f4xx_hal.h"
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
//#include "stm32f4xx_hal.h"
#include "stm32f4xx_hal_def.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 "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"
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 "arm_math.h"
//#include "stm32f4xx_hal_rtc.h"
//#include "stm32f4xx_hal_adc.h"
#include "stm32f4xx_it.h"
#include "stm32f4xx_hal_tim.h"
#include "stm32f4xx_hal_cortex.h"
#include "misc.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 "stm32f4xx_hal_dac.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
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
#include "images.h"
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
#include "stm32f4xx_hal_dma.h"
#include "stm32f4xx_hal_def.h"
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
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
#define SPIx_TX_DMA_STREAM DMA2_Stream5
#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
#define SPIx_DMA_RX_IRQn DMA2_Stream0_IRQn
#define SPIx_DMA_TX_IRQHandler DMA2_Stream3_IRQHandler
#define SPIx_DMA_RX_IRQHandler DMA2_Stream0_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;
Reference in a new issue Copy permalink