BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dmm: vc870: fix AC conversion factors 

Testing showed that AC current needs to be handled different from DC.
Note that ACA is still untested because of limited testing equipment.

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang 2016-01-03 22:27:41 +01:00 committed by Uwe Hermann
parent b89462e457
commit b4a0770ef8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dmm/vc870.c
View File

@ -46,11 +46,17 @@ static const float factors[][8] = {
{1e-4, 0, 0, 0, 0, 0, 0, 0}, /* Diode */ {1e-4, 0, 0, 0, 0, 0, 0, 0}, /* Diode */
{1e-3, 1e-2, 1e-1, 1, 1e1, 1e2, 1e3, 1e4}, /* Frequency */ {1e-3, 1e-2, 1e-1, 1, 1e1, 1e2, 1e3, 1e4}, /* Frequency */
{1e-2, 0, 0, 0, 0, 0, 0, 0}, /* Loop current */ {1e-2, 0, 0, 0, 0, 0, 0, 0}, /* Loop current */
/*
* Note: Measurements showed that AC and DC differ
* in the factors used, although docs say they should
* be the same.
*/
{1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* DCµA */ {1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* DCµA */
{1e-8, 1e-7, 0, 0, 0, 0, 0, 0}, /* ACµA */ {1e-7, 1e-6, 0, 0, 0, 0, 0, 0}, /* ACµA */
{1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* DCmA */ {1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* DCmA */
{1e-6, 1e-5, 0, 0, 0, 0, 0, 0}, /* ACmA */ {1e-5, 1e-4, 0, 0, 0, 0, 0, 0}, /* ACmA */
{1e-3, 0, 0, 0, 0, 0, 0, 0}, /* DCA */ {1e-3, 0, 0, 0, 0, 0, 0, 0}, /* DCA */
/* TODO: Verify factor for ACA */
{1e-3, 0, 0, 0, 0, 0, 0, 0}, /* ACA */ {1e-3, 0, 0, 0, 0, 0, 0, 0}, /* ACA */
{1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Act+apparent power */ {1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Act+apparent power */
{1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Power factor / freq */ {1e-1, 0, 0, 0, 0, 0, 0, 0}, /* Power factor / freq */