Merge pull request #1 from imsoo/1

1
imsoo · Apr 23, 2019 · 0713b6b · 0713b6b
2 parents 3baa12a + 017fe20
commit 0713b6b
Show file tree

Hide file tree

Showing 19 changed files with 28 additions and 1 deletion.
diff --git a/.vscode/ipch/413505fefa786156/TASK.ipch b/.vscode/ipch/413505fefa786156/TASK.ipch
diff --git a/.vscode/ipch/413505fefa786156/mmap_address.bin b/.vscode/ipch/413505fefa786156/mmap_address.bin
diff --git a/.vscode/ipch/492e2bcfcadb622c/STM32F4XX_IT.ipch b/.vscode/ipch/492e2bcfcadb622c/STM32F4XX_IT.ipch
diff --git a/.vscode/ipch/492e2bcfcadb622c/mmap_address.bin b/.vscode/ipch/492e2bcfcadb622c/mmap_address.bin
diff --git a/.vscode/ipch/68dce2bc9e36deda/mmap_address.bin b/.vscode/ipch/68dce2bc9e36deda/mmap_address.bin
diff --git a/.vscode/ipch/795ba1913d342780/QUEUE.ipch b/.vscode/ipch/795ba1913d342780/QUEUE.ipch
diff --git a/.vscode/ipch/795ba1913d342780/mmap_address.bin b/.vscode/ipch/795ba1913d342780/mmap_address.bin
diff --git a/.vscode/ipch/a281c2cef98b28b/HASH.ipch b/.vscode/ipch/a281c2cef98b28b/HASH.ipch
diff --git a/.vscode/ipch/a281c2cef98b28b/mmap_address.bin b/.vscode/ipch/a281c2cef98b28b/mmap_address.bin
diff --git a/.vscode/ipch/bc8d0a4ee43bb5c7/UART.ipch b/.vscode/ipch/bc8d0a4ee43bb5c7/UART.ipch
diff --git a/.vscode/ipch/bc8d0a4ee43bb5c7/mmap_address.bin b/.vscode/ipch/bc8d0a4ee43bb5c7/mmap_address.bin
diff --git a/.vscode/ipch/d124d2473e24b407/mmap_address.bin b/.vscode/ipch/d124d2473e24b407/mmap_address.bin
diff --git a/.vscode/ipch/d3a59eb8223e849e/MAIN.ipch b/.vscode/ipch/d3a59eb8223e849e/MAIN.ipch
diff --git a/.vscode/ipch/d3a59eb8223e849e/mmap_address.bin b/.vscode/ipch/d3a59eb8223e849e/mmap_address.bin
diff --git a/.vscode/ipch/e703c5b1bf8b9228/GPIO.ipch b/.vscode/ipch/e703c5b1bf8b9228/GPIO.ipch
diff --git a/.vscode/ipch/e703c5b1bf8b9228/mmap_address.bin b/.vscode/ipch/e703c5b1bf8b9228/mmap_address.bin
diff --git a/.vscode/ipch/fd506e2e935eca54/mmap_address.bin b/.vscode/ipch/fd506e2e935eca54/mmap_address.bin
diff --git a/Src/main.c b/Src/main.c
@@ -48,6 +48,10 @@
 
 void SystemClock_Config(void);
 
+//LI-FI data
+uint8_t rx3_data;
+uint8_t tx_data[5]="hello";
+
 int main(void)
 {
   int tag;
@@ -63,9 +67,19 @@ int main(void)
 
   integ_mac_init();
 
-  
+
   printf("$ ");
   while(1) {
+
+
+/////////////LI-FI//////////////////////////
+//send "HELLO from huart5 to huart3"
+/*
+     HAL_UART_Transmit(&huart5,tx_data,5,1000);
+    HAL_Delay(1000);
+*/
+//////////////Li-FI/////////////////////////
+
     __disable_interrupt();
     tag = task_delete(&task);
     __enable_interrupt();
@@ -79,6 +93,18 @@ int main(void)
   * @brief System Clock Configuration
   * @retval None
   */
+
+ //LI-FI callback function
+ /*
+ void HAL_UART_RxCpltCallback(UART_HandleTypeDef *huart)
+{
+    if(huart->Instance ==USART3)
+    {
+      HAL_UART_Receive_IT(&huart3,&rx3_data,5);
+      HAL_UART_Transmit(&huart3,&rx3_data,5,10);
+    }
+}
+*/
 void SystemClock_Config(void)
 {
   RCC_OscInitTypeDef RCC_OscInitStruct = {0};

diff --git a/Src/선민.txt b/Src/선민.txt
@@ -0,0 +1 @@
+sdfsdf