Skip to content

Commit

Permalink
V1.2
Browse files Browse the repository at this point in the history 
Configuration file selection available in GUI
Client examples included in the installer
  • Loading branch information
@rcassani
rcassani committed Jan 30, 2015
1 parent fdc7a27 commit a980009
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 16 deletions.
Binary file modified MuLES_source/Main.vi
View file
Binary file not shown.
25 changes: 18 additions & 7 deletions MuLES_source/MuLES.lvproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@
<Item Name="eeg_files" Type="Folder" URL="../eeg_files">
<Property Name="NI.DISK" Type="Bool">true</Property>
</Item>
<Item Name="client_examples" Type="Folder" URL="../client_examples">
<Property Name="NI.DISK" Type="Bool">true</Property>
</Item>
<Item Name="Main.vi" Type="VI" URL="../Main.vi"/>
<Item Name="config.ini" Type="Document" URL="../config.ini"/>
<Item Name="REQUIREMENTS.txt" Type="Document" URL="../REQUIREMENTS.txt"/>
Expand Down Expand Up @@ -248,7 +251,6 @@
<Property Name="App_INI_GUID" Type="Str">{96619C8A-9921-4385-AB90-84B47CAC4986}</Property>
<Property Name="App_INI_itemID" Type="Ref">/My Computer/source_vi/gui/various/mules.ini</Property>
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
<Property Name="Bld_buildCacheID" Type="Str">{01CE06F4-9E9B-4D6F-B545-4EC2E604789E}</Property>
<Property Name="Bld_buildSpecName" Type="Str">MuLES_portable</Property>
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
Expand All @@ -257,9 +259,9 @@
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
<Property Name="Bld_previewCacheID" Type="Str">{58060354-9400-4D2A-9761-AA539898DD57}</Property>
<Property Name="Bld_version.build" Type="Int">15</Property>
<Property Name="Bld_version.build" Type="Int">30</Property>
<Property Name="Bld_version.major" Type="Int">1</Property>
<Property Name="Bld_version.minor" Type="Int">1</Property>
<Property Name="Bld_version.minor" Type="Int">2</Property>
<Property Name="Destination[0].destName" Type="Str">mules.exe</Property>
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/MuLES/mules.exe</Property>
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
Expand All @@ -274,10 +276,13 @@
<Property Name="Destination[4].path" Type="Path">../builds/NI_AB_PROJECTNAME/MuLES/languages</Property>
<Property Name="Destination[5].destName" Type="Str">eeg_files</Property>
<Property Name="Destination[5].path" Type="Path">../builds/NI_AB_PROJECTNAME/MuLES/eeg_files</Property>
<Property Name="DestinationCount" Type="Int">6</Property>
<Property Name="Destination[6].destName" Type="Str">client_examples</Property>
<Property Name="Destination[6].path" Type="Path">../builds/NI_AB_PROJECTNAME/MuLES/client_examples</Property>
<Property Name="Destination[6].preserveHierarchy" Type="Bool">true</Property>
<Property Name="DestinationCount" Type="Int">7</Property>
<Property Name="Exe_cmdLineArgs" Type="Bool">true</Property>
<Property Name="Exe_iconItemID" Type="Ref">/My Computer/source_vi/gui/various/MuLES_icon.ico</Property>
<Property Name="Source[0].itemID" Type="Str">{A52F65D1-9817-46AC-803D-5F4CFAE1383E}</Property>
<Property Name="Source[0].itemID" Type="Str">{0B13CD33-7197-4323-BE55-580AFBF942A6}</Property>
<Property Name="Source[0].type" Type="Str">Container</Property>
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
<Property Name="Source[1].itemID" Type="Ref">/My Computer/Main.vi</Property>
Expand All @@ -304,7 +309,13 @@
<Property Name="Source[5].itemID" Type="Ref">/My Computer/eeg_files</Property>
<Property Name="Source[5].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[5].type" Type="Str">Container</Property>
<Property Name="SourceCount" Type="Int">6</Property>
<Property Name="Source[6].Container.applyDestination" Type="Bool">true</Property>
<Property Name="Source[6].Container.applyInclusion" Type="Bool">true</Property>
<Property Name="Source[6].destinationIndex" Type="Int">6</Property>
<Property Name="Source[6].itemID" Type="Ref">/My Computer/client_examples</Property>
<Property Name="Source[6].sourceInclusion" Type="Str">Include</Property>
<Property Name="Source[6].type" Type="Str">Container</Property>
<Property Name="SourceCount" Type="Int">7</Property>
<Property Name="TgtF_companyName" Type="Str">MuSAE Lab</Property>
<Property Name="TgtF_fileDescription" Type="Str">MuSAE Lab EEG Server. Provides and interface between different EEG devices and applications</Property>
<Property Name="TgtF_internalName" Type="Str">MuLES</Property>
Expand Down Expand Up @@ -371,7 +382,7 @@
<Property Name="INST_buildSpecName" Type="Str">MuLES_installer</Property>
<Property Name="INST_defaultDir" Type="Str">{1E42C379-2480-403F-95B0-89B3CCD541CA}</Property>
<Property Name="INST_productName" Type="Str">MuLES</Property>
<Property Name="INST_productVersion" Type="Str">1.1.0</Property>
<Property Name="INST_productVersion" Type="Str">1.2.0</Property>
<Property Name="INST_readmeID" Type="Ref">/My Computer/source_vi/gui/various/README.rtf</Property>
<Property Name="InstSpecBitness" Type="Str">32-bit</Property>
<Property Name="InstSpecVersion" Type="Str">13008047</Property>
Expand Down
0 .../matlab/autostart_device_client_example.m → .../matlab/autostart_device_client_example.m
View file
File renamed without changes.
0 ...es/matlab/autostart_file_client_example.m → ...es/matlab/autostart_file_client_example.m
View file
File renamed without changes.
0 client_examples/matlab/mules_parse_data.m → ...client_examples/matlab/mules_parse_data.m
View file
File renamed without changes.
0 client_examples/matlab/mules_parse_header.m → ...ient_examples/matlab/mules_parse_header.m
View file
File renamed without changes.
0 ...t_examples/matlab/simple_client_example.m → ...t_examples/matlab/simple_client_example.m
View file
File renamed without changes.
0 client_examples/python/mules_utils.py → ...rce/client_examples/python/mules_utils.py
View file
File renamed without changes.
0 ..._examples/python/simple_client_example.py → ..._examples/python/simple_client_example.py
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions MuLES_source/config.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CHANNELS = "Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7,Ch8,STATUS"
EXTRA = "FS=500,#CH=8,DATA=ffffffffi,NICv=1.3"

[DEVICE03]
NAME = "MUSE Customer FW"
NAME = "MUSE Consumer FW"
HARDWARE = "INTERAXON-MUSE"
IMAGE = "images\interaxon_muse.jpg"
PATH = "/C/Program Files (x86)/Muse/muse-io.exe"
Expand All @@ -35,7 +35,7 @@ HARDWARE = "INTERAXON-MUSE"
IMAGE = "images\interaxon_muse.jpg"
PATH = "/C/Program Files (x86)/Muse/muse-io.exe"
CHANNELS = "LCH,A1,FP1,FP2,A2,RCH,STATUS"
EXTRA = "FS=500,#CH=4,DATA=ffffffi,PRESET=ab,BTNAME=Muse-6AA1,OSCPORT=5000"
EXTRA = "FS=500,#CH=6,DATA=ffffffi,PRESET=ab,BTNAME=Muse-6AA1,OSCPORT=5000"

[DEVICE05]
NAME = "Mindset"
Expand Down
4 changes: 2 additions & 2 deletions MuLES_source/languages/eng.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
05: Acquistion
06: Server
07: Logging
08:
08: Configuration file
09:
10:
11:
Expand Down Expand Up @@ -55,7 +55,7 @@
54: TCP connection will be closed
55: Indicates than Logging will be stoped
56: File @file is over.
57:
57: Configuration @file loaded
58:
59:
60:
Expand Down
6 changes: 3 additions & 3 deletions MuLES_source/languages/fra.txt
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
00: Origine de l'EEG
00: Origine de l'EEG
01: Activer ou désactiver l'enregistrement
02: Activer ou désactiver la transmission TCP
03: Cliquer ici pour démarrer une acquisition
04: Arrêter l'acquisition
05: Acquisition
06: Serveur TCP
07: Enregistrement
08:
08: Fichier de configuration
09:
10:
11:
Expand Down Expand Up @@ -55,7 +55,7 @@
54: La connexion TCP sera fermée
55: Indique que l'enregistrement sera arrêté
56: La fin du fichier @file a été atteinte
57:
57: Fichie de configuration @file chargé
58:
59:
60:
Expand Down
4 changes: 2 additions & 2 deletions MuLES_source/languages/spa.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
05: Adquisici�n
06: Servidor TCP
07: Logging
08:
08: Archivo de configuraci�n
09:
10:
11:
Expand Down Expand Up @@ -55,7 +55,7 @@
54: La conexi�n TCP ser� cerrada
55: Registro de se�ales EEG terminado
56: Fin del archivo: @file
57:
57: Archivo de configuraci�n @file aplicado
58:
59:
60:
Expand Down
Binary file modified MuLES_source/source_vi/gui/command_line_args.vi
View file
Binary file not shown.
Binary file added MuLES_source/source_vi/gui/find_config_files.vi
View file
Binary file not shown.
Binary file modified MuLES_source/source_vi/gui/read_config_file.vi
View file
Binary file not shown.
Binary file modified MuLES_source/source_vi/gui/read_language_file.vi
View file
Binary file not shown.

0 comments on commit a980009

Please sign in to comment.