Skip to content

Dev kevin #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 8, 2019
Merged

Dev kevin #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b387664
added an informative error message when dat.paths is not present
kevin-j-miller Aug 6, 2019
ee85556
added an identifier to the error message
kevin-j-miller Aug 7, 2019
421ce9e
Added warnings and errors to deal with the case that hardware.mat is …
kevin-j-miller Aug 7, 2019
12a73d9
fixed identifier
kevin-j-miller Aug 7, 2019
e72b90d
Changed error identifiers following Miles' suggestion of module:packa…
kevin-j-miller Aug 8, 2019
e2e2f93
added more info to error for empty rig
Aug 8, 2019
fb8e3e3
added more info to no dat.paths error
Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion +hw/devices.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
%% Basic initialisation
fn = fullfile(paths.rigConfig, 'hardware.mat');
if ~file.exists(fn)
rig = [];
warning(['hardware config not found for hostname ', hostname]);
rig = [];
return
end
rig = load(fn);
Expand Down
6 changes: 6 additions & 0 deletions +srv/expServer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ function expServer(useTimelineOverride, bgColour)
% get rig hardware
try
rig = hw.devices;
if isempty(rig)
error('rigbox:srv:expServer:noHardwareConfig', ['No hardware config '...
'info found for this rig. Cannot find this rig''s ''hardware.mat'' '...
'file, or hardware config set-up script. Unable to launch '...
'expServer.']);
end
catch ME
fun.applyForce({
@() communicator.close(),...
Expand Down
7 changes: 7 additions & 0 deletions cortexlab/+git/update.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ function update(scheduled)
% TODO Find quicker way to check for changes
% See also DAT.PATHS

% Check that paths are set up
assert(~isempty(which('dat.paths')), ...
'rigbox:git:update:copyPaths',...
['Error: ''dat.paths'' file not found. Please ensure that a '...
'''dat.paths'' file exists for your setup. A template can be found at '...
'''docs/setup/paths_template''.'])

% If not given as input argument, use 'updateSchedule' in 'dat.paths'. If
% not found, set 'scheduled' to 0.
if nargin < 1; scheduled = getOr(dat.paths, 'updateSchedule', 0); end
Expand Down