Skip to content

Commit 850854b

Browse files
facchinmfacchinm
committed
NICLA: improve system library thread safety
1 parent 78e071a commit 850854b

File tree

4 files changed

+112
-98
lines changed

4 files changed

+112
-98
lines changed

‎libraries/Nicla_System/Nicla_System.cpp‎

Lines changed: 82 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -8,109 +8,104 @@
88
# endif
99
#endif
1010

11-
void pingI2C();
1211

13-
namespace nicla {
14-
15-
BQ25120A _pmic;
16-
17-
bool ledPoweredOn = false;
12+
RGBled nicla::leds;
13+
BQ25120A nicla::_pmic;
14+
rtos::Mutex nicla::i2c_mutex;
1815

16+
void nicla::pingI2CThd() {
17+
while(1) {
18+
// already protected by a mutex on Wire operations
19+
readLDOreg();
20+
delay(10000);
21+
}
22+
}
1923

20-
bool begin()
21-
{
22-
pinMode(P0_10, OUTPUT);
23-
digitalWrite(P0_10, HIGH);
24-
Wire1.begin();
24+
bool nicla::begin()
25+
{
26+
pinMode(P0_10, OUTPUT);
27+
digitalWrite(P0_10, HIGH);
28+
Wire1.begin();
2529
#ifndef NO_NEED_FOR_WATCHDOG_THREAD
2630
static rtos::Thread th(osPriorityHigh, 1024, nullptr, "ping_thread");
27-
th.start(pingI2C);
31+
th.start(&nicla::pingI2CThd);
2832
#endif
29-
}
30-
31-
void enableCD()
32-
{
33-
pinMode(p25, OUTPUT);
34-
digitalWrite(p25, HIGH);
35-
}
36-
37-
void disableCD()
38-
{
39-
pinMode(p25, OUTPUT);
40-
digitalWrite(p25, LOW);
41-
}
42-
43-
/*
44-
LDO reg:
45-
| B7 | B6 | B5 | B4 | B3 | B2 | B1 | B0 |
46-
| EN_LDO | LDO_4 | LDO_3 | LDO_2 | LDO_1 | LDO_0 | X | X |
47-
48-
Conversion function:
49-
LDO = 0.8V + LDO_CODE * 100mV
33+
}
5034

51-
- for LDO = 3.3V:
52-
- set LCO_CODE = 25 (0x19)
53-
- shift to lef by 2 positions: (0x19 << 2) = 0x64
54-
- set EN_LDO: 0xE4
55-
- for LDO = 1.8V:
56-
- set LCO_CODE = 10 (0x0A)
57-
- shift to lef by 2 positions: (0x0A << 2) = 0x28
58-
- set EN_LDO: 0xA8
59-
*/
35+
void nicla::enableCD()
36+
{
37+
pinMode(p25, OUTPUT);
38+
digitalWrite(p25, HIGH);
39+
}
6040

61-
bool enable3V3LDO()
62-
{
63-
enableCD();
64-
uint8_t ldo_reg = 0xE4;
65-
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
66-
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
67-
disableCD();
68-
return false;
69-
}
70-
disableCD();
71-
return true;
72-
}
41+
void nicla::disableCD()
42+
{
43+
pinMode(p25, OUTPUT);
44+
digitalWrite(p25, LOW);
45+
}
7346

74-
bool enable1V8LDO()
75-
{
76-
enableCD();
77-
uint8_t ldo_reg = 0xA8;
78-
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
79-
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
80-
disableCD();
81-
return false;
82-
}
47+
/*
48+
LDO reg:
49+
| B7 | B6 | B5 | B4 | B3 | B2 | B1 | B0 |
50+
| EN_LDO | LDO_4 | LDO_3 | LDO_2 | LDO_1 | LDO_0 | X | X |
51+
52+
Conversion function:
53+
LDO = 0.8V + LDO_CODE * 100mV
54+
55+
- for LDO = 3.3V:
56+
- set LCO_CODE = 25 (0x19)
57+
- shift to lef by 2 positions: (0x19 << 2) = 0x64
58+
- set EN_LDO: 0xE4
59+
- for LDO = 1.8V:
60+
- set LCO_CODE = 10 (0x0A)
61+
- shift to lef by 2 positions: (0x0A << 2) = 0x28
62+
- set EN_LDO: 0xA8
63+
*/
64+
65+
bool nicla::enable3V3LDO()
66+
{
67+
enableCD();
68+
uint8_t ldo_reg = 0xE4;
69+
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
70+
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
8371
disableCD();
84-
return true;
72+
return false;
8573
}
74+
disableCD();
75+
return true;
76+
}
8677

87-
bool disableLDO()
88-
{
89-
enableCD();
90-
uint8_t ldo_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
91-
ldo_reg &= 0x7F;
92-
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
93-
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
94-
disableCD();
95-
return false;
96-
}
78+
bool nicla::enable1V8LDO()
79+
{
80+
enableCD();
81+
uint8_t ldo_reg = 0xA8;
82+
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
83+
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
9784
disableCD();
98-
return true;
85+
return false;
9986
}
87+
disableCD();
88+
return true;
89+
}
10090

101-
uint8_t readLDOreg()
102-
{
103-
enableCD();
104-
uint8_t ldo_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
91+
bool nicla::disableLDO()
92+
{
93+
enableCD();
94+
uint8_t ldo_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
95+
ldo_reg &= 0x7F;
96+
_pmic.writeByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL, ldo_reg);
97+
if (_pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL) != ldo_reg) {
10598
disableCD();
106-
return ldo_reg;
99+
return false;
107100
}
108-
101+
disableCD();
102+
return true;
109103
}
110104

111-
void pingI2C() {
112-
while(1) {
113-
nicla::readLDOreg();
114-
delay(10000);
115-
}
116-
}
105+
uint8_t nicla::readLDOreg()
106+
{
107+
enableCD();
108+
uint8_t ldo_reg = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_LDO_CTRL);
109+
disableCD();
110+
return ldo_reg;
111+
}

‎libraries/Nicla_System/Nicla_System.h‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,27 @@
88
#include <mbed.h>
99
#include <I2C.h>
1010

11-
namespace nicla {
11+
class nicla {
1212

13-
bool begin();
14-
bool enable3V3LDO();
15-
bool enable1V8LDO();
16-
bool disableLDO();
17-
uint8_t readLDOreg();
13+
public:
14+
static bool begin();
15+
static bool enable3V3LDO();
16+
static bool enable1V8LDO();
17+
static bool disableLDO();
1818

1919
static RGBled leds;
20+
static BQ25120A _pmic;
2021

21-
}
22+
friend class RGBled;
23+
friend class BQ25120A;
24+
friend class Arduino_BHY2;
25+
26+
private:
27+
static void pingI2CThd();
28+
static void enableCD();
29+
static void disableCD();
30+
static uint8_t readLDOreg();
31+
static rtos::Mutex i2c_mutex;
32+
};
2233

2334
#endif

‎libraries/Nicla_System/RGBled.cpp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,19 +130,24 @@ void RGBled::ledBlink(RGBColors color, uint32_t duration)
130130

131131
void RGBled::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
132132
{
133+
nicla::i2c_mutex.lock();
133134
Wire1.beginTransmission(address);
134135
Wire1.write(subAddress);
135136
Wire1.write(data);
136137
Wire1.endTransmission();
138+
nicla::i2c_mutex.unlock();
137139
}
138140

139141
uint8_t RGBled::readByte(uint8_t address, uint8_t subAddress)
140142
{
143+
nicla::i2c_mutex.lock();
141144
char response = 0xFF;
142145
Wire1.beginTransmission(address);
143146
Wire1.write(subAddress);
144147
Wire1.endTransmission(false);
145148
Wire1.requestFrom(address, 1);
146149
while(!Wire1.available()) {}
147-
return Wire1.read();
150+
uint8_t ret = Wire1.read();
151+
nicla::i2c_mutex.unlock();
152+
return ret;
148153
}

‎libraries/Nicla_System/pmic_driver.cpp‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
#include "BQ25120A.h"
44
#include "Nicla_System.h"
55

6-
using namespace nicla;
7-
86
uint8_t BQ25120A::getStatus()
97
{
108
uint8_t c = readByte(BQ25120A_ADDRESS, BQ25120A_STATUS); // Read PRODUCT_ID register for BQ25120A
@@ -13,19 +11,24 @@ uint8_t BQ25120A::getStatus()
1311

1412
void BQ25120A::writeByte(uint8_t address, uint8_t subAddress, uint8_t data)
1513
{
14+
nicla::i2c_mutex.lock();
1615
Wire1.beginTransmission(address);
1716
Wire1.write(subAddress);
1817
Wire1.write(data);
1918
Wire1.endTransmission();
19+
nicla::i2c_mutex.unlock();
2020
}
2121

2222
uint8_t BQ25120A::readByte(uint8_t address, uint8_t subAddress)
2323
{
24+
nicla::i2c_mutex.lock();
2425
char response = 0xFF;
2526
Wire1.beginTransmission(address);
2627
Wire1.write(subAddress);
2728
Wire1.endTransmission(false);
2829
Wire1.requestFrom(address, 1);
2930
while(!Wire1.available()) {}
30-
return Wire1.read();
31+
uint8_t ret = Wire1.read();
32+
nicla::i2c_mutex.unlock();
33+
return ret;
3134
}

0 commit comments

Comments
 (0)