Skip to content
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

Jump to bottom

enable pd comms #185

Merged
merged 3 commits into from
Aug 20, 2024
Merged

enable pd comms #185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e54ca01
enable pd comms
ChrisDick Jul 16, 2024
d93894b
remove highest voltage tracking
ChrisDick Aug 4, 2024
8d9b636
always use vSafe5V PDO
ChrisDick Aug 15, 2024
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
25 changes: 0 additions & 25 deletions drivers/tildagon_power/fusb302b/fusb302b_pd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,31 +84,6 @@ void fusbpd_decode( pd_state_t* state, fusb_state_t* fusb )
}
}

/**
* @brief select the highest voltage pdo up to 14V
* @param state the comms state onject
* @return the index of the pdo object
*/
uint8_t fusbpd_select_pdo( pd_state_t* state )
{
uint16_t highest_voltage = 5000U;
uint8_t index = 0U;
for ( uint8_t i = 0U; i < state->last_rx_header.sop.number_objects; i++ )
{
const uint16_t voltage = state->pdos[i].fixed.voltage * 50;
if (
( state->pdos[i].fixed.pdo_type == PD_FIXED_SUPPLY )
&& ( voltage > highest_voltage )
&& ( voltage < 14000 )
)
{
highest_voltage = voltage;
index = i;
}
}
return index;
}

/**
* @brief creat a request power message
* @param state the comms state onject
Expand Down
6 changes: 0 additions & 6 deletions drivers/tildagon_power/fusb302b/fusb302b_pd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,12 +164,6 @@ typedef struct
* @param fusb the object for the fusb to use
*/
extern void fusbpd_decode( pd_state_t* state, fusb_state_t* fusb );
/**
* @brief select the highest voltage pdo up to 14V
* @param state the comms state onject
* @return the index of the pdo object
*/
extern uint8_t fusbpd_select_pdo( pd_state_t* state );
/**
* @brief creat a request power message
* @param state the comms state onject
Expand Down
26 changes: 19 additions & 7 deletions drivers/tildagon_power/tildagon_power.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,8 +310,7 @@ void device_unattached_handler( event_t event )
determine_input_current_limit( &usb_in );
if ( ( usb_in.fusb.input_current_limit >= 1500 ) && ( device_pd_state == NOT_STARTED ) )
{
//todo enable device pd
//fusb_setup_pd( &usb_in.fusb );
fusb_setup_pd( &usb_in.fusb );
device_pd_state = WAITING;
}
fusb_mask_interrupt_bclevel( &usb_in.fusb, 1 );
Expand All @@ -334,8 +333,7 @@ void device_attached_handler( event_t event )
determine_input_current_limit( &usb_in );
if ( ( usb_in.fusb.input_current_limit >= 1500 ) && ( device_pd_state == NOT_STARTED ) )
{
//todo enable device pd
//fusb_setup_pd( &usb_in.fusb );
fusb_setup_pd( &usb_in.fusb );
device_pd_state = WAITING;
}
fusb_mask_interrupt_bclevel( &usb_in.fusb, 1 );
Expand Down Expand Up @@ -364,15 +362,29 @@ void device_pd_machine ( event_t event )
fusbpd_decode( &usb_in.pd, &usb_in.fusb );
if ( usb_in.pd.last_rx_data_msg_type == PD_DATA_SOURCE_CAPABILITIES )
{
uint8_t index = fusbpd_select_pdo( &usb_in.pd );
fusbpd_request_power( &usb_in.pd, index, usb_in.pd.pdos[index].fixed.max_current * 10, usb_in.pd.pdos[index].fixed.max_current * 10 );
/*
We only need 5V so can use the first object, from the usb 3 standard:
The vSafe5V Fixed Supply Object Shall always be the first object.
A Source Shall Not offer multiple Power Data Objects of the same
type (fixed, variable, Battery) and the same Voltage but Shall
instead offer one Power Data Object with the highest available
current for that Source capability and Voltage.

*/
uint32_t current = usb_in.pd.pdos[0].fixed.max_current * 10;
/* limit current to the maximum current of a non active cable */
if ( current > 3000 )
{
current = 3000;
}
fusbpd_request_power( &usb_in.pd, 0, current, current );
fusb_send( &usb_in.fusb, usb_in.pd.tx_buffer, usb_in.pd.message_length );
usb_in.pd.last_rx_data_msg_type = PD_DATA_DO_NOT_USE;
device_pd_state = POWER_REQUESTED;
}
else if( usb_in.pd.last_rx_data_msg_type == PD_DATA_VENDOR_DEFINED )
{
/* if vendor pdo received decide on badge to badge and callback? */
/* ToDo: if vendor pdo received decide on badge to badge and callback? */
}
}
break;
Expand Down
Loading