summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjaseg <git-bigdata-wsl-arch@jaseg.de>2020-03-18 20:35:15 +0100
committerjaseg <git-bigdata-wsl-arch@jaseg.de>2020-03-18 20:35:15 +0100
commit37338e2ad8ca226119121432b65f6c61134e60ac (patch)
tree4e5583b42ccdb2b7e504b5ccfeac2b2dc8e25ed8
parent639a4d1386b6d9b3be91ff03d09104a63db4ea45 (diff)
downloadmaster-thesis-37338e2ad8ca226119121432b65f6c61134e60ac.tar.gz
master-thesis-37338e2ad8ca226119121432b65f6c61134e60ac.tar.bz2
master-thesis-37338e2ad8ca226119121432b65f6c61134e60ac.zip
Fix firmware dsss decoding bug
This is my #1 top dumbest bug like ever
-rw-r--r--controller/fw/src/main.c3
-rw-r--r--lab-windows/scratch.ipynb6
2 files changed, 5 insertions, 4 deletions
diff --git a/controller/fw/src/main.c b/controller/fw/src/main.c
index 814c723..d2795df 100644
--- a/controller/fw/src/main.c
+++ b/controller/fw/src/main.c
@@ -213,6 +213,8 @@ int main(void)
GPIOA->MODER |= (1<<GPIO_MODER_MODER11_Pos) | (1<<GPIO_MODER_MODER12_Pos) | (1<<GPIO_MODER_MODER15_Pos);
#endif
+ dsss_demod_init(&demod_state);
+
con_printf("Booted.\r\n");
while (23) {
if (adc_fft_buf_ready_idx != -1) {
@@ -243,7 +245,6 @@ int main(void)
GPIOA->BSRR = 1<<7;
GPIOA->BSRR = 1<<12;
- dsss_demod_init(&demod_state);
dsss_demod_step(&demod_state, out, freq_sample_ts);
GPIOA->BSRR = 1<<12<<16;
}
diff --git a/lab-windows/scratch.ipynb b/lab-windows/scratch.ipynb
index d31ef92..6459245 100644
--- a/lab-windows/scratch.ipynb
+++ b/lab-windows/scratch.ipynb
@@ -129,12 +129,12 @@
},
{
"cell_type": "code",
- "execution_count": 30,
+ "execution_count": 44,
"metadata": {},
"outputs": [],
"source": [
- "with open('data/dsss_test_demod_fixed_03.bin', 'wb') as f:\n",
- " for freq in read_freq_log('data/dsss_test_demod_fixed_03.log'):\n",
+ "with open('data/dsss_test_demod_fixed_05.bin', 'wb') as f:\n",
+ " for freq in read_freq_log('data/dsss_test_demod_fixed_05.log'):\n",
" f.write(struct.pack('f', freq))"
]
},