@@ -32,12 +32,11 @@ void set_minimum_battery_voltage()
32
32
i2c_frequency (& i2c_obj , I2C_FREQUENCY );
33
33
i2c_init (& i2c_obj , I2C_SDA_B , I2C_SCL_B );
34
34
35
- if (read_from_i2c (BQ24295_I2C_ADDRESS , 0 , & data_read , i2c_obj )){
35
+ if (read_from_i2c (BQ24295_I2C_ADDRESS , 0 , & data_read , i2c_obj )) {
36
36
data_read = data_read & MIN_BATTERY_VOLTAGE_MASK ;
37
37
write_to_i2c (BQ24295_I2C_ADDRESS , 0 , data_read , i2c_obj );
38
38
//Battery Voltage is set to 3880mV
39
- }
40
- else {
39
+ } else {
41
40
// Minimum battery voltage could not be set. This is not a critical error, no need to stop execution
42
41
// It simply means that longer cabling or USB ports with lower output voltages may cause problems.
43
42
}
@@ -46,11 +45,12 @@ void set_minimum_battery_voltage()
46
45
char write_to_i2c (int slave_addr , int reg_addr , int data_write , i2c_t i2c_obj )
47
46
{
48
47
char ret_code = 0 ;
49
- if (!i2c_start (& i2c_obj )){
50
- if (i2c_byte_write (& i2c_obj , slave_addr << 1 ) == 1 )
51
- if (i2c_byte_write (& i2c_obj , reg_addr ) == 1 )
52
- if (i2c_byte_write (& i2c_obj ,data_write ) == 1 )
53
- ret_code = 1 ;
48
+ if (!i2c_start (& i2c_obj )) {
49
+ if ((i2c_byte_write (& i2c_obj , slave_addr << 1 ) == 1 ) &&
50
+ (i2c_byte_write (& i2c_obj , reg_addr ) == 1 ) &&
51
+ (i2c_byte_write (& i2c_obj ,data_write ) == 1 )) {
52
+ ret_code = 1 ;
53
+ }
54
54
i2c_stop (& i2c_obj );
55
55
}
56
56
return ret_code ;
@@ -59,14 +59,14 @@ char write_to_i2c(int slave_addr, int reg_addr, int data_write, i2c_t i2c_obj)
59
59
char read_from_i2c (int slave_addr , int reg_addr , int * data_read , i2c_t i2c_obj )
60
60
{
61
61
char ret_code = 0 ;
62
- if (!i2c_start (& i2c_obj )){
63
- if ( i2c_byte_write (& i2c_obj ,(slave_addr << 1 ))== 1 )
64
- if (i2c_byte_write (& i2c_obj , reg_addr )== 1 )
65
- if (!i2c_start (& i2c_obj ))
66
- if (i2c_byte_write (& i2c_obj , ((slave_addr << 1 ) | 0x01 )) == 1 ){
67
- * data_read = i2c_byte_read (& i2c_obj ,1 );
68
- ret_code = 1 ;
69
- }
62
+ if (!i2c_start (& i2c_obj )) {
63
+ if (( i2c_byte_write (& i2c_obj ,(slave_addr << 1 ))== 1 ) &&
64
+ (i2c_byte_write (& i2c_obj , reg_addr )== 1 ) &&
65
+ (!i2c_start (& i2c_obj )) &&
66
+ (i2c_byte_write (& i2c_obj , ((slave_addr << 1 ) | 0x01 )) == 1 )) {
67
+ * data_read = i2c_byte_read (& i2c_obj ,1 );
68
+ ret_code = 1 ;
69
+ }
70
70
i2c_stop (& i2c_obj );
71
71
}
72
72
return ret_code ;
0 commit comments