dmarkova/Colibri
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test laser code

Browse Source
This commit is contained in:
Dana Markova
2025-07-30 14:36:01 +03:00
parent 748830dfb7
commit 669e2b02a1
133 changed files with 242396 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drv/i2c.cpp
View File

@ -145,7 +145,13 @@ void I2C2_Stop()
}
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
void I2C2_Write2(unsigned char Address, const void* Data1, unsigned char Size1, const void* Data2, unsigned char Size2)
{
Write2(I2C2, Address, (unsigned char*)Data1, Size1, (unsigned char*)Data2, Size2);
}
//------------------------------------------------------------------------------
void I2C1_Write(unsigned char Address, unsigned char Data)
{

1
drv/i2c.h
View File

@ -18,6 +18,7 @@ void I2C2_Write(unsigned char Address, unsigned char Data);
void I2C2_Write(unsigned char Address, const void* Data, unsigned char Size);
void I2C2_Read(unsigned char Address, void* Data, unsigned char Size);
void I2C2_Stop();
void I2C2_Write2(unsigned char Address, const void* Data1, unsigned char Size1, const void* Data2, unsigned char Size2);
void I2C1_Init();
void I2C1_Write(unsigned char Address, unsigned char Data);

42
drv/vl53l0x.cpp
View File

@ -286,15 +286,9 @@ void VL53L0X::writeReg(uint8_t Reg, uint8_t value)
{
unsigned char reg[2];
reg[0]=Reg; reg[1]=value;
I2C1_Write(address, reg, 2);
I2C1_Stop();
//I2C1_Write(address,reg);
// I2C1_Write(address,value);
//I2C1_Stop();
// bus->beginTransmission(address);
// bus->write(reg);
// bus->write(value);
// last_status = bus->endTransmission();
I2C2_Write(address, reg, 2);
I2C2_Stop();
}
// Write a 16-bit register
@ -302,8 +296,8 @@ void VL53L0X::writeReg16Bit(uint8_t Reg, uint16_t value)
{
unsigned char reg[3];
reg[0]=Reg; reg[1]=value >> 8;reg[2]=value;
I2C1_Write(address, reg, 3);
I2C1_Stop();
I2C2_Write(address, reg, 3);
I2C2_Stop();
@ -315,8 +309,8 @@ void VL53L0X::writeReg32Bit(uint8_t Reg, uint32_t value)
{
unsigned char reg[5];
reg[0]=Reg; reg[1]=value >> 24 ;reg[2]=value >> 16; reg[3]=value >> 8 ;reg[4]=value;
I2C1_Write(address, reg, 5);
I2C1_Stop();
I2C2_Write(address, reg, 5);
I2C2_Stop();
}
@ -327,9 +321,9 @@ uint8_t VL53L0X::readReg(uint8_t reg)
uint8_t value;
I2C1_Write(address,reg);
I2C1_Read(address,&value,1);
I2C1_Stop();
I2C2_Write(address,reg);
I2C2_Read(address,&value,1);
I2C2_Stop();
return value;
}
@ -339,9 +333,9 @@ uint16_t VL53L0X::readReg16Bit(uint8_t reg)
{
uint16_t valueRead;
I2C1_Write(address,reg);
I2C1_Read(address,&valueRead, sizeof(valueRead));
I2C1_Stop();
I2C2_Write(address,reg);
I2C2_Read(address,&valueRead, sizeof(valueRead));
I2C2_Stop();
valueRead = (valueRead << 8) | (valueRead >> 8);
return valueRead;
}
@ -374,7 +368,7 @@ void VL53L0X::writeMulti(uint8_t reg, uint8_t const * src, uint8_t count)
// Reg[i]=src[i-1];
// }
I2C1_Write2(address, &reg,1,src, (count));
I2C2_Write2(address, &reg,1,src, (count));
// while (count-- > 0)
@ -382,7 +376,7 @@ void VL53L0X::writeMulti(uint8_t reg, uint8_t const * src, uint8_t count)
// I2C1_Write(address, *(src++));
//
// }
I2C1_Stop();
I2C2_Stop();
return;
}
@ -390,11 +384,11 @@ return;
// register, into the given array
void VL53L0X::readMulti(uint8_t reg, uint8_t * dst, uint8_t count)
{
I2C1_Write(address, reg);
I2C2_Write(address, reg);
I2C1_Read(address, dst, count);
I2C2_Read(address, dst, count);
I2C1_Stop();
I2C2_Stop();
return;
}