diff --git a/Telem_Debug/Debug_UART-USB/.ccsproject b/Telem_Debug/Debug_USB/.ccsproject similarity index 100% rename from Telem_Debug/Debug_UART-USB/.ccsproject rename to Telem_Debug/Debug_USB/.ccsproject diff --git a/Telem_Debug/Debug_UART-USB/.cproject b/Telem_Debug/Debug_USB/.cproject similarity index 100% rename from Telem_Debug/Debug_UART-USB/.cproject rename to Telem_Debug/Debug_USB/.cproject diff --git a/Telem_Debug/Debug_UART-USB/.gitignore b/Telem_Debug/Debug_USB/.gitignore similarity index 100% rename from Telem_Debug/Debug_UART-USB/.gitignore rename to Telem_Debug/Debug_USB/.gitignore diff --git a/Telem_Debug/Debug_UART-USB/.project b/Telem_Debug/Debug_USB/.project similarity index 93% rename from Telem_Debug/Debug_UART-USB/.project rename to Telem_Debug/Debug_USB/.project index 3ecdcb0..153d59c 100644 --- a/Telem_Debug/Debug_UART-USB/.project +++ b/Telem_Debug/Debug_USB/.project @@ -1,6 +1,6 @@ - Debug_UART-USB + Debug_USB diff --git a/Telem_Debug/Debug_UART-USB/.settings/org.eclipse.cdt.codan.core.prefs b/Telem_Debug/Debug_USB/.settings/org.eclipse.cdt.codan.core.prefs similarity index 100% rename from Telem_Debug/Debug_UART-USB/.settings/org.eclipse.cdt.codan.core.prefs rename to Telem_Debug/Debug_USB/.settings/org.eclipse.cdt.codan.core.prefs diff --git a/Telem_Debug/Debug_UART-USB/.settings/org.eclipse.cdt.debug.core.prefs b/Telem_Debug/Debug_USB/.settings/org.eclipse.cdt.debug.core.prefs similarity index 100% rename from Telem_Debug/Debug_UART-USB/.settings/org.eclipse.cdt.debug.core.prefs rename to Telem_Debug/Debug_USB/.settings/org.eclipse.cdt.debug.core.prefs diff --git a/Telem_Debug/Debug_UART-USB/.settings/org.eclipse.core.resources.prefs b/Telem_Debug/Debug_USB/.settings/org.eclipse.core.resources.prefs similarity index 100% rename from Telem_Debug/Debug_UART-USB/.settings/org.eclipse.core.resources.prefs rename to Telem_Debug/Debug_USB/.settings/org.eclipse.core.resources.prefs diff --git a/Telem_Debug/Debug_UART-USB/SunseekerTelemetry2021.h b/Telem_Debug/Debug_USB/SunseekerTelemetry2021.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/SunseekerTelemetry2021.h rename to Telem_Debug/Debug_USB/SunseekerTelemetry2021.h diff --git a/Telem_Debug/Debug_UART-USB/clock_init.c b/Telem_Debug/Debug_USB/clock_init.c similarity index 100% rename from Telem_Debug/Debug_UART-USB/clock_init.c rename to Telem_Debug/Debug_USB/clock_init.c diff --git a/Telem_Debug/Debug_UART-USB/clock_init.h b/Telem_Debug/Debug_USB/clock_init.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/clock_init.h rename to Telem_Debug/Debug_USB/clock_init.h diff --git a/Telem_Debug/Debug_UART-USB/interrupts.c b/Telem_Debug/Debug_USB/interrupts.c similarity index 87% rename from Telem_Debug/Debug_UART-USB/interrupts.c rename to Telem_Debug/Debug_USB/interrupts.c index d2a3946..fed5859 100644 --- a/Telem_Debug/Debug_UART-USB/interrupts.c +++ b/Telem_Debug/Debug_USB/interrupts.c @@ -1,7 +1,7 @@ #include "interrupts.h" extern volatile unsigned char status_flag; -extern char* pUARTReceiveString; +extern char* pUSBReceiveString; /* * Timer B CCR0 Interrupt Service Routine @@ -31,5 +31,5 @@ __interrupt void TIMER0_B0_ISR(void){ #pragma vector = USCI_A2_VECTOR __interrupt void USCI_A2_ISR(void){ - usci_A2_receiveString(pUARTReceiveString); + usci_A2_receiveString(pUSBReceiveString); } diff --git a/Telem_Debug/Debug_UART-USB/interrupts.h b/Telem_Debug/Debug_USB/interrupts.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/interrupts.h rename to Telem_Debug/Debug_USB/interrupts.h diff --git a/Telem_Debug/Debug_UART-USB/io_init.c b/Telem_Debug/Debug_USB/io_init.c similarity index 100% rename from Telem_Debug/Debug_UART-USB/io_init.c rename to Telem_Debug/Debug_USB/io_init.c diff --git a/Telem_Debug/Debug_UART-USB/io_init.h b/Telem_Debug/Debug_USB/io_init.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/io_init.h rename to Telem_Debug/Debug_USB/io_init.h diff --git a/Telem_Debug/Debug_UART-USB/lnk_msp430f5438a.cmd b/Telem_Debug/Debug_USB/lnk_msp430f5438a.cmd similarity index 100% rename from Telem_Debug/Debug_UART-USB/lnk_msp430f5438a.cmd rename to Telem_Debug/Debug_USB/lnk_msp430f5438a.cmd diff --git a/Telem_Debug/Debug_UART-USB/main.c b/Telem_Debug/Debug_USB/main.c similarity index 75% rename from Telem_Debug/Debug_UART-USB/main.c rename to Telem_Debug/Debug_USB/main.c index da86436..638673c 100644 --- a/Telem_Debug/Debug_UART-USB/main.c +++ b/Telem_Debug/Debug_USB/main.c @@ -6,8 +6,8 @@ #include "usci.h" volatile unsigned char status_flag = FALSE; -char UARTTransmitString[] = "[DEBUG] Test Transmission String"; -char* pUARTReceiveString; +char USBTransmitString[] = "[DEBUG] Test Transmission String"; +char* pUSBReceiveString; int main(void) { WDTCTL = WDTPW | WDTHOLD; // Stop watchdog timer; `WDTPW` is the "WatchDog Timer PassWord", required for all `WDTCTL` operations @@ -29,7 +29,7 @@ int main(void) { P8OUT |= LEDY0; // Initially set LEDY0 to High - pUARTReceiveString = calloc(1, 256 * sizeof(*pUARTReceiveString) + 1); + pUSBReceiveString = calloc(1, 256 * sizeof(*pUSBReceiveString) + 1); usci_A2_enable(); usci_A2_enableInterrupt(); @@ -37,12 +37,12 @@ int main(void) { while(1) { // Repeating debug transmission string - usci_A2_transmitString(&UARTTransmitString[0]); + usci_A2_transmitString(&USBTransmitString[0]); // String received, to be transmitted back - if(pUARTReceiveString[0] != '\0'){ - usci_A2_transmitString(pUARTReceiveString); - pUARTReceiveString[0] = '\0'; + if(pUSBReceiveString[0] != '\0'){ + usci_A2_transmitString(pUSBReceiveString); + pUSBReceiveString[0] = '\0'; } delayMultiplied(5000); diff --git a/Telem_Debug/Debug_UART-USB/targetConfigs/MSP430F5438A.ccxml b/Telem_Debug/Debug_USB/targetConfigs/MSP430F5438A.ccxml similarity index 100% rename from Telem_Debug/Debug_UART-USB/targetConfigs/MSP430F5438A.ccxml rename to Telem_Debug/Debug_USB/targetConfigs/MSP430F5438A.ccxml diff --git a/Telem_Debug/Debug_UART-USB/targetConfigs/readme.txt b/Telem_Debug/Debug_USB/targetConfigs/readme.txt similarity index 100% rename from Telem_Debug/Debug_UART-USB/targetConfigs/readme.txt rename to Telem_Debug/Debug_USB/targetConfigs/readme.txt diff --git a/Telem_Debug/Debug_UART-USB/timers.c b/Telem_Debug/Debug_USB/timers.c similarity index 100% rename from Telem_Debug/Debug_UART-USB/timers.c rename to Telem_Debug/Debug_USB/timers.c diff --git a/Telem_Debug/Debug_UART-USB/timers.h b/Telem_Debug/Debug_USB/timers.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/timers.h rename to Telem_Debug/Debug_USB/timers.h diff --git a/Telem_Debug/Debug_UART-USB/usci.c b/Telem_Debug/Debug_USB/usci.c similarity index 100% rename from Telem_Debug/Debug_UART-USB/usci.c rename to Telem_Debug/Debug_USB/usci.c diff --git a/Telem_Debug/Debug_UART-USB/usci.h b/Telem_Debug/Debug_USB/usci.h similarity index 100% rename from Telem_Debug/Debug_UART-USB/usci.h rename to Telem_Debug/Debug_USB/usci.h