catarrh/simtrace2
1
0
Fork 0
mirror of https://gitea.osmocom.org/sim-card/simtrace2.git synced 2026-03-26 18:28:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

reintroduce adc2uv used in boardver_adc.c and mode_cardemu.c

Browse Source 
Change-Id: I52e3919adfd1d888eb130b5ec9298315c4e507c9
This commit is contained in:
Kévin Redon
2018-07-01 17:12:14 +02:00
parent 4635c71c06
commit cb700ef087
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/libboard/common/include/boardver_adc.h
View File

@@ -1,3 +1,4 @@
#pragma once #pragma once
uint32_t adc2uv(uint16_t adc);
int get_board_version_adc(void); int get_board_version_adc(void);

7
firmware/libboard/common/source/boardver_adc.c
View File

@@ -1,6 +1,13 @@
#include "board.h" #include "board.h"
#include "boardver_adc.h" #include "boardver_adc.h"
#define UV_PER_LSB ((3300 * 1000) / 4096)
uint32_t adc2uv(uint16_t adc)
{
uint32_t uv = (uint32_t) adc * UV_PER_LSB;
return uv;
}
/*********************************************************************** /***********************************************************************
* ADC for board version detection * ADC for board version detection
***********************************************************************/ ***********************************************************************/

8
firmware/libcommon/source/mode_cardemu.c
View File

@@ -1,6 +1,7 @@
//#define TRACE_LEVEL 6 //#define TRACE_LEVEL 6
#include "board.h" #include "board.h"
#include "boardver_adc.h"
#include "simtrace.h" #include "simtrace.h"
#include "ringbuffer.h" #include "ringbuffer.h"
#include "card_emu.h" #include "card_emu.h"
@@ -278,7 +279,6 @@ static int card_vcc_adc_init(void)
return 0; return 0;
} }
#define UV_PER_LSB ((3300 * 1000) / 4096)
#define VCC_UV_THRESH_1V8 1500000 #define VCC_UV_THRESH_1V8 1500000
#define VCC_UV_THRESH_3V 2800000 #define VCC_UV_THRESH_3V 2800000
@@ -298,12 +298,6 @@ static void process_vcc_adc(struct cardem_inst *ci)
ci->vcc_uv_last = ci->vcc_uv; ci->vcc_uv_last = ci->vcc_uv;
} }
static uint32_t adc2uv(uint16_t adc)
{
uint32_t uv = (uint32_t) adc * UV_PER_LSB;
return uv;
}
void ADC_IrqHandler(void) void ADC_IrqHandler(void)
{ {
#ifdef CARDEMU_SECOND_UART #ifdef CARDEMU_SECOND_UART