readme

.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="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1574790197502911086" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_flags} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-1848648076598109263" id="ilg.gnuarmeclipse.managedbuild.cross.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT ARM Cross GCC Built-in Compiler Settings " parameter="${COMMAND} ${FLAGS} ${cross_toolchain_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>

README.md

@@ -69,8 +69,22 @@ RT-Thread 软件打开 [点击下载](https://www.rt-thread.org/download.html#do
 
 ---
 
+#### 控制台命令
 
 
+|  命令 | 作用  |
+| ---------------- | ------------ |
+|  log_lte |  4G与mqtt的log |
+|  log_moddbus |  modbus的log |
+|  log_adc | adc的log  |
+|  no_log | 关闭log  |
+|  IO_key < 0-8 > < 1  0 >|  指定输出端口改变电平  |
+
+
+
+
+---
+
 #### 空间与引脚分配
 
 - MB85RS64储存分布说明，8192 字节

applications/IO/inout.c

@@ -136,6 +136,60 @@ rt_uint32_t get_IO_count(rt_uint8_t io){
     return IO.IO_Data[io].Temp_Count;
 }
 
+
+/**
+ * @brief 计算转速，500毫秒的中断次数乘2为1秒次数，1秒次数乘60为rpm单位转速
+ * @param none
+ * @return: None
+ */
+void updateSpeed(void)
+{
+    rt_uint16_t tmp_start = 0;
+    rt_uint16_t tmp_end = 0;
+    //rt_tick_t   tick_start      =  0;
+    //rt_tick_t   tick_end        =  0;
+    rt_uint16_t temp = 0;
+
+    temp = IO.IO_Data[IO.IO_Flag.Speed_io].Speed;
+    tmp_start = IO.IO_Data[IO.IO_Flag.Speed_io].Temp_Count;
+
+    //tick_start = rt_tick_get_millisecond();
+    rt_thread_mdelay(500);
+    //tick_end = rt_tick_get_millisecond();
+
+    tmp_end = IO.IO_Data[IO.IO_Flag.Speed_io].Temp_Count;
+
+    if (tmp_end < tmp_start)
+    {
+        IO.IO_Data[IO.IO_Flag.Speed_io].Speed = (tmp_end + 65535 - tmp_start) * 120;
+    }
+    else
+    {
+        IO.IO_Data[IO.IO_Flag.Speed_io].Speed = (tmp_end - tmp_start) * 120;
+    }
+
+    if (IO.IO_Flag.log) {
+        rt_kprintf("Speed: %d %d\n", IO.IO_Flag.Speed_io+1, IO.IO_Data[IO.IO_Flag.Speed_io].Speed);
+    }
+
+                    //            if(tmp_end < tmp_start){
+                    //                IO.IO_Data[i].Temp_Speed = (tmp_end + 65535 - tmp_start) / ((tick_end - tick_start) / 1000);
+                    //            }
+                    //            else {
+                    //                IO.IO_Data[i].Temp_Speed = (tmp_end - tmp_start) / ((tick_end - tick_start) / 1000);
+                    //            }
+
+    if (temp != IO.IO_Data[IO.IO_Flag.Speed_io].Speed)
+    {
+        IO.IO_Flag.SpeedUpdateFlag = 1;
+    }
+    else
+    {
+        IO.IO_Flag.SpeedUpdateFlag = 0;
+    }
+
+}
+
 //控制台更改电平
 void IO_key(int argc, char**argv){
 

applications/IO/inout.h

@@ -55,6 +55,7 @@ typedef struct
     rt_uint8_t Needle_io;//针数端口
     rt_uint8_t SpeedUpdateFlag; // 速度更新标志位
     rt_uint8_t NeedleCountUpdateFlag; // 针数更新标志位
+    rt_uint8_t log;
 } Flag; // IO状态
 
 typedef struct

applications/main.c

@@ -14,9 +14,14 @@
 #define DBG_LVL DBG_LOG
 #include <rtdbg.h>
 #include <thread.h>
+#include <mb85rs.h>
+#include <console.h>
 
 int main(void)
 {
+    spi_flash_mb85rs_init();
+    read_config();
+
     thread_IO_Key();
     thread_Wireless();
     thread_LCD();

applications/thread/thread.c

@@ -65,7 +65,6 @@ static void Task_IO_Key(void *parameter)
     gpio_output_init();
     while (1)
     {
-//        chage_IO_key();
         // updateKeyValue();
         rt_thread_mdelay(1);
     }
@@ -73,11 +72,11 @@ static void Task_IO_Key(void *parameter)
 
 static void Task_IO_Speed(void *parameter)
 {
-    spi_flash_mb85rs_init();
+//    spi_flash_mb85rs_init();
-    read_config();
+//    read_config();
     while (1)
     {
-
+//        updateSpeed();
         rt_thread_mdelay(1000);
     }
 }