Skip to content
Snippets Groups Projects
Commit e7419b24 authored by Sascha Laue's avatar Sascha Laue Committed by Wolfgang Denk
Browse files

lwmon5: fix manual merge error in POST 


Signed-off-by: default avatarSascha Laue <sascha.laue@liebherr.com>
parent de109d90
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
post/board/lwmon5/sysmon.c
+ 2
− 2
View file @ e7419b24
......@@ -132,7 +132,7 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V", "V", &sysmon_dspic, NULL, NULL,
100, 1000, 0, 0xFFFF, 0xFFFF,
100, 1000, -0x8000, 0x7FFF, 0xFFFF,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
VOLTAGE_5V_MIN, VOLTAGE_5V_MAX, 0,
REG_VOLTAGE_5V,
......@@ -140,7 +140,7 @@ static sysmon_table_t sysmon_table[] =
{
"+ 5 V standby", "V", &sysmon_dspic, NULL, NULL,
100, 1000, 0, 0xFFFF, 0xFFFF,
100, 1000, -0x8000, 0x7FFF, 0xFFFF,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
VOLTAGE_5V_STANDBY_MIN, VOLTAGE_5V_STANDBY_MAX, 0,
REG_VOLTAGE_5V_STANDBY,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment