aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-08-20 10:01:56 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-08-20 10:01:56 +0300
commitb010dabde3353071baf0017d68f503d21466f20a (patch)
tree66c8579f6f207d7fe0fe8a224e19af95792afb7a /Software
parentde5d4906184cff4f16f92864d03af9d7c41231d7 (diff)
downloadTango-b010dabde3353071baf0017d68f503d21466f20a.tar.gz
Tango-b010dabde3353071baf0017d68f503d21466f20a.zip
1. port list updated - output ports 2. usb support
Diffstat (limited to 'Software')
-rw-r--r--Software/Embedded_SW/Embedded/.cproject2
-rw-r--r--Software/Embedded_SW/Embedded/Communication/CommunicationTask.c4
-rw-r--r--Software/Visual_Studio/Resources/PortsList.xlsxbin35151 -> 36248 bytes
3 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/.cproject b/Software/Embedded_SW/Embedded/.cproject
index f81cf0c62..4631ff289 100644
--- a/Software/Embedded_SW/Embedded/.cproject
+++ b/Software/Embedded_SW/Embedded/.cproject
@@ -163,7 +163,7 @@
</toolChain>
</folderInfo>
<sourceEntries>
- <entry excluding="JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/I2C_Communication/Previous_Code|Drivers/L6470|Pin.c|ADCLogger.c|Drivers/I2C_Communication/Previous_Code/TestI2C|Flashstore.c|Profile.c|Drivers/I2C_Communication/I2C_Switch" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+ <entry excluding="Common/protobuf-c/person-pb-c.c|JigCommands.c|PWM.c|USBCDCD.c|Message.c|Pin_config.c|src|Configuration.c|SlowMotors.c|Timer.c|Communication.c|FastMotors.c|ADCUtils.c|Drivers/I2C_Communication/Previous_Code|Drivers/L6470|Pin.c|ADCLogger.c|Drivers/I2C_Communication/Previous_Code/TestI2C|Flashstore.c|Profile.c|Drivers/I2C_Communication/I2C_Switch" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
</sourceEntries>
</configuration>
</storageModule>
diff --git a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
index bd89b8f2a..5ec028e86 100644
--- a/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
+++ b/Software/Embedded_SW/Embedded/Communication/CommunicationTask.c
@@ -160,11 +160,11 @@ void communicationTxTask(UArg arg0, UArg arg1)
*/
initArray(1);
- #ifdef USE_USB
+ /*#ifdef USE_USB
SetCommunicationPath(isUSB);
#else
SetCommunicationPath(isUART);
- #endif
+ #endif*/
//ui32RxCount = 0;
CommunicationTxMsgQ = Mailbox_create(sizeof(CommTxMessageStruc), 20, NULL,NULL);
diff --git a/Software/Visual_Studio/Resources/PortsList.xlsx b/Software/Visual_Studio/Resources/PortsList.xlsx
index 1c8c7b1cc..fd27b49af 100644
--- a/Software/Visual_Studio/Resources/PortsList.xlsx
+++ b/Software/Visual_Studio/Resources/PortsList.xlsx
Binary files differ