Skip to content

Commit

Permalink
fix func name
Browse files Browse the repository at this point in the history
  • Loading branch information
meltingrabbit committed Oct 30, 2022
1 parent 4e28f86 commit 71c74dc
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ int CCSDS_rx(void* my_ccsds_v, void* data_v, int buffer_size)
(CCSDS_Config*)my_ccsds_v;

#ifdef USE_SCI_COM_WINGS
return SILS_SCI_CCSDS_IF_RX(data, buffer_size);
return SILS_SCI_CCSDS_IF_rx(data, buffer_size);
#endif

return 0;
Expand All @@ -53,7 +53,7 @@ int CCSDS_tx(void* my_ccsds_v, void* data_v, int data_size)
if (!CCSDS_get_buffer_num()) return CCSDS_ERR_TX_NO_BUFFER;

#ifdef USE_SCI_COM_WINGS
ret = SILS_SCI_CCSDS_IF_TX(data, data_size);
ret = SILS_SCI_CCSDS_IF_tx(data, data_size);
#endif
if (ret == 0) return CCSDS_ERR_TX_INVALID;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ int SILS_SCI_CCSDS_IF_init(void)
return 0;
}

int SILS_SCI_CCSDS_IF_TX(unsigned char* data_v, int count)
int SILS_SCI_CCSDS_IF_tx(unsigned char* data_v, int count)
{
SILS_SCI_CCSDS_IF_sci_com_.Send(data_v, 0, count);
return 0;
}

int SILS_SCI_CCSDS_IF_RX(unsigned char* data_v, int count)
int SILS_SCI_CCSDS_IF_rx(unsigned char* data_v, int count)
{
return SILS_SCI_CCSDS_IF_sci_com_.Receive(data_v, 0, count);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SCIComPortCcsds : public SCIComPort
};

int SILS_SCI_CCSDS_IF_init();
int SILS_SCI_CCSDS_IF_TX(unsigned char* data_v, int count);
int SILS_SCI_CCSDS_IF_RX(unsigned char* data_v, int count);
int SILS_SCI_CCSDS_IF_tx(unsigned char* data_v, int count);
int SILS_SCI_CCSDS_IF_rx(unsigned char* data_v, int count);

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ int SILS_SCI_UART_IF_init(void)
return 0;
}

int SILS_SCI_UART_IF_TX(unsigned char* data_v, int count)
int SILS_SCI_UART_IF_tx(unsigned char* data_v, int count)
{
SILS_SCI_UART_IF_sci_com_.Send(data_v, 0, count);
return 0;
}

int SILS_SCI_UART_IF_RX(unsigned char* data_v, int count)
int SILS_SCI_UART_IF_rx(unsigned char* data_v, int count)
{
return SILS_SCI_UART_IF_sci_com_.Receive(data_v, 0, count);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class SCIComPortUart : public SCIComPort
};

int SILS_SCI_UART_IF_init();
int SILS_SCI_UART_IF_TX(unsigned char* data_v, int count);
int SILS_SCI_UART_IF_RX(unsigned char* data_v, int count);
int SILS_SCI_UART_IF_tx(unsigned char* data_v, int count);
int SILS_SCI_UART_IF_rx(unsigned char* data_v, int count);

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ int UART_rx(void* my_uart_v, void* data_v, int buffer_size)
}

#ifdef USE_SCI_COM_UART
return SILS_SCI_UART_IF_RX((unsigned char*)data_v, buffer_size);
return SILS_SCI_UART_IF_rx((unsigned char*)data_v, buffer_size);
#else
return OBC_C2A_ReceivedByObc(my_uart->ch, (unsigned char*)data_v, 0, buffer_size);
#endif
Expand All @@ -46,7 +46,7 @@ int UART_tx(void* my_uart_v, void* data_v, int data_size)
}
}
#ifdef USE_SCI_COM_UART
SILS_SCI_UART_IF_TX((unsigned char*)data_v, data_size);
SILS_SCI_UART_IF_tx((unsigned char*)data_v, data_size);
#else
if (OBC_C2A_SendFromObc(my_uart->ch, (unsigned char*)data_v, 0, data_size) < 0)
{
Expand Down

0 comments on commit 71c74dc

Please sign in to comment.