Lab_NHMFL
/
upsilon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sign extension, header

This commit is contained in:
Peter McGoron 2022-07-14 15:11:22 -04:00
parent 592939f5bd
commit ffae5ecdf9
2 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
software/src/io.c
View File

@ -1,4 +1,5 @@
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <string.h>
#include "pin_io.h" #include "pin_io.h"
/* LT ADCs work like this: /* LT ADCs work like this:
@ -10,17 +11,31 @@
* in disguise because it's easier for me to write blocking code :-) * in disguise because it's easier for me to write blocking code :-)
*/ */
uint32_t static int32_t
adc_read(size_t num, unsigned wid, enum adc_types ty) sign_extend(uint32_t in, size_t neg)
{
if (neg) {
int32_t rval = 0;
in &= ~((uint32_t) 0);
memcpy(&rval, &in, sizeof(uint32_t));
return rval;
} else {
return in;
}
}
int32_t
adc_read(size_t num, unsigned wid)
{ {
uint32_t r = 0; uint32_t r = 0;
size_t neg = 0;
if (num >= ADC_MAX) { if (num >= ADC_MAX) {
LOG_ERROR("Bad ADC %d\n", num); LOG_ERR("Bad ADC %d\n", num);
k_fatal_halt(K_ERR_KERNEL_OOPS); k_fatal_halt(K_ERR_KERNEL_OOPS);
} }
if (wid > 32) { if (wid > 32) {
LOG_ERROR("Bad ADC Width %u\n", wid); LOG_ERR("Bad ADC Width %u\n", wid);
k_fatal_halt(K_ERR_KERNEL_OOPS); k_fatal_halt(K_ERR_KERNEL_OOPS);
} }
@ -35,6 +50,8 @@ adc_read(size_t num, unsigned wid, enum adc_types ty)
for (int i = 0; i < wid; i++) { for (int i = 0; i < wid; i++) {
r <<= 1; r <<= 1;
r |= *adc_sdo[num]; r |= *adc_sdo[num];
if (i == 0)
neg = r == 1;
*adc_sck[num] = 1; *adc_sck[num] = 1;
/* 1 millisecond -> 1 MHz */ /* 1 millisecond -> 1 MHz */
@ -43,7 +60,7 @@ adc_read(size_t num, unsigned wid, enum adc_types ty)
k_sleep(K_NSEC(500)); k_sleep(K_NSEC(500));
} }
return r; return sign_extend(r, neg);
} }
#define DAC_SS(n, v) *dac_ctrl[(n)] |= (v & 1) << 2 #define DAC_SS(n, v) *dac_ctrl[(n)] |= (v & 1) << 2
@ -72,7 +89,7 @@ dac_write_raw(size_t n, uint32_t data)
k_fatal_halt(K_ERR_KERNEL_OOPS); k_fatal_halt(K_ERR_KERNEL_OOPS);
} }
for (int i = 0; i < 20; i++) { for (int i = 0; i < 24; i++) {
DAC_SCK(n, 0); DAC_SCK(n, 0);
DAC_MOSI(n, data >> 31 & 1); DAC_MOSI(n, data >> 31 & 1);
k_sleep(K_NSEC(500)); k_sleep(K_NSEC(500));

7
software/src/io.h Normal file
View File

@ -0,0 +1,7 @@
#pragma once
int32_t adc_read(size_t num, unsigned wid);
uint32_t dac_write_raw(size_t n, uint32_t data);
void dac_write_v(size_t n, uint32_t v);
int dac_init(size_t n);