// Project Includes
#include <cli.h>
+#include <kll_defs.h>
#include <led.h>
#include <print.h>
#include <macro.h>
} \
for ( uint8_t c = 0; c < count; c++ ) \
{ \
- printHex( buffer[ c ] ); \
- print( " +" #uartNum NL ); \
+ if ( Connect_debug ) \
+ { \
+ printHex( buffer[ c ] ); \
+ print( " +" #uartNum NL ); \
+ } \
uart##uartNum##_buffer[ uart##uartNum##_buffer_tail++ ] = buffer[ c ]; \
uart##uartNum##_buffer_items++; \
if ( uart##uartNum##_buffer_tail >= uart_buffer_size ) \
while ( available-- > 0 ) \
{ \
uint8_t byteRead = UART##uartNum##_D; \
- printHex( byteRead ); \
- print( "(" ); \
- printInt8( available ); \
- print( ") <-" ); \
+ if ( Connect_debug ) \
+ { \
+ printHex( byteRead ); \
+ print( "(" ); \
+ printInt8( available ); \
+ print( ") <-" ); \
+ } \
switch ( uart##uartNum##_rx_status ) \
{ \
case UARTStatus_Wait: \
- print(" SYN "); \
+ if ( Connect_debug ) \
+ { \
+ print(" SYN "); \
+ } \
uart##uartNum##_rx_status = byteRead == 0x16 ? UARTStatus_SYN : UARTStatus_Wait; \
break; \
case UARTStatus_SYN: \
- print(" SOH "); \
+ if ( Connect_debug ) \
+ { \
+ print(" SOH "); \
+ } \
uart##uartNum##_rx_status = byteRead == 0x01 ? UARTStatus_SOH : UARTStatus_Wait; \
break; \
case UARTStatus_SOH: \
{ \
- print(" CMD "); \
+ if ( Connect_debug ) \
+ { \
+ print(" CMD "); \
+ } \
uint8_t byte = byteRead; \
if ( byte <= Animation ) \
{ \
uart##uartNum##_rx_status = UARTStatus_Wait; \
break; \
default: \
- print("###"); \
+ if ( Connect_debug ) \
+ { \
+ print("###"); \
+ } \
break; \
} \
break; \
} \
case UARTStatus_Command: \
{ \
- print(" CMD "); \
+ if ( Connect_debug ) \
+ { \
+ print(" CMD "); \
+ } \
uint8_t (*rcvFunc)(uint8_t, uint16_t(*), uint8_t) = (uint8_t(*)(uint8_t, uint16_t(*), uint8_t))(Connect_receiveFunctions[ uart##uartNum##_rx_command ]); \
if ( rcvFunc( byteRead, (uint16_t*)&uart##uartNum##_rx_bytes_waiting, uartNum ) ) \
uart##uartNum##_rx_status = UARTStatus_Wait; \
available++; \
continue; \
} \
- print( NL ); \
+ if ( Connect_debug ) \
+ { \
+ print( NL ); \
+ } \
} \
}
// CLI Functions
void cliFunc_connectCmd ( char *args );
void cliFunc_connectIdl ( char *args );
+void cliFunc_connectLst ( char *args );
void cliFunc_connectMst ( char *args );
void cliFunc_connectRst ( char *args );
void cliFunc_connectSts ( char *args );
// Connect Module command dictionary
CLIDict_Entry( connectCmd, "Sends a command via UART Connect, first arg is which uart, next arg is the command, rest are the arguments." );
CLIDict_Entry( connectIdl, "Sends N number of Idle commands, 2 is the default value, and should be sufficient in most cases." );
+CLIDict_Entry( connectLst, "Lists available UARTConnect commands and index id" );
CLIDict_Entry( connectMst, "Sets the device as master. Use argument of s to set as slave." );
CLIDict_Entry( connectRst, "Resets both Rx and Tx connect buffers and state variables." );
CLIDict_Entry( connectSts, "UARTConnect status." );
CLIDict_Def( uartConnectCLIDict, "UARTConnect Module Commands" ) = {
CLIDict_Item( connectCmd ),
CLIDict_Item( connectIdl ),
+ CLIDict_Item( connectLst ),
CLIDict_Item( connectMst ),
CLIDict_Item( connectRst ),
CLIDict_Item( connectSts ),
uint8_t Connect_master = 0;
+// -- Control Variables --
+uint32_t Connect_lastCheck = 0; // Cable Check scheduler
+uint8_t Connect_debug = 0; // Set 1 for debug
+
+
// -- Rx Status Variables --
volatile UARTStatus uart0_rx_status;
// Check if this is the first byte
if ( *pending_bytes == 0xFFFF )
{
- dbug_msg("PENDING SET -> ");
- printHex( byte );
- print(" ");
*pending_bytes = byte;
- printHex( *pending_bytes );
- print( NL );
+
+ if ( Connect_debug )
+ {
+ dbug_msg("PENDING SET -> ");
+ printHex( byte );
+ print(" ");
+ printHex( *pending_bytes );
+ print( NL );
+ }
}
// Verify byte
else
Connect_cableOkSlave = 1;
}
}
- dbug_msg("CABLECHECK RECEIVE - ");
- printHex( byte );
- print(" ");
- printHex( *pending_bytes );
- print(NL);
+
+ if ( Connect_debug )
+ {
+ dbug_msg("CABLECHECK RECEIVE - ");
+ printHex( byte );
+ print(" ");
+ printHex( *pending_bytes );
+ print( NL );
+ }
// Check whether the cable check has finished
return *pending_bytes == 0 ? 1 : 0;
{
dbug_print("IdRequest");
// Check the directionality
- if ( !to_master )
+ if ( to_master )
{
erro_print("Invalid IdRequest direction...");
}
{
dbug_print("IdEnumeration");
// Check the directionality
- if ( to_master )
+ if ( !to_master )
{
erro_print("Invalid IdEnumeration direction...");
}
{
dbug_print("IdReport");
// Check the directionality
- if ( !to_master )
+ if ( to_master )
{
erro_print("Invalid IdRequest direction...");
}
// Register Connect CLI dictionary
CLI_registerDictionary( uartConnectCLIDict, uartConnectCLIDictName );
+ // Check if master
Connect_master = master;
+ if ( Connect_master )
+ Connect_id = 0; // 0x00 is always the master Id
// Master / UART0 setup
// Slave / UART1 setup
SIM_SCGC4 |= SIM_SCGC4_UART1; // Disable clock gating
// Pin Setup for UART0 / UART1
- // XXX TODO Set to actual (Teensy 3.1s don't have the correct pins available)
- PORTB_PCR16 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(3); // RX Pin
- PORTB_PCR17 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(3); // TX Pin
- PORTC_PCR3 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(3); // RX Pin
- PORTC_PCR4 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(3); // TX Pin
- //PORTA_PCR1 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(2); // RX Pin
- //PORTA_PCR2 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(2); // TX Pin
- //PORTE_PCR0 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(3); // RX Pin
- //PORTE_PCR1 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(3); // TX Pin
+ PORTA_PCR1 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(2); // RX Pin
+ PORTA_PCR2 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(2); // TX Pin
+ PORTE_PCR0 = PORT_PCR_PE | PORT_PCR_PS | PORT_PCR_PFE | PORT_PCR_MUX(3); // RX Pin
+ PORTE_PCR1 = PORT_PCR_DSE | PORT_PCR_SRE | PORT_PCR_MUX(3); // TX Pin
// Baud Rate setting
UART0_BDH = (uint8_t)(Connect_baud >> 8);
// - SyncEvent is also blocking until sent
void Connect_scan()
{
- // Check if Tx Buffers are empty and the Tx Ring buffers have data to send
- // This happens if there was previously nothing to send
- if ( uart0_buffer_items > 0 && UART0_TCFIFO == 0 )
- uart_fillTxFifo( 0 );
- if ( uart1_buffer_items > 0 && UART1_TCFIFO == 0 )
- uart_fillTxFifo( 1 );
+ // Check if initially configured as a slave and usb comes up
+ // Then reconfigure as a master
+ if ( !Connect_master && Output_Available )
+ {
+ Connect_setup( Output_Available );
+ }
+
+ // Limit how often we do cable checks
+ uint32_t time_compare = 0x7FF; // Must be all 1's, 0x3FF is valid, 0x4FF is not
+ uint32_t current_time = systick_millis_count;
+ if ( Connect_lastCheck != current_time
+ && ( current_time & time_compare ) == time_compare
+ )
+ {
+ // Make sure we don't double check if the clock speed is too high
+ Connect_lastCheck = current_time;
+
+ // Send a cable check command of 2 bytes
+ Connect_send_CableCheck( UARTConnectCableCheckLength_define );
+
+ // If this is a slave, and we don't have an id yeth
+ // Don't bother sending if there are cable issues
+ if ( !Connect_master && Connect_id == 0xFF && Connect_cableOkMaster )
+ {
+ Connect_send_IdRequest();
+ }
+ }
+
+ // Only process commands if uarts have been configured
+ if ( uarts_configured )
+ {
+ // Check if Tx Buffers are empty and the Tx Ring buffers have data to send
+ // This happens if there was previously nothing to send
+ if ( uart0_buffer_items > 0 && UART0_TCFIFO == 0 )
+ uart_fillTxFifo( 0 );
+ if ( uart1_buffer_items > 0 && UART1_TCFIFO == 0 )
+ uart_fillTxFifo( 1 );
+ }
}
switch ( numToInt( &arg1Ptr[0] ) )
{
case CableCheck:
- Connect_send_CableCheck( 2 );
+ Connect_send_CableCheck( UARTConnectCableCheckLength_define );
break;
case IdRequest:
break;
}
case Animation:
+ break;
+
+ case RemoteCapability:
+ // TODO
+ break;
+
+ case RemoteOutput:
+ // TODO
+ break;
+
+ case RemoteInput:
+ // TODO
+ break;
+
default:
break;
}
Connect_send_Idle( count );
}
+void cliFunc_connectLst( char* args )
+{
+ const char *Command_strs[] = {
+ "CableCheck",
+ "IdRequest",
+ "IdEnumeration",
+ "IdReport",
+ "ScanCode",
+ "Animation",
+ "RemoteCapability",
+ "RemoteOutput",
+ "RemoteInput",
+ };
+
+ print( NL );
+ info_msg("List of UARTConnect commands");
+ for ( uint8_t cmd = 0; cmd < Command_TOP; cmd++ )
+ {
+ print( NL );
+ printInt8( cmd );
+ print(" - ");
+ dPrint( (char*)Command_strs[ cmd ] );
+ }
+}
+
void cliFunc_connectMst( char* args )
{
// Parse number from argument
info_msg("Resetting UARTConnect state...");
Connect_reset();
- // TODO - Argument for re-sync
+ // Reset node id
+ Connect_id = 0xFF;
}
void cliFunc_connectSts( char* args )
projects / kiibohd-controller.git / blobdiff