Merge pull request #554 from yunyaobaihong/master

build script

CMakeLists.txt

@@ -181,12 +181,14 @@ find_package(Qt5Core QUIET)
 if(Qt5Core_FOUND)
 	message("----- Qt5:")
 	message(STATUS "	 includes:" ${Qt5Core_INCLUDE_DIRS})
-	find_package(Qt5WinExtras REQUIRED)
+	#find_package(Qt5WinExtras REQUIRED)
 	find_package(Qt5Widgets REQUIRED)
 	find_package(Qt5Gui REQUIRED)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-	set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS})
+	#set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5WinExtras_INCLUDE_DIRS})
-	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::WinExtras)
+	#set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::WinExtras)
+	set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+	set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
 	add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 else()
 	find_package(Qt6Core QUIET)
@@ -589,7 +591,7 @@ endif()
 #= Release flags
 #-------------------------------------------------------------------------------
 set(CMAKE_CXX_FLAGS "-Wall -Wextra")
-#set(CMAKE_BUILD_TYPE Release)
+set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 add_compile_options(-O3)

lang/cn/dec/0.json

@@ -145,6 +145,10 @@
     },
     {
         "id": "dec_1uart_opt_baudrate",
+        "text": "波特率"
+    },
+    {
+        "id": "dec_1uart_opt_num_data_bits",
         "text": "数据位"
     },
     {

lang/cn/dec/a.json

@@ -127,10 +127,22 @@
         "id": "dec_caliper_opt_timeout_ms",
         "text": "数据包超时(毫秒),0表示禁用 "
     },
+    {
+        "id": "dec_caliper_opt_unit",
+        "text": "反转单位"
+    },
+    {
+        "id": "dec_caliper_opt_changes",
+        "text": "仅限修改"
+    },
     {
         "id": "dec_can_chan_can_rx",
         "text": "CAN总线"
     },
+    {
+        "id": "dec_can_opt_bitrate",
+        "text": "比特率"
+    },
     {
         "id": "dec_can_opt_sample_point",
         "text": "采样点(%d)"

lang/cn/dec/f.json

@@ -160,31 +160,31 @@
         "text": "数据I/O位1或串行数据"
     },
     {
-        "id": "dec_ieee488_chan_dio2",
+        "id": "dec_ieee488_opt_chan_dio2",
         "text": "数据I/O位2"
     },
     {
-        "id": "dec_ieee488_chan_dio3",
+        "id": "dec_ieee488_opt_chan_dio3",
         "text": "数据I/O位3"
     },
     {
-        "id": "dec_ieee488_chan_dio4",
+        "id": "dec_ieee488_opt_chan_dio4",
         "text": "数据I/O位4"
     },
     {
-        "id": "dec_ieee488_chan_dio5",
+        "id": "dec_ieee488_opt_chan_dio5",
         "text": "数据I/O位5"
     },
     {
-        "id": "dec_ieee488_chan_dio6",
+        "id": "dec_ieee488_opt_chan_dio6",
         "text": "数据I/O位6"
     },
     {
-        "id": "dec_ieee488_chan_dio7",
+        "id": "dec_ieee488_opt_chan_dio7",
         "text": "数据I/O位7"
     },
     {
-        "id": "dec_ieee488_chan_dio8",
+        "id": "dec_ieee488_opt_chan_dio8",
         "text": "数据I/O位8"
     },
     {

lang/cn/dec/k.json

@@ -219,6 +219,26 @@
         "id": "dec_ook_chan_data",
         "text": "数据线"
     },
+    {
+        "id": "dec_ook_opt_invert",
+        "text": "反转数据"
+    },
+    {
+        "id": "dec_ook_opt_decodeas",
+        "text": "解码类型"
+    },
+    {
+        "id": "dec_ook_opt_preamble",
+        "text": "前置码"
+    },
+    {
+        "id": "dec_ook_opt_preamlen",
+        "text": "过滤器长度 "
+    },
+    {
+        "id": "dec_ook_opt_diffmanvar",
+        "text": "开始时的转换"
+    },
     {
         "id": "dec_ook_oregon_opt_unknown",
         "text": "未知类型为"
@@ -238,5 +258,9 @@
     {
         "id": "dec_ook_vis_opt_refsample",
         "text": "比较"
+    },
+    {
+        "id": "dec_ook_oregon_opt_unknown",
+        "text": "未知类型为"
     }
 ]

lang/cn/dec/p.json

@@ -103,6 +103,10 @@
         "id": "dec_rc_encode_chan_data",
         "text": "数据线"
     },
+    {
+        "id": "dec_rc_encode_opt_remote",
+        "text": "遥控"
+    },
     {
         "id": "dec_rgb_led_ws281x_chan_din",
         "text": "DIN数据线"
@@ -192,7 +196,7 @@
         "text": "G段"
     },
     {
-        "id": "dec_seven_segment_opt_chan_A",
+        "id": "dec_seven_segment_opt_chan_dp",
         "text": "小数点"
     },
     {

libsigrokdecode4DSL/decoders/ook/pd.py

@@ -79,15 +79,15 @@ class Decoder(srd.Decoder):
     )
     options = (
         {'id': 'invert', 'desc': 'Invert data', 'default': 'no',
-         'values': ('no', 'yes')},
+         'values': ('no', 'yes'), 'idn':'dec_ook_opt_invert'},
         {'id': 'decodeas', 'desc': 'Decode type', 'default': 'Manchester',
-         'values': ('NRZ', 'Manchester', 'Diff Manchester')},
+         'values': ('NRZ', 'Manchester', 'Diff Manchester'), 'idn':'dec_ook_opt_decodeas'},
         {'id': 'preamble', 'desc': 'Preamble', 'default': 'auto',
-         'values': ('auto', '1010', '1111')},
+         'values': ('auto', '1010', '1111'), 'idn':'dec_ook_opt_preamble'},
         {'id': 'preamlen', 'desc': 'Filter length', 'default': '7',
-         'values': ('0', '3', '4', '5', '6', '7', '8', '9', '10')},
+         'values': ('0', '3', '4', '5', '6', '7', '8', '9', '10'), 'idn':'dec_ook_opt_preamlen'},
         {'id': 'diffmanvar', 'desc': 'Transition at start', 'default': '1',
-         'values': ('1', '0')},
+         'values': ('1', '0'), 'idn':'dec_ook_opt_diffmanvar'},
     )
 
     def __init__(self):

libsigrokdecode4DSL/decoders/rc_encode/pd.py

@@ -101,7 +101,7 @@ class Decoder(srd.Decoder):
     )
     options = (
         {'id': 'remote', 'desc': 'Remote', 'default': 'none', 
-            'values': ('none', 'maplin_l95ar')},
+            'values': ('none', 'maplin_l95ar') ,'idn':'dec_rc_encode_opt_remote'},
     )
 
     def __init__(self):