瀏覽代碼

蓝牙测试

CHENJIE-PC\QiXiang_CHENJIE 3 年之前
父節點
當前提交
1023209d33
共有 5 個文件被更改,包括 10 次插入10 次删除
  1. 4 4
      .settings/language.settings.xml
  2. 1 1
      src/AppTaskBle.c
  3. 1 1
      src/AppTaskCan.c
  4. 3 3
      src/AppTaskUart0.c
  5. 1 1
      src/main.c

+ 4 - 4
.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="409960794755804213" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-47737520875934700" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="409960794755804213" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-47737520875934700" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -27,7 +27,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="409960794755804213" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-47737520875934700" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -38,7 +38,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="409960794755804213" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" console="false" env-hash="-47737520875934700" id="com.freescale.s32ds.cross.gnu.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT S32DS Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

+ 1 - 1
src/AppTaskBle.c

@@ -135,7 +135,7 @@ void BleTask(void *pvParameters)
 					BleAnsData.DataPtr = NULL;
 				}
 			}
-			UART_Receive_Data(UART_LPUART2, RX_Buffer[UART_LPUART2],&ReadLen, 1000);
+			UART_Receive_Data(UART_LPUART2, RX_Buffer[UART_LPUART2],&ReadLen, 100);
 			memcpy(AtCmdRead, RX_Buffer[UART_LPUART2], sizeof(AtCmdRead));
 			memset(RX_Buffer[UART_LPUART2], 0x00, sizeof(RX_Buffer[UART_LPUART2]));
 			if (ReadLen>0)//连接的状态下,蓝牙串口会发送断开状态以及发送的内容

+ 1 - 1
src/AppTaskCan.c

@@ -34,7 +34,7 @@ void CanTask()
 			{
 				BleCanTransmit(CanRxMsg.id, CanRxMsg.sdu);
 			}
-			BaseType_t ret2 = xQueueReceive(Uart2ToCanDataHandle,&CanAskData,0);//´øÓÐУÑéÂë
+			BaseType_t ret2 = xQueueReceive(Uart2ToCanDataHandle,&CanAskData,10);//´øÓÐУÑéÂë
 			if (ret2 == pdPASS)
 			{
 				CanDataAsk(CanAskData);

+ 3 - 3
src/AppTaskUart0.c

@@ -31,7 +31,7 @@ void UartTask(void *pvParameters)
 	for (;;)
 	{
 		vTaskDelay(pdMS_TO_TICKS(10));
-		RecvRet = UART_Receive_Data(UART_LPUART0, RX_Buffer[UART_LPUART0],&ReadLen, 0x000FFFFF);
+		RecvRet = UART_Receive_Data(UART_LPUART0, RX_Buffer[UART_LPUART0],&ReadLen, 1000);
 		memcpy(AtCmdRead, RX_Buffer[UART_LPUART0], sizeof(AtCmdRead));
 		memset(RX_Buffer[UART_LPUART0], 0x00, sizeof(RX_Buffer[UART_LPUART0]));
 		if(!RecvRet)
@@ -39,7 +39,7 @@ void UartTask(void *pvParameters)
 			memset(McuAtCmdAns,0x00,sizeof(McuAtCmdAns));
 			McuAtCmdAnsLen = 0;
 			McuATCmdTransmit(AtCmdRead, ReadLen, McuAtCmdAns, &McuAtCmdAnsLen);
-			UART_Send_Data(UART_LPUART0,McuAtCmdAns,McuAtCmdAnsLen,1000*10);
+			UART_Send_Data(UART_LPUART0,McuAtCmdAns,McuAtCmdAnsLen,1000);
 		}
 	}
 }
@@ -224,7 +224,7 @@ sint8 McuAtCallbackFunc(char *Readptr,uint16 ReadLen, McuAtCmd McuAtIdx, char *A
 				BleRecvDataFromUart2 RecvDatabuffer={0,NULL};
 				sint8 QueneRetRev = -1;
 				xQueueReset(McuDataRecvHandle);
-				QueneRetRev = xQueueReceive(McuDataRecvHandle,&RecvDatabuffer,1000*5);
+				QueneRetRev = xQueueReceive(McuDataRecvHandle,&RecvDatabuffer,1000*3);
 				if(QueneRetRev==pdPASS)
 				{
 					uint8 DataLen = RecvDatabuffer.RealLen;

+ 1 - 1
src/main.c

@@ -131,7 +131,7 @@ int main(void)
     Mcu_InitClock(McuClockSettingConfig_0);
 
     /* Wait until PLL is locked */
-    // while ( MCU_PLL_LOCKED != Mcu_GetPllStatus() )
+     //while ( MCU_PLL_LOCKED != Mcu_GetPllStatus() )
     {
         /* Busy wait until the System PLL is locked */
     }