Skip to content

Move wire mutex inside PD library. #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2022
Merged

Move wire mutex inside PD library. #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/Braccio++.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
_pd_thd.start(mbed::callback(this, &BraccioClass::pd_thread_func));
attachInterrupt(PIN_FUSB302_INT, braccio_unlock_pd_semaphore_irq, FALLING);
_pd_timer.attach(braccio_unlock_pd_semaphore, 10ms);
_PD_UFP.init_PPS(PPS_V(7.2), PPS_A(2.0));
_PD_UFP.init_PPS(_i2c_mtx, PPS_V(7.2), PPS_A(2.0));

button_init();

Expand All @@ -117,11 +117,9 @@ bool BraccioClass::begin(voidFuncPtr custom_menu)
{
if (!_PD_UFP.is_PPS_ready())
{
_i2c_mtx.lock();
_PD_UFP.print_status(Serial);
_PD_UFP.set_PPS(PPS_V(7.2), PPS_A(2.0));
delay(10);
_i2c_mtx.unlock();
}
};

Expand Down Expand Up @@ -473,13 +471,11 @@ void BraccioClass::pd_thread_func()
_pd_timer.detach();
_pd_timer.attach(braccio_unlock_pd_semaphore, 50ms);
}
_i2c_mtx.lock();
if (millis() - last_time_ask_pps > 5000) {
_PD_UFP.set_PPS(PPS_V(7.2), PPS_A(2.0));
last_time_ask_pps = millis();
}
_PD_UFP.run();
_i2c_mtx.unlock();
if (_PD_UFP.is_power_ready() && _PD_UFP.is_PPS_ready()) {

}
Expand Down
5 changes: 2 additions & 3 deletions src/lib/powerdelivery/FUSB302_UFP.c → src/lib/powerdelivery/FUSB302_UFP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*
*/

#include <string.h>
#include "FUSB302_UFP.h"

/* Switches0 : 02h */
Expand Down Expand Up @@ -248,7 +247,7 @@ enum FUSB302_state_t {

static inline FUSB302_ret_t reg_read(FUSB302_dev_t *dev, uint8_t address, uint8_t *data, uint8_t count)
{
FUSB302_ret_t ret = dev->i2c_read(dev->i2c_address, address, data, count);
FUSB302_ret_t ret = dev->i2c_read(*(dev->wire_mtx), dev->i2c_address, address, data, count);
if (ret != FUSB302_SUCCESS) {
dev->err_msg = FUSB302_ERR_MSG("Fail to read register");
}
Expand All @@ -257,7 +256,7 @@ static inline FUSB302_ret_t reg_read(FUSB302_dev_t *dev, uint8_t address, uint8_

static inline FUSB302_ret_t reg_write(FUSB302_dev_t *dev, uint8_t address, uint8_t *data, uint8_t count)
{
FUSB302_ret_t ret = dev->i2c_write(dev->i2c_address, address, data, count);
FUSB302_ret_t ret = dev->i2c_write(*(dev->wire_mtx), dev->i2c_address, address, data, count);
if (ret != FUSB302_SUCCESS) {
dev->err_msg = FUSB302_ERR_MSG("Fail to write register");
}
Expand Down
8 changes: 5 additions & 3 deletions src/lib/powerdelivery/FUSB302_UFP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
#ifndef FUSB302_UFP_H
#define FUSB302_UFP_H

#include <stdint.h>
#include <Arduino.h>
#include <mbed.h>

enum {
FUSB302_SUCCESS = 0,
Expand All @@ -39,8 +40,9 @@ typedef uint8_t FUSB302_event_t;
typedef struct {
/* setup by user */
uint8_t i2c_address;
FUSB302_ret_t (*i2c_read)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
FUSB302_ret_t (*i2c_write)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
rtos::Mutex * wire_mtx;
FUSB302_ret_t (*i2c_read)(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
FUSB302_ret_t (*i2c_write)(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
FUSB302_ret_t (*delay_ms)(uint32_t t);

/* used by this library */
Expand Down
19 changes: 8 additions & 11 deletions src/lib/powerdelivery/PD_UFP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
*
*/

#include <stdint.h>
#include <string.h>

#include "PD_UFP.h"

#define t_PD_POLLING 100
Expand Down Expand Up @@ -61,16 +58,12 @@ PD_UFP_core_c::PD_UFP_core_c():
memset(&protocol, 0, sizeof(PD_protocol_t));
}

void PD_UFP_core_c::init(enum PD_power_option_t power_option)
{
init_PPS(0, 0, power_option);
}

void PD_UFP_core_c::init_PPS(uint16_t PPS_voltage, uint8_t PPS_current, enum PD_power_option_t power_option)
void PD_UFP_core_c::init_PPS(rtos::Mutex & wire_mtx, uint16_t PPS_voltage, uint8_t PPS_current, enum PD_power_option_t power_option)
{
// Initialize FUSB302
pinMode(PIN_FUSB302_INT, INPUT_PULLUP); // Set FUSB302 int pin input ant pull up
FUSB302.i2c_address = 0x22;
FUSB302.wire_mtx = &wire_mtx;
FUSB302.i2c_read = FUSB302_i2c_read;
FUSB302.i2c_write = FUSB302_i2c_write;
FUSB302.delay_ms = FUSB302_delay_ms;
Expand Down Expand Up @@ -127,8 +120,10 @@ void PD_UFP_core_c::clock_prescale_set(uint8_t prescaler)
}
}

FUSB302_ret_t PD_UFP_core_c::FUSB302_i2c_read(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count)
FUSB302_ret_t PD_UFP_core_c::FUSB302_i2c_read(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count)
{
mbed::ScopedLock<rtos::Mutex> lock(wire_mtx);

Wire.beginTransmission(dev_addr);
Wire.write(reg_addr);
Wire.endTransmission();
Expand All @@ -140,8 +135,10 @@ FUSB302_ret_t PD_UFP_core_c::FUSB302_i2c_read(uint8_t dev_addr, uint8_t reg_addr
return count == 0 ? FUSB302_SUCCESS : FUSB302_ERR_READ_DEVICE;
}

FUSB302_ret_t PD_UFP_core_c::FUSB302_i2c_write(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count)
FUSB302_ret_t PD_UFP_core_c::FUSB302_i2c_write(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count)
{
mbed::ScopedLock<rtos::Mutex> lock(wire_mtx);

Wire.beginTransmission(dev_addr);
Wire.write(reg_addr);
while (count > 0) {
Expand Down
14 changes: 6 additions & 8 deletions src/lib/powerdelivery/PD_UFP.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@
#ifndef PD_UFP_H
#define PD_UFP_H

#include <stdint.h>

#include <Arduino.h>
#include <Wire.h>
#include <HardwareSerial.h>

#define PIN_FUSB302_INT A2

extern "C" {
#include "FUSB302_UFP.h"
#include "FUSB302_UFP.h"
extern "C"
{
#include "PD_UFP_Protocol.h"
}

Expand Down Expand Up @@ -64,8 +63,7 @@ class PD_UFP_core_c
public:
PD_UFP_core_c();
// Init
void init(enum PD_power_option_t power_option = PD_POWER_OPTION_MAX_5V);
void init_PPS(uint16_t PPS_voltage, uint8_t PPS_current, enum PD_power_option_t power_option = PD_POWER_OPTION_MAX_5V);
void init_PPS(rtos::Mutex & wire_mtx, uint16_t PPS_voltage, uint8_t PPS_current, enum PD_power_option_t power_option = PD_POWER_OPTION_MAX_5V);
// Task
void run(void);
// Status
Expand All @@ -82,8 +80,8 @@ class PD_UFP_core_c
static void clock_prescale_set(uint8_t prescaler);

protected:
static FUSB302_ret_t FUSB302_i2c_read(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
static FUSB302_ret_t FUSB302_i2c_write(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
static FUSB302_ret_t FUSB302_i2c_read(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
static FUSB302_ret_t FUSB302_i2c_write(rtos::Mutex & wire_mtx, uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t count);
static FUSB302_ret_t FUSB302_delay_ms(uint32_t t);
void handle_protocol_event(PD_protocol_event_t events);
void handle_FUSB302_event(FUSB302_event_t events);
Expand Down