mirror of
https://github.com/elua/elua.git
synced 2025-01-08 20:56:17 +08:00
Changes to further test that ADC is behaving correctly.
This commit is contained in:
parent
d6e987cdf3
commit
256991162d
@ -1,18 +1,18 @@
|
|||||||
|
|
||||||
if pd.board() == "ET-STM32" then
|
if pd.board() == "ET-STM32" then
|
||||||
timer = 2
|
timer = 2
|
||||||
adcchannels = {0,1,2,3}
|
adcchannels = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}
|
||||||
adcsmoothing = {4, 16, 32, 64}
|
adcsmoothing = {4, 4, 4, 4, 16, 16, 16, 16, 32, 32, 32, 32, 64, 128, 64, 128}
|
||||||
else
|
else
|
||||||
timer = 0
|
timer = 0
|
||||||
adcchannels = {0,1,2,3}
|
adcchannels = {0,1,2,3}
|
||||||
adcsmoothing = {4, 16, 32, 64}
|
adcsmoothing = {4, 64, 32, 16}
|
||||||
end
|
end
|
||||||
|
|
||||||
for i, v in ipairs(adcchannels) do
|
for i, v in ipairs(adcchannels) do
|
||||||
adc.setblocking(v,0)
|
adc.setblocking(v,0)
|
||||||
adc.setsmoothing(v,adcsmoothing[i])
|
adc.setsmoothing(v,adcsmoothing[i])
|
||||||
adc.setclock(v, 30 ,timer)
|
adc.setclock(v, 50 ,timer)
|
||||||
end
|
end
|
||||||
|
|
||||||
adc.sample(adcchannels,128)
|
adc.sample(adcchannels,128)
|
||||||
@ -26,9 +26,6 @@ term.putstr(" CH SLEN RES")
|
|||||||
term.gotoxy(1,#adcchannels+5)
|
term.gotoxy(1,#adcchannels+5)
|
||||||
term.putstr("Press ESC to exit.")
|
term.putstr("Press ESC to exit.")
|
||||||
|
|
||||||
local adcvals = {}
|
|
||||||
local ctr = 0
|
|
||||||
local key
|
|
||||||
local sample = adc.sample
|
local sample = adc.sample
|
||||||
local getsample = adc.getsample
|
local getsample = adc.getsample
|
||||||
local samplesready = adc.samplesready
|
local samplesready = adc.samplesready
|
||||||
@ -42,7 +39,7 @@ while true do
|
|||||||
term.gotoxy(1,i+3)
|
term.gotoxy(1,i+3)
|
||||||
term.putstr(string.format("ADC%d (%03d): %04d\n", v, adcsmoothing[i], tsample))
|
term.putstr(string.format("ADC%d (%03d): %04d\n", v, adcsmoothing[i], tsample))
|
||||||
end
|
end
|
||||||
if adc.isdone(v) == 1 then adc.sample(adcchannels,128) end
|
if adc.isdone(v) == 1 then adc.sample(v,128) end
|
||||||
end
|
end
|
||||||
key = term.getch( term.NOWAIT )
|
key = term.getch( term.NOWAIT )
|
||||||
if key == term.KC_ESC then break end
|
if key == term.KC_ESC then break end
|
||||||
|
@ -24,17 +24,15 @@ term.gotoxy(1,#adcchannels+6)
|
|||||||
term.putstr("Press ESC to exit.")
|
term.putstr("Press ESC to exit.")
|
||||||
|
|
||||||
local adcvals = {}
|
local adcvals = {}
|
||||||
local ctr = 0
|
|
||||||
local key, stime, etime, dtime
|
local key, stime, etime, dtime
|
||||||
local sample = adc.sample
|
local sample = adc.sample
|
||||||
local getsample = adc.getsample
|
local getsample = adc.getsample
|
||||||
local tread = tmr.read
|
local tread = tmr.read
|
||||||
|
local tstart = tmr.start
|
||||||
local i, v
|
local i, v
|
||||||
|
|
||||||
tmr.start(0)
|
|
||||||
|
|
||||||
while true do
|
while true do
|
||||||
stime = tread(0)
|
stime = tstart(0)
|
||||||
for j=1,numiter do
|
for j=1,numiter do
|
||||||
sample(adcchannels, 1)
|
sample(adcchannels, 1)
|
||||||
for i, v in ipairs(adcchannels) do
|
for i, v in ipairs(adcchannels) do
|
||||||
@ -46,7 +44,7 @@ while true do
|
|||||||
|
|
||||||
term.gotoxy(1,4)
|
term.gotoxy(1,4)
|
||||||
for i, v in ipairs(adcchannels) do
|
for i, v in ipairs(adcchannels) do
|
||||||
term.putstr(string.format("ADC%d (%03d): %04d\n", v, adcsmoothing[i],adcvals[i]))
|
term.putstr(string.format("ADC%02d (%03d): %04d\n", v, adcsmoothing[i],adcvals[i]))
|
||||||
term.gotoxy(1,i+4)
|
term.gotoxy(1,i+4)
|
||||||
end
|
end
|
||||||
term.putstr(string.format("Tcyc: %06d (us)\n",dtime))
|
term.putstr(string.format("Tcyc: %06d (us)\n",dtime))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user