mirror
/
RP2040-code
kopia lustrzana https://github.com/oddwires/RP2040-code
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Target device changed to PGA2040

master
Tony 2022-08-07 13:49:03 +01:00
rodzic 7dd99a34ad
commit aa2bc6646a
2 zmienionych plików z 81 dodań i 60 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

141
Function Generator/FunctionGenerator.cpp
Wyświetl plik

@ -28,38 +28,57 @@
#include "FastDAC.pio.h" #include "FastDAC.pio.h"
#include "SlowDAC.pio.h" #include "SlowDAC.pio.h"
// Define GPIO connections... // Define all GPIO connections...
const uint SW0 = 0; // SW0+SW1 form a 3 way switch (not available when compiled with #DEBUG) // Switch connections...
const uint SW1 = 1; // ┌──────────┬────────────┬──────────────────────┐
const uint SW2 = 8; // SW2+SW3 form a 3 way switch (not available when compiled with #EIGHTBITDAC) // │ PGA2040 │ Connection │ Function │
const uint SW3 = 9; // ├──────────┼────────────┼──────────────────────┤
const uint SW0 = 16; // │ GPIO 16 │ Switch 0 │ 0=Level,1=Freq │
const uint SW6 = 13; // Freq/Level const uint SW1 = 15; // │ GPIO 15 │ Switch 1 │ 0=Sine, 1=Square │
const uint SW4 = 14; // Sine/Square/Triangle (a) const uint SW2 = 18; // │ GPIO 18 │ Switch 2 │ 0=Triangle, 1=Square │
const uint SW5 = 15; // Sine/Square/Triangle (b) const uint SW3 = 17; // │ GPIO 17 │ Switch 3 │ 0=Hz, 1=KHz │
const uint SW7 = 28; // Hz/KHz const uint SW4 = 19; // │ GPIO 19 │ Switch 4 │ │
// └──────────┴────────────┴──────────────────────┘
const uint EncoderClock = 16; // Nixie connections...
const uint EncoderData = 17; // Note: Cathodes - connect through a 74141 Nixie driver chip,
const uint Anode_0 = 22; // Nixie anodes // so only 4 data bits are required
const uint Anode_1 = 26; // ┌──────────┬────────────┬──────────────────────┐
const uint Anode_2 = 27; // │ PGA2040 │ Connection │ Function │
const uint Cathode_0 = 18; // Nixie cathodes - connect through a 74141 Nixie driver chip, so // ├──────────┼────────────┼──────────────────────┤
const uint Cathode_1 = 19; // only a 4 bit data bus is implemented const uint Anode_0 = 27; // │ GPIO 27 │ Anode 0 │ Units │
const uint Cathode_2 = 20; const uint Anode_1 = 28; // │ GPIO 28 │ Anode 0 │ 10's │
const uint Cathode_3 = 21; const uint Anode_2 = 29; // │ GPIO 29 │ Anode 0 │ 100's │
const uint Onboard_LED = 25; // PICO Onboard LED const uint Cathode_0 = 23; // │ GPIO 23 │ Cathode 0 │ Data bit 0 │
const uint Cathode_1 = 24; // │ GPIO 24 │ Cathode 0 │ Data bit 1 │
// SPI connections... const uint Cathode_2 = 25; // │ GPIO 25 │ Cathode 0 │ Data bit 2 │
// ┌──────────────────┬─────────────────┬─────────────────────┐ const uint Cathode_3 = 26; // │ GPIO 26 │ Cathode 0 │ Data bit 3 │
// │ PICO connection │ SPI function │ MCP41010 connection │ // └──────────┴────────────┴──────────────────────┘
// ├──────────────────┼─────────────────┼─────────────────────┤ #define SPI_PORT spi1 // The SPI connections will require RP2040 SPI port #1...
#define PIN_SCK 10 // │ GPIO 10 (pin 14) │ SCK/spi1_sclk │ SCK (pin 2) │ // ┌──────────┬────────────────┬──────────────────┐
#define PIN_MOSI 11 // │ GPIO 11 (pin 15) │ MOSI/spi1_tx │ SI (pin 3) │ // │ PGA2040 │ Connection │ MCP41010 │
#define PIN_CS 12 // │ GPIO 12 (pin 16) │ Chip select │ CS (pin 1) │ // ├──────────┼────────────────┼──────────────────┤
// └──────────────────┴─────────────────┴─────────────────────┘ const uint PIN_SCK = 10; // │ GPIO 10 │ SCK/spi1_sclk │ SCK (pin 2) │
#define SPI_PORT spi1 // Pico SPI port #1 const uint PIN_MOSI = 11; // │ GPIO 11 │ MOSI/spi1_tx │ SI (pin 3) │
const uint PIN_CS = 12; // │ GPIO 12 │ Chip select │ CS (pin 1) │
// └──────────┴────────────────┴──────────────────┘
const uint Onboard_LED = 14; // Onboard LED
const uint EncoderClock = 21;
const uint EncoderData = 22;
// D2A connections...
// Note: These are defined in the FastDAC.pio and SlowDAC.pio files.
// They are only included here for completeness.
// ┌──────────┬─────────────┬─────────────────────┐
// │ PGA2040 │ Connection │ Function │
// ├──────────┼─────────────┤─────────────────────┤
// │ GPIO 2 │ Data bit 0 │ Least significant │
// │ GPIO 3 │ Data bit 1 │ │
// │ GPIO 4 │ Data bit 2 │ │
// │ GPIO 5 │ Data bit 3 │ │
// │ GPIO 6 │ Data bit 4 │ │
// │ GPIO 7 │ Data bit 5 │ │
// │ GPIO 8 │ Data bit 6 │ │
// │ GPIO 9 │ Data bit 7 │ Most significant │
// └──────────┴─────────────┘─────────────────────┘
// Define useful constants... // Define useful constants...
#define Slow 0 #define Slow 0
#define Fast 1 #define Fast 1
@ -74,8 +93,8 @@ const uint Onboard_LED = 25; // PICO Onboard LED
#ifdef DEBUG #ifdef DEBUG
// SW0 and SW1 assigned to RS-232 port... // SW0 and SW1 assigned to RS-232 port...
//const unsigned int GPIO_Inputs[] = {SW2, SW3, SW4, SW5, SW6, EncoderClock, EncoderData}; //const unsigned int GPIO_Inputs[] = {SW2, SW3, SW4, SW5, SW6, EncoderClock, EncoderData};
const unsigned int GPIO_Inputs[] = {SW4, SW5, SW6, SW7, EncoderClock, EncoderData}; const unsigned int GPIO_Inputs[] = {SW0, SW1, SW2, SW3, SW4, EncoderClock, EncoderData};
const unsigned GPIO_Outputs[] = {Anode_0, Anode_1, Anode_2, Cathode_0, Cathode_1, Cathode_2, Cathode_3, PIN_CS}; const unsigned GPIO_Outputs[] = {Anode_0, Anode_1, Anode_2, Cathode_0, Cathode_1, Cathode_2, Cathode_3, PIN_CS, PIN_SCK, PIN_MOSI};
#else #else
// SW0 and SW1 assigned as GPIO inputs... // SW0 and SW1 assigned as GPIO inputs...
const unsigned int GPIO_Inputs[] = {SW0, SW1, SW2, SW3, SW4, SW5, SW6, SW7, EncoderClock, EncoderData}; const unsigned int GPIO_Inputs[] = {SW0, SW1, SW2, SW3, SW4, SW5, SW6, SW7, EncoderClock, EncoderData};
@ -97,10 +116,12 @@ int raw_sin[BitMapSize] ;
unsigned short DAC_data[BitMapSize] __attribute__ ((aligned(2048))) ; // Align DAC data unsigned short DAC_data[BitMapSize] __attribute__ ((aligned(2048))) ; // Align DAC data
void blink_pin_forever(PIO pio, uint sm, uint offset, uint pin, uint freq); void blink_pin_forever(PIO pio, uint sm, uint offset, uint pin, uint freq);
//class my_encoder;
class RotaryEncoder { // Class to initialise a state machine to read class RotaryEncoder {
public: // the rotation of the rotary encoder // Class to initialise a state machine to read the rotation of the rotary encoder
// Based on the GitHub example here...
// https://github.com/GitJer/Some_RPI-Pico_stuff/tree/main/Rotary_encoder
public:
// constructor // constructor
// rotary_encoder_A is the pin for the A of the rotary encoder. // rotary_encoder_A is the pin for the A of the rotary encoder.
// The B of the rotary encoder has to be connected to the next GPIO. // The B of the rotary encoder has to be connected to the next GPIO.
@ -354,7 +375,7 @@ void WaveForm_Update(int _WaveForm_Type, int _WaveForm_Value) {
float a,b,x1,x2,g1,g2; float a,b,x1,x2,g1,g2;
switch (_WaveForm_Type) { switch (_WaveForm_Type) {
case _Sine_: case _Sine_:
_WaveForm_Value = _WaveForm_Value % 8; // Sine value cycles after 7 _WaveForm_Value = _WaveForm_Value % 64; // Sine value cycles after 7
#ifdef DEBUG #ifdef DEBUG
printf("Sine wave: Fundamental + %d harmonics.\n",_WaveForm_Value); printf("Sine wave: Fundamental + %d harmonics.\n",_WaveForm_Value);
#endif #endif
@ -426,7 +447,6 @@ static void MCP41010_write(int _data) {
} }
void gpio_callback(uint gpio, uint32_t events) { void gpio_callback(uint gpio, uint32_t events) {
class my_encoder;
volatile bool CurBit,PrevBit; volatile bool CurBit,PrevBit;
volatile uint SwitchStatus = 0; volatile uint SwitchStatus = 0;
volatile uint BitMask = 1 << GPIO_count-2; volatile uint BitMask = 1 << GPIO_count-2;
@ -442,6 +462,14 @@ void gpio_callback(uint gpio, uint32_t events) {
// Do stuff here... // Do stuff here...
switch (i) { switch (i) {
case 0: case 0:
if (CurBit) { printf("Frequency\n");
ModeSelect = 0b0001;
UpdateReq = 0b010; }
else { printf("Level\n");
ModeSelect = 0b0010;
UpdateReq = 0b001; } // Flag to update the level
break;
case 1:
if (CurBit) { printf("Square\n"); if (CurBit) { printf("Square\n");
WaveForm_Type = _Square_ ; WaveForm_Type = _Square_ ;
RotaryEnc[_WaveForm_] = 50; // Set default: 50% duty cycle RotaryEnc[_WaveForm_] = 50; // Set default: 50% duty cycle
@ -452,13 +480,6 @@ void gpio_callback(uint gpio, uint32_t events) {
ModeSelect = 0b011; } ModeSelect = 0b011; }
UpdateReq = 0b100; // Flag to update the waveform UpdateReq = 0b100; // Flag to update the waveform
break; break;
case 1:
if (CurBit) { printf("Hz\n");
FreqMultiplier = 1; }
else { printf("KHz\n");
FreqMultiplier = 1000; }
UpdateReq = 0b010; // Flag to update the frequency
break;
case 2: case 2:
if (CurBit) { printf("Square\n"); if (CurBit) { printf("Square\n");
WaveForm_Type = _Square_ ; WaveForm_Type = _Square_ ;
@ -471,12 +492,11 @@ void gpio_callback(uint gpio, uint32_t events) {
UpdateReq = 0b100; // Flag to update the waveform UpdateReq = 0b100; // Flag to update the waveform
break; break;
case 3: case 3:
if (CurBit) { printf("Frequency\n"); if (CurBit) { printf("Hz\n");
ModeSelect = 0b0001; FreqMultiplier = 1; }
UpdateReq = 0b010; } else { printf("KHz\n");
else { printf("Level\n"); FreqMultiplier = 1000; }
ModeSelect = 0b0010; UpdateReq = 0b010; // Flag to update the frequency
UpdateReq = 0b001; } // Flag to update the level
break; break;
} }
// printf("Bit %d / Switch %d / GPIO %2d has changed. %b->%b\n",i,i+2,GPIO_Inputs[i],PrevBit,CurBit); // printf("Bit %d / Switch %d / GPIO %2d has changed. %b->%b\n",i,i+2,GPIO_Inputs[i],PrevBit,CurBit);
@ -490,7 +510,7 @@ void gpio_callback(uint gpio, uint32_t events) {
int main() { int main() {
static const float blink_freq = 16000; // Reduce SM clock to keep flash visible... static const float blink_freq = 16000; // Reduce SM clock to keep flash visible...
static const float rotary_freq = 16000; // Clock speed reduced to eliminate rotary encoder jitter... static const float rotary_freq = 16000; // Clock speed reduced to eliminate rotary encoder jitter...
set_sys_clock_khz(280000, true); // Overclocking the core by a factor of 2 allows 1MHz from DAC // set_sys_clock_khz(280000, true); // Overclocking the core by a factor of 2 allows 1MHz from DAC
float blink_div = (float)clock_get_hz(clk_sys) / blink_freq; // ... calculate the required blink SM clock divider float blink_div = (float)clock_get_hz(clk_sys) / blink_freq; // ... calculate the required blink SM clock divider
float rotary_div = (float)clock_get_hz(clk_sys) / rotary_freq; //... then calculate the required rotary encoder SM clock divider float rotary_div = (float)clock_get_hz(clk_sys) / rotary_freq; //... then calculate the required rotary encoder SM clock divider
@ -521,17 +541,18 @@ int main() {
gpio_pull_up(GPIO_Inputs[i]); // Enable pull up gpio_pull_up(GPIO_Inputs[i]); // Enable pull up
} }
// Enable GPIO interupts... // Enable GPIO interupts...
gpio_set_irq_enabled_with_callback(SW4, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true, &gpio_callback); gpio_set_irq_enabled_with_callback(SW0, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true, &gpio_callback);
gpio_set_irq_enabled(SW5, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true); gpio_set_irq_enabled(SW1, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true);
gpio_set_irq_enabled(SW6, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true); gpio_set_irq_enabled(SW2, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true);
gpio_set_irq_enabled(SW7, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true); gpio_set_irq_enabled(SW3, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true);
gpio_set_irq_enabled(SW4, GPIO_IRQ_EDGE_RISE | GPIO_IRQ_EDGE_FALL, true);
// Set SPI0 to 0.5MHz... // Set SPI0 to 0.5MHz...
spi_init(SPI_PORT, 500 * 1000); spi_init(SPI_PORT, 500 * 1000);
gpio_set_function(PIN_SCK, GPIO_FUNC_SPI); gpio_set_function(PIN_SCK, GPIO_FUNC_SPI);
gpio_set_function(PIN_MOSI, GPIO_FUNC_SPI); gpio_set_function(PIN_MOSI, GPIO_FUNC_SPI);
RotaryEncoder my_encoder(16, rotary_freq); // the A of the rotary encoder is connected to GPIO 16, B to GPIO 17 RotaryEncoder my_encoder(EncoderClock, rotary_freq);
// Confirm memory alignment // Confirm memory alignment
#ifdef DEBUG #ifdef DEBUG
@ -545,7 +566,7 @@ int main() {
// Set up the State machines... // Set up the State machines...
PIO pio = pio0; PIO pio = pio0;
uint offset = pio_add_program(pio, &pio_blink_program); uint offset = pio_add_program(pio, &pio_blink_program);
blink_forever my_blinker(pio, 0, offset, 25, blink_freq, blink_div); // SM0=>onboard LED blink_forever my_blinker(pio, 0, offset, Onboard_LED, blink_freq, blink_div); // SM0=>onboard LED
DMAtoDAC_channel DataChannel; // Create DMAtoDAC_channel object DMAtoDAC_channel DataChannel; // Create DMAtoDAC_channel object
@ -564,7 +585,7 @@ int main() {
// TBD - WHY NOT READ THE SWITCHES ???? // TBD - WHY NOT READ THE SWITCHES ????
WaveForm_Type = _Sine_ ; WaveForm_Type = _Sine_ ;
FreqMultiplier = 1; // Default: Hz FreqMultiplier = 1; // Default: Hz
ModeSelect = 0b0001;
UpdateReq = 0b0111; // Set flags to load all default values UpdateReq = 0b0111; // Set flags to load all default values
while (true) { // Infinite loop while (true) { // Infinite loop

BIN
Function Generator/Images/FunctionGenerator.jpg 100644
Wyświetl plik

Plik binarny nie jest wyświetlany.
Side by Side

Po

Szerokość:  |  Wysokość:  |  Rozmiar: 110 KiB