diff options
| author | Alec Berg <alecaberg@chromium.org> | 2014-08-18 17:49:53 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-08-22 05:47:49 +0000 |
| commit | c7c312d057b84ebc13bf462ac884cdaf40fcb3a2 (patch) | |
| tree | 46a7b585928d0c18872737eaf95ae3d336aa5554 /board/zinger | |
| parent | 445691932cb08dbfb8c22a50c9071b5fd8df3c3c (diff) | |
| download | chrome-ec-c7c312d057b84ebc13bf462ac884cdaf40fcb3a2.tar.gz | |
zinger: add custom VDM to read last measured current
Add custom VDM to read last measured output current in mA.
BUG=chrome-os-partner:30850
BRANCH=none
TEST=Run "pd 0 vdm curr" on samus pd console and verify
reasonable current
Change-Id: Ie1f1ab235560eb4e90f399ceac31c5cd93003d80
Signed-off-by: Alec Berg <alecaberg@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/212981
Diffstat (limited to 'board/zinger')
| -rw-r--r-- | board/zinger/usb_pd_policy.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c index b73b7fbaf0..e4aa2d1f98 100644 --- a/board/zinger/usb_pd_policy.c +++ b/board/zinger/usb_pd_policy.c @@ -82,6 +82,8 @@ static timestamp_t fault_deadline; #define VBUS_MV(mv) ((mv)*ADC_SCALE/VOLT_DIV/VDDA_MV) /* convert VBUS current in raw ADC value */ #define VBUS_MA(ma) ((ma)*ADC_SCALE*R_SENSE/1000*CURR_GAIN/VDDA_MV) +/* convert raw ADC value to mA */ +#define ADC_TO_CURR_MA(vbus) ((vbus)*1000/(ADC_SCALE*R_SENSE)*VDDA_MV/CURR_GAIN) /* Max current : 20% over 3A = 3.6A */ #define MAX_CURRENT VBUS_MA(3600) @@ -133,6 +135,9 @@ static int last_volt_idx; static int down_step; static uint64_t down_step_done_time; +/* output current measurement */ +int vbus_amp; + int pd_request_voltage(uint32_t rdo) { int op_ma = rdo & 0x3FF; @@ -200,7 +205,7 @@ void pd_power_supply_reset(int port) int pd_board_checks(void) { - int vbus_volt, vbus_amp; + int vbus_volt; int ovp_idx; /* Reload the watchdog */ @@ -329,6 +334,11 @@ int pd_custom_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload) case VDO_CMD_PING_ENABLE: pd_ping_enable(0, payload[1]); break; + case VDO_CMD_CURRENT: + /* return last measured current */ + payload[1] = ADC_TO_CURR_MA(vbus_amp); + rsize = 2; + break; default: /* Unknown : do not answer */ return 0; |