mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
emulation: BQ27421: implement more registers
This gets the gas gauge showing more data. Signed-off-by: Sean Cross <sean@xobs.io>
This commit is contained in:
parent
a0377db06e
commit
c392d8df90
1 changed files with 94 additions and 31 deletions
|
|
@ -26,24 +26,76 @@ namespace Antmicro.Renode.Peripherals.Sensors
|
||||||
RegistersCollection = new ByteRegisterCollection(this);
|
RegistersCollection = new ByteRegisterCollection(this);
|
||||||
IRQ = new GPIO();
|
IRQ = new GPIO();
|
||||||
DefineRegisters();
|
DefineRegisters();
|
||||||
|
Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void FinishTransmission(){}
|
private bool firstByte;
|
||||||
|
private bool secondByte;
|
||||||
|
|
||||||
|
public void FinishTransmission()
|
||||||
|
{
|
||||||
|
firstByte = true;
|
||||||
|
secondByte = false;
|
||||||
|
}
|
||||||
|
|
||||||
public void Reset()
|
public void Reset()
|
||||||
{
|
{
|
||||||
RegistersCollection.Reset();
|
RegistersCollection.Reset();
|
||||||
IRQ.Set(false);
|
IRQ.Set(false);
|
||||||
regAddress = 0;
|
regAddress = 0;
|
||||||
|
firstByte = true;
|
||||||
|
secondByte = false;
|
||||||
|
Temperature = 298.1M;
|
||||||
|
Voltage = 3700;
|
||||||
|
SoC = 90;
|
||||||
|
AvgCur = 300;
|
||||||
|
RemainingCapacity = 4000;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Write(byte[] data)
|
public void Write(byte[] data)
|
||||||
{
|
{
|
||||||
if(data.Length == 0 || data.Length == 1)
|
if (data.Length == 0)
|
||||||
{
|
{
|
||||||
this.Log(LogLevel.Warning, "Unexpected write with no data");
|
this.Log(LogLevel.Warning, "Unexpected write with no data");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (data.Length == 1)
|
||||||
|
{
|
||||||
|
if (firstByte)
|
||||||
|
{
|
||||||
|
firstByte = false;
|
||||||
|
secondByte = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (secondByte)
|
||||||
|
{
|
||||||
|
regAddress = (long)data[0];
|
||||||
|
secondByte = false;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
this.Log(LogLevel.Warning, "Unexpected write with one byte of data: {0:X2}", data[0]);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
uint dataOffset = 0;
|
||||||
|
if (firstByte)
|
||||||
|
{
|
||||||
|
dataOffset += 1;
|
||||||
|
firstByte = false;
|
||||||
|
secondByte = true;
|
||||||
|
}
|
||||||
|
if (secondByte)
|
||||||
|
{
|
||||||
|
secondByte = false;
|
||||||
|
regAddress = (long)data[dataOffset];
|
||||||
|
dataOffset += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
while (dataOffset < data.Length)
|
||||||
|
{
|
||||||
|
RegistersCollection.Write((long)regAddress, data[dataOffset]);
|
||||||
|
regAddress += 1;
|
||||||
|
dataOffset += 1;
|
||||||
|
}
|
||||||
|
|
||||||
// The first byte contains our address.
|
// The first byte contains our address.
|
||||||
this.Log(LogLevel.Noisy, "Write with {0} bytes of data: {1}", data.Length, Misc.PrettyPrintCollectionHex(data));
|
this.Log(LogLevel.Noisy, "Write with {0} bytes of data: {1}", data.Length, Misc.PrettyPrintCollectionHex(data));
|
||||||
|
|
@ -62,33 +114,45 @@ namespace Antmicro.Renode.Peripherals.Sensors
|
||||||
|
|
||||||
public byte[] Read(int count)
|
public byte[] Read(int count)
|
||||||
{
|
{
|
||||||
this.Log(LogLevel.Error, "Reading {0} bytes from register {1} (0x{1:X})", count, regAddress);
|
this.Log(LogLevel.Noisy, "Reading {0} bytes beginning at register {1} (0x{1:X})", count, (Registers)regAddress);
|
||||||
var result = new byte[count];
|
var result = new byte[count];
|
||||||
// readyPending.Value = false;
|
for (var i = 0; i < count; i++)
|
||||||
// UpdateInterrupts();
|
{
|
||||||
if (count >= 1) {
|
result[i] = RegistersCollection.Read(regAddress + i);
|
||||||
result[0] = (byte)(response & 0xff);
|
|
||||||
}
|
}
|
||||||
if (count >= 2) {
|
|
||||||
result[1] = (byte)((response >> 8) & 0xff);
|
|
||||||
}
|
|
||||||
// for(var i = 0; i < result.Length; i++)
|
|
||||||
// {
|
|
||||||
// result[i] = RegistersCollection.Read((byte)regAddress);
|
|
||||||
// this.Log(LogLevel.Error, "Read value {0}", result[i]);
|
|
||||||
// RegistersAutoIncrement();
|
|
||||||
// }
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
public decimal Temperature { get; set; }
|
public decimal Temperature { get; set; }
|
||||||
|
private uint Voltage;
|
||||||
|
private uint SoC;
|
||||||
|
private uint AvgCur;
|
||||||
|
private uint RemainingCapacity;
|
||||||
|
|
||||||
public GPIO IRQ { get; }
|
public GPIO IRQ { get; }
|
||||||
public ByteRegisterCollection RegistersCollection { get; }
|
public ByteRegisterCollection RegistersCollection { get; }
|
||||||
|
|
||||||
private void DefineRegisters()
|
private void DefineRegisters()
|
||||||
{
|
{
|
||||||
Registers.Temp.Define(this)
|
Registers.TempLow.Define(this)
|
||||||
.WithValueField(0, 8, FieldMode.Read, name: "TEMPERATURE_SENSOR", valueProviderCallback: _ => TwoComplementSignConvert(Temperature));
|
.WithValueField(0, 8, FieldMode.Read, name: "TEMPERATURE_SENSOR_LOW", valueProviderCallback: _ => ((uint)(Temperature * 10)) >> 8);
|
||||||
|
Registers.TempHigh.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "TEMPERATURE_SENSOR_LOW", valueProviderCallback: _ => ((uint)(Temperature * 10)));
|
||||||
|
Registers.VoltLow.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "VOLTAGE_LOW", valueProviderCallback: _ => Voltage >> 8);
|
||||||
|
Registers.VoltHigh.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "VOLTAGE_HIGH", valueProviderCallback: _ => Voltage);
|
||||||
|
Registers.AvgCurLow.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "AVGCUR_LOW", valueProviderCallback: _ => AvgCur >> 8);
|
||||||
|
Registers.AvgCurHigh.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "AVGCUR_HIGH", valueProviderCallback: _ => AvgCur);
|
||||||
|
Registers.RmLow.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "RM_LOW", valueProviderCallback: _ => RemainingCapacity >> 8);
|
||||||
|
Registers.RmHigh.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "RM_HIGH", valueProviderCallback: _ => RemainingCapacity);
|
||||||
|
Registers.SocLow.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "SOC_LOW", valueProviderCallback: _ => SoC);
|
||||||
|
Registers.SocHigh.Define(this)
|
||||||
|
.WithValueField(0, 8, FieldMode.Read, name: "SOC_HIGH", valueProviderCallback: _ => SoC);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RegistersAutoIncrement()
|
private void RegistersAutoIncrement()
|
||||||
|
|
@ -105,7 +169,7 @@ namespace Antmicro.Renode.Peripherals.Sensors
|
||||||
private byte TwoComplementSignConvert(decimal temp)
|
private byte TwoComplementSignConvert(decimal temp)
|
||||||
{
|
{
|
||||||
byte tempAsByte = Decimal.ToByte(temp);
|
byte tempAsByte = Decimal.ToByte(temp);
|
||||||
if(temp < 0)
|
if (temp < 0)
|
||||||
{
|
{
|
||||||
byte twoComplementTemp = (byte)(~tempAsByte + 1);
|
byte twoComplementTemp = (byte)(~tempAsByte + 1);
|
||||||
return twoComplementTemp;
|
return twoComplementTemp;
|
||||||
|
|
@ -118,39 +182,38 @@ namespace Antmicro.Renode.Peripherals.Sensors
|
||||||
private IFlagRegisterField highFreqDataRateMode;
|
private IFlagRegisterField highFreqDataRateMode;
|
||||||
private IValueRegisterField outDataRate;
|
private IValueRegisterField outDataRate;
|
||||||
private IValueRegisterField fullScale;
|
private IValueRegisterField fullScale;
|
||||||
private Registers regAddress;
|
private long regAddress;
|
||||||
|
|
||||||
private ushort controlStatus;
|
private ushort controlStatus;
|
||||||
private ushort response;
|
|
||||||
|
|
||||||
private enum Registers : byte
|
private enum Registers : byte
|
||||||
{
|
{
|
||||||
Cntl = 0x00,
|
Cntl = 0x00,
|
||||||
// Reserved: 0x01
|
// Reserved: 0x01
|
||||||
Temp = 0x02,
|
TempLow = 0x02,
|
||||||
// Reserved: 0x03
|
TempHigh = 0x03,
|
||||||
Volt = 0x04,
|
VoltLow = 0x04,
|
||||||
// Reserved: 0x05
|
VoltHigh = 0x05,
|
||||||
Flag = 0x06,
|
Flag = 0x06,
|
||||||
// Reserved: 0x07
|
// Reserved: 0x07
|
||||||
NomCap = 0x08,
|
NomCap = 0x08,
|
||||||
// Reserved: 0x09
|
// Reserved: 0x09
|
||||||
FullCap = 0x0A,
|
FullCap = 0x0A,
|
||||||
// Reserved: 0x0B
|
// Reserved: 0x0B
|
||||||
Rm = 0x0C,
|
RmLow = 0x0C,
|
||||||
// Reserved: 0x0d
|
RmHigh = 0x0D,
|
||||||
Fcc = 0x0e,
|
Fcc = 0x0e,
|
||||||
// Reserved: 0x0f
|
// Reserved: 0x0f
|
||||||
AvgCur = 0x10,
|
AvgCurLow = 0x10,
|
||||||
// Reserved: 0x11
|
AvgCurHigh = 0x11,
|
||||||
SbyCur = 0x12,
|
SbyCur = 0x12,
|
||||||
// Reserved: 0x13
|
// Reserved: 0x13
|
||||||
MaxCur = 0x14,
|
MaxCur = 0x14,
|
||||||
// Reserved: 0x15 - 0x17
|
// Reserved: 0x15 - 0x17
|
||||||
AvgPwr = 0x18,
|
AvgPwr = 0x18,
|
||||||
// Reserved: 0x19 = 0x1b
|
// Reserved: 0x19 = 0x1b
|
||||||
Soc = 0x1c,
|
SocLow = 0x1c,
|
||||||
// Reserved: 0x1d
|
SocHigh = 0x1d,
|
||||||
IntTemp = 0x1e,
|
IntTemp = 0x1e,
|
||||||
// Reserved: 0x1f
|
// Reserved: 0x1f
|
||||||
Soh = 0x20,
|
Soh = 0x20,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue