Mercurial > ~darius > hgwebdir.cgi > modulator
annotate modulator.c @ 14:388074ff9474
Add fixed point code
author | Daniel O'Connor <darius@dons.net.au> |
---|---|
date | Tue, 25 Feb 2025 13:28:29 +1030 |
parents | e9d12b36cfcc |
children | 56a79dce90e9 |
rev | line source |
---|---|
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
1 /****************************************************************** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
2 ******************************************************************* |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
3 ** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
4 ** This is proprietary unpublished source code, property |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
5 ** of Genesis Software. Use or disclosure without prior |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
6 ** agreement is expressly prohibited. |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
7 ** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
8 ** Copyright (c) 2021 Genesis Software, all rights reserved. |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
9 ** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
10 ******************************************************************* |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
11 ******************************************************************/ |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
12 |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
13 /* |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
14 ** MODULATOR.C |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
15 ** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
16 ** Create modulation shape |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
17 ** |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
18 */ |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
19 |
5 | 20 #include <stdio.h> |
21 #include <string.h> | |
22 #include "bitstring.h" | |
23 | |
24 #pragma GCC diagnostic push | |
25 #pragma GCC diagnostic ignored "-Wtype-limits" | |
26 #pragma GCC diagnostic ignored "-Wsign-compare" | |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
27 #include "pico/stdlib.h" |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
28 #include "hardware/clocks.h" |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
29 #include "hardware/dma.h" |
5 | 30 #include "hardware/interp.h" |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
31 #include "hardware/irq.h" |
5 | 32 #include "hardware/pll.h" |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
33 #include "hardware/pio.h" |
5 | 34 #include "hardware/pwm.h" |
35 #include "hardware/structs/pll.h" | |
36 #include "hardware/structs/clocks.h" | |
37 #pragma GCC diagnostic pop | |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
38 |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
39 #include "dac.pio.h" |
9 | 40 #include "trigger.pio.h" |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
41 |
5 | 42 // https://github.com/howerj/q |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
43 // Modified to be Q20.12 rather than Q16.16 |
5 | 44 #include "q/q.h" |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
45 |
5 | 46 #include "shaped-trap.h" |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
47 |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
48 // Base of DAC pins |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
49 #define DACOUT_GPIO 7 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
50 // PWM output pin |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
51 #define TRIGOUT_GPIO 22 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
52 // PIO SM trigger input pin (connected to above for testing) |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
53 #define TRIGIN_GPIO 27 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
54 |
9 | 55 // Pulse control bits |
56 #define SENSE 0x01 | |
57 #define GATE 0x02 | |
58 #define PHINV 0x04 | |
59 #define PACTIVE 0x08 | |
60 | |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
61 // DMA channel to feed DAC PIO |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
62 static int dma_chan; |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
63 // Pulse shape data |
5 | 64 uint8_t pulse_data[65536]; |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
65 // Pulse control data |
5 | 66 uint8_t pulse_ctrl[65536]; |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
67 // PWM slice for PRF timer |
9 | 68 unsigned slice_num = 0; |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
69 // DAC PIO |
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
70 PIO pulse_pio = pio0; |
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
71 // DAC SM |
9 | 72 uint pulse_sm; |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
73 // Instruction offset for DAC PIO program |
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
74 uint pulse_pio_sm_offset; |
9 | 75 /* |
76 * Use a DMA channel to feed PIO0 SM0 with pulse data. | |
77 * Each DMA transfer is a single pulse. | |
78 * | |
79 * The PIO state machine waits to be triggered before starting | |
80 * so we can use another state machine to look for the trigger edge. | |
81 * | |
82 * When the DMA is done the IRQ handler will configure it for the next | |
83 * pulse (or not if it should stop). ie reset the PIO state machine | |
84 * back to waiting for an edge and re-arm the DMA. | |
85 */ | |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
86 void |
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
87 dma_handler(void) { |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
88 // Clear the interrupt request. |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
89 dma_hw->ints0 = 1u << dma_chan; |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
90 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
91 // Reset DAQ PIO SM so it is waiting for a trigger |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
92 pio_sm_exec(pulse_pio, pulse_sm, pio_encode_jmp(pulse_pio_sm_offset)); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
93 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
94 // Setup next pulse DMA address |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
95 dma_channel_set_read_addr(dma_chan, pulse_data, true); |
5 | 96 } |
97 | |
98 | |
99 void | |
100 pwm_wrap(void) { | |
101 pwm_clear_irq(slice_num); | |
102 } | |
103 | |
104 // Calculate pulse shape data | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
105 // TODO: predistortion, proper sense, gate, phase, active, T/R switch |
5 | 106 // Could encode them as bit stream like data but more compact would be |
107 // (say) a list of counts to toggle pins at | |
108 // Need to add pre/postgate/sense/phase counters | |
109 unsigned | |
110 compute_pulse(uint8_t *data, uint8_t *ctrl, unsigned datalen, uint16_t plen, char *code, uint8_t ncode, const uint8_t *shape, uint8_t shapelen, uint8_t codegap, uint8_t slew1, uint8_t slew2, uint8_t dcofs) { | |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
111 uint32_t shapesamples, nsamples, idx, bit1startup, bit1stopup; |
5 | 112 q_t dcscale, stepsize; |
113 char tmps[20]; | |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
114 interp_config cfg; |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
115 |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
116 if (ncode == 1) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
117 // Number of samples for half of the pulse |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
118 // Do division first so we don't overflow Q16.16 |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
119 shapesamples = qtoi(qmul(qdiv(qint(plen), qint(100)), qint(shapelen / 2))); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
120 // Number of samples for everything |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
121 // XXX: Need the +1 otherwise slew2 is truncated |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
122 nsamples = shapesamples * 2 + slew1 + slew2 + 1; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
123 } else { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
124 shapesamples = plen / 2; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
125 nsamples = shapesamples * 2 * ncode + codegap * (ncode - 1) + slew1 + slew2 + 1; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
126 } |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
127 |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
128 // Number of steps per samples in the pulse shape |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
129 stepsize = qdiv(qint(shapelen), qint(shapesamples)); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
130 qsprint(stepsize, tmps, sizeof(tmps)); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
131 printf("shapelen = %d shapesamples = %lu nsamples = %lu stepsize = %s\n", shapelen, shapesamples, nsamples, tmps); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
132 |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
133 // Check the requested pulse will not overflow given data |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
134 if (nsamples > datalen) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
135 printf("Pulse too long (%ld > %u)\n", nsamples, datalen); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
136 return 0; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
137 } |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
138 // Check it is not too short |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
139 if (shapesamples < 2) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
140 printf("Pulse too short (%lu < %d)\n", shapesamples, 2); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
141 return 0; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
142 } |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
143 // Or too long (will overflow for loop variable) |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
144 if (qtoi(shapesamples) > 65535) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
145 printf("Shape too long (%u > %d)\n", qtoi(shapesamples), 65535); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
146 return 0; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
147 } |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
148 |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
149 // Setup interp 0 lane 0 to generate index into shape table |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
150 // Mask start is 0 because we use 8 bit samples |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
151 cfg = interp_default_config(); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
152 interp_config_set_shift(&cfg, QBITS); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
153 interp_config_set_mask(&cfg, 0, 32 - QBITS); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
154 interp_config_set_blend(&cfg, true); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
155 interp_set_config(interp0, 0, &cfg); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
156 |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
157 // Setup interp 0 lane 1 to LERP each sample pair |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
158 cfg = interp_default_config(); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
159 interp_config_set_shift(&cfg, QBITS - 8); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
160 interp_config_set_signed(&cfg, false); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
161 interp_config_set_cross_input(&cfg, true); // unsigned blending |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
162 interp_set_config(interp0, 1, &cfg); |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
163 |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
164 // Setup interp 1 lane 0 to clamp 0-255 |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
165 cfg = interp_default_config(); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
166 interp_config_set_clamp(&cfg, true); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
167 interp_config_set_shift(&cfg, 0); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
168 interp_config_set_mask(&cfg, 0, 8); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
169 interp_config_set_signed(&cfg, false); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
170 interp_set_config(interp1, 0, &cfg); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
171 interp1->base[0] = 0; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
172 interp1->base[1] = 255; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
173 |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
174 interp0->accum[0] = 0; // Initial offset into shape table |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
175 interp0->base[2] = (uintptr_t)shape; // Start of shape table |
5 | 176 |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
177 dcscale = qdiv(qsub(qint(256), qint(dcofs)), qint(255)); |
5 | 178 qsprint(dcscale, tmps, sizeof(tmps)); |
179 printf("dcscale = %s\n", tmps); | |
180 | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
181 memset(pulse_data, 0, sizeof(pulse_data)); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
182 memset(pulse_ctrl, 0, sizeof(pulse_ctrl)); |
5 | 183 idx = 0; |
184 | |
185 // Up slew | |
186 for (uint16_t i = 0; i < slew1; i++) { | |
187 data[idx++] = qtoi(qdiv(qmul(qint(dcofs), qint(i)), qint(slew1))); | |
188 ctrl[idx] |= PACTIVE; | |
189 } | |
190 for (uint16_t c = 0; c < ncode; c++) { | |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
191 if (c == 0) |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
192 bit1startup = idx; |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
193 |
5 | 194 uint ctrltmp = PACTIVE; |
195 if (code[c] == '0') | |
196 ctrltmp |= PHINV; | |
197 | |
198 // Pulse up | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
199 if (c == 0) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
200 interp0->accum[0] = 0; // Initial offset into shape table |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
201 interp0->base[2] = (uintptr_t)shape; // Start of shape table |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
202 } |
5 | 203 for (uint16_t i = 0; i < shapesamples; i++) { |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
204 if (c == 0) { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
205 // Get sample pair |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
206 uint8_t *sample_pair = (uint8_t *) interp0->peek[2]; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
207 // Ask lane 1 for a LERP, using the lane 0 accumulator |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
208 interp0->base[0] = sample_pair[0]; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
209 interp0->base[1] = sample_pair[1]; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
210 uint8_t peek = interp0->peek[1]; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
211 // Apply DC offset scaling & clamp |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
212 interp1->accum[0] = dcofs + qtoi(qmul(qint(peek), dcscale)); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
213 data[idx++] = interp1->peek[0]; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
214 // Update interpolator for next point |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
215 interp0->add_raw[0] = stepsize; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
216 } else |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
217 // Already done it before, just copy the previous instance |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
218 data[idx++] = data[bit1startup + i]; |
5 | 219 ctrl[idx] = ctrltmp; |
220 } | |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
221 if (c == 0) |
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
222 bit1stopup = idx - 1; |
5 | 223 // Pulse down |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
224 // Since the pulse is symmetrical just copy the up slope in reverse |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
225 // XXX: if we had asymmetrical predistortion this wouldn't be true |
5 | 226 for (uint16_t i = 0; i < shapesamples; i++) { |
7
4ad473648949
Copy pulse up in reverse for pulse down.
Daniel O'Connor <darius@dons.net.au>
parents:
6
diff
changeset
|
227 data[idx++] = data[bit1stopup - i]; |
5 | 228 // Could replace this with a separate loop to poke it into place |
229 // Similarly for TR switch when implemented | |
230 if (i == 0 && c == 0) | |
231 ctrl[idx] = ctrltmp | SENSE; | |
232 else | |
233 ctrl[idx] = ctrltmp; | |
234 } | |
235 | |
236 // Code gap | |
237 if (c < ncode - 1) | |
238 for (uint16_t i = 0; i < codegap; i++) { | |
239 data[idx++] = dcofs; | |
240 ctrl[idx] = ctrltmp; | |
241 } | |
242 } | |
243 | |
244 // Down slew | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
245 for (uint16_t i = 0; i < slew2 + 1; i++) { |
5 | 246 data[idx++] = qtoi(qdiv(qmul(qint(dcofs), qint(slew2 - i)), qint(slew2))); |
247 ctrl[idx] |= PACTIVE; | |
248 } | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
249 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
250 data[idx++] = 0; |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
251 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
252 return idx; |
5 | 253 } |
254 | |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
255 int |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
256 main(void) { |
5 | 257 absolute_time_t then, now; |
258 | |
259 // Set sysclk to 120MHz | |
260 set_sys_clock_khz(120000, true); | |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
261 |
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
262 stdio_init_all(); |
5 | 263 printf("\n\n\nIniting\n"); |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
264 |
5 | 265 // Needed otherwise timer related functions hang under debugging |
266 // https://github.com/raspberrypi/pico-sdk/issues/1152#issuecomment-1418248639 | |
267 timer_hw->dbgpause = 0; | |
268 | |
269 gpio_init(PICO_DEFAULT_LED_PIN); | |
270 gpio_set_dir(PICO_DEFAULT_LED_PIN, GPIO_OUT); | |
9 | 271 gpio_init(2); |
272 gpio_set_dir(2, GPIO_OUT); | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
273 |
9 | 274 #if 0 |
275 for (unsigned i = 7; i < 7 + 9; i++) { | |
276 printf("GPIO %d\n", i); | |
277 gpio_init(i); | |
278 gpio_set_dir(i, GPIO_OUT); | |
279 printf("on\n"); | |
280 gpio_put(i, 1); | |
281 __breakpoint(); | |
282 printf("off\n"); | |
283 gpio_put(i, 0); | |
284 __breakpoint(); | |
285 } | |
286 #endif | |
5 | 287 |
288 uint32_t idx; | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
289 uint16_t plen; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
290 char *code; |
9 | 291 if (1) { |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
292 plen = 8000; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
293 code = "1110010"; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
294 } else { |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
295 plen = 53000; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
296 code = "1"; |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
297 } |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
298 |
5 | 299 uint8_t codegap = 4; |
300 uint8_t slew1 = 10; | |
301 uint8_t slew2 = 10; | |
302 uint8_t dcofs = 110; | |
303 then = get_absolute_time(); | |
304 if ((idx = compute_pulse(pulse_data, pulse_ctrl, sizeof(pulse_data), | |
305 plen, code, strlen(code), | |
306 shaped_trap, sizeof(shaped_trap), | |
307 codegap, slew1, slew2, dcofs)) == 0) { | |
308 printf("Failed to compute pulse\n"); | |
309 while (1) | |
310 ; | |
311 } | |
312 now = get_absolute_time(); | |
8
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
313 unsigned long long diff = absolute_time_diff_us(then, now); |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
314 printf("Pulse computation took %lld usec and created %lu samples - %.1f nsec/sample\n", |
0249d0cecac4
Use interpolator to compute pulse up.
Daniel O'Connor <darius@dons.net.au>
parents:
7
diff
changeset
|
315 diff, idx, (float)diff * 1000.0 / idx); |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
316 //__breakpoint(); |
9 | 317 |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
318 // Load the DAC program, and configure a free state machine |
9 | 319 // to run the program. |
10
98880b18bcc1
Reset DAC PIO and use force trigger to do manual trigger.
Daniel O'Connor <darius@dons.net.au>
parents:
9
diff
changeset
|
320 pulse_pio_sm_offset = pio_add_program(pulse_pio, &dac_program); |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
321 pulse_sm = pio_claim_unused_sm(pulse_pio, true); |
9 | 322 // Data is GPIO7 to GPIO14, clock is GPIO15 |
323 // Clock divisor of 2 so it runs at 60MHz and | |
324 // generates a 30MHz clock | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
325 dac_program_init(pulse_pio, pulse_sm, pulse_pio_sm_offset, DACOUT_GPIO, 2); |
9 | 326 |
327 // Configure a channel to write 32 bits at a time to PIO0 | |
328 // SM0's TX FIFO, paced by the data request signal from that peripheral. | |
329 dma_chan = dma_claim_unused_channel(true); | |
330 dma_channel_config dmac = dma_channel_get_default_config(dma_chan); | |
331 channel_config_set_transfer_data_size(&dmac, DMA_SIZE_32); | |
332 channel_config_set_read_increment(&dmac, true); | |
333 channel_config_set_dreq(&dmac, DREQ_PIO0_TX0); | |
334 | |
335 dma_channel_configure( | |
336 dma_chan, | |
337 &dmac, | |
338 &pio0_hw->txf[0], // Write address (only need to set this once) | |
339 NULL, // Don't provide a read address yet | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
340 (idx + 3) >> 2, // Transfer count (round up to 4 bytes) |
9 | 341 false // Don't start yet |
342 ); | |
343 | |
344 // Tell the DMA to raise IRQ line 0 when the channel finishes a block | |
345 dma_channel_set_irq0_enabled(dma_chan, true); | |
346 | |
347 // Configure the processor to run dma_handler() when DMA IRQ 0 is asserted | |
348 irq_set_exclusive_handler(DMA_IRQ_0, dma_handler); | |
349 irq_set_enabled(DMA_IRQ_0, true); | |
350 | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
351 // Load the trigger program, and configure a free state machine |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
352 // to run the program. |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
353 uint trigger_pio_sm_offset = pio_add_program(pulse_pio, &trigger_program); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
354 uint trigger_sm = pio_claim_unused_sm(pulse_pio, true); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
355 trigger_program_init(pulse_pio, trigger_sm, trigger_pio_sm_offset, TRIGIN_GPIO, 2); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
356 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
357 // |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
358 // Setup PWM |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
359 // Used here to output a trigger which gets fed back into the trigger SM |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
360 // |
5 | 361 // 120MHz / 250 = 480kHz base |
362 // Maximum divisor is only 256 which limits the low end, | |
363 // could further subdivide in the IRQ handler | |
9 | 364 pwm_config c = pwm_get_default_config(); |
5 | 365 pwm_config_set_clkdiv_int(&c, 250); |
366 // 8Hz | |
367 pwm_config_set_wrap(&c, 60000 - 1); | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
368 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
369 gpio_set_function(TRIGOUT_GPIO, GPIO_FUNC_PWM); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
370 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
371 slice_num = pwm_gpio_to_slice_num(TRIGOUT_GPIO); |
5 | 372 pwm_init(slice_num, &c, true); |
373 pwm_clear_irq(slice_num); | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
374 pwm_set_chan_level(slice_num, PWM_CHAN_A, 1); |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
375 pwm_set_enabled(slice_num, 1); |
5 | 376 pwm_set_irq_enabled(slice_num, true); |
377 irq_set_exclusive_handler(PWM_IRQ_WRAP, pwm_wrap); | |
378 irq_set_enabled(PWM_IRQ_WRAP, true); | |
11
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
379 |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
380 // Setup next pulse DMA address |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
381 // XXX: This works but telling dma_channel_configure above to start |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
382 // immediately does not |
e9d12b36cfcc
Use PWM output to feed PIO trigger
Daniel O'Connor <darius@dons.net.au>
parents:
10
diff
changeset
|
383 dma_channel_set_read_addr(dma_chan, pulse_data, true); |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
384 |
3
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
385 // Everything else from this point is interrupt-driven. The processor has |
b10097c3383d
DMA test data repeatedly into PIO FIFO
Daniel O'Connor <darius@dons.net.au>
parents:
2
diff
changeset
|
386 // time to sit and think about its early retirement -- maybe open a bakery? |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
387 while (true) { |
5 | 388 gpio_put(PICO_DEFAULT_LED_PIN, 1); |
389 sleep_ms(100); | |
390 gpio_put(PICO_DEFAULT_LED_PIN, 0); | |
2
0d653f60dec8
Actually get data moving out.
Daniel O'Connor <darius@dons.net.au>
parents:
0
diff
changeset
|
391 sleep_ms(100); |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
392 } |
5 | 393 |
394 __breakpoint(); | |
0
a55e39064a71
First commit of code that compiles.
Daniel O'Connor <darius@dons.net.au>
parents:
diff
changeset
|
395 } |