Merge branch 'mio168'

eez-open · Aug 10, 2020 · 4181377 · 4181377
2 parents 705ed0a + 83d0477
commit 4181377
Show file tree

Hide file tree

Showing 33 changed files with 4,376 additions and 2,395 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -17,6 +17,8 @@
         "memory": "cpp",
         "tuple": "cpp",
         "utility": "cpp",
-        "xmemory0": "cpp"
+        "xmemory0": "cpp",
+        "initializer_list": "cpp",
+        "queue": "cpp"
     }
 }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -439,26 +439,26 @@ source_group("eez\\modules\\mcu\\simulator" FILES ${src_eez_modules_mcu_simulato
 
 set(src_eez_modules_dib_dcp405
     src/eez/modules/dib-dcp405/adc.cpp
-    src/eez/modules/dib-dcp405/channel.cpp
+    src/eez/modules/dib-dcp405/dib-dcp405.cpp
     src/eez/modules/dib-dcp405/dac.cpp
     src/eez/modules/dib-dcp405/ioexp.cpp
 ) 
 list (APPEND src_files ${src_eez_modules_dib_dcp405})
 set(header_eez_modules_dib_dcp405
     src/eez/modules/dib-dcp405/adc.h
-    src/eez/modules/dib-dcp405/channel.h
+    src/eez/modules/dib-dcp405/dib-dcp405.h
     src/eez/modules/dib-dcp405/dac.h
     src/eez/modules/dib-dcp405/ioexp.h
 ) 
 list (APPEND header_files ${header_eez_modules_dib_dcp405})
 source_group("eez\\modules\\dib-dcp405" FILES ${src_eez_modules_dib_dcp405} ${header_eez_modules_dib_dcp405})
 
 set(src_eez_modules_dib_dcm220
-    src/eez/modules/dib-dcm220/channel.cpp
+    src/eez/modules/dib-dcm220/dib-dcm220.cpp
 ) 
 list (APPEND src_files ${src_eez_modules_dib_dcm220})
 set(header_eez_modules_dib_dcm220
-    src/eez/modules/dib-dcm220/channel.h
+    src/eez/modules/dib-dcm220/dib-dcm220.h
 ) 
 list (APPEND header_files ${header_eez_modules_dib_dcm220})
 source_group("eez\\modules\\dib-dcm220" FILES ${src_eez_modules_dib_dcm220} ${header_eez_modules_dib_dcm220})