Skip to content

Commit

Permalink
Final commit for Spring 2024 test campaigns
Browse files Browse the repository at this point in the history
  • Loading branch information
bretbosma committed May 20, 2024
1 parent 7361ba5 commit ce8f475
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions ELMO/Targets/Drive01/CurrentVerificationSettings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Current-Verification-Settings Version="1.0">
<Frequency>100</Frequency>
<Min-Current>3.25</Min-Current>
<Max-Current>9.75</Max-Current>
</Current-Verification-Settings>
2 changes: 2 additions & 0 deletions ELMO/Targets/SensorlessBodeVerification.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<Last-Open-Files />
Binary file modified Simulink/LUPAapp.mlapp
Binary file not shown.
6 changes: 3 additions & 3 deletions Simulink/initLUPA.m
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
addpath('utils')
%% === Assign Constants ===================================================
disp('*** Setting model parameters ***')
period = 2.50; % period for forced oscillation sine wave
excelFile = 'ExcelGains/dampingANDstiffT250_20240508.xlsx';
gainTstep = 2.50*20; % time between change in excel gains (s) (Represents the wave period times 20 waves)
period = 1.43; % period for forced oscillation sine wave
excelFile = 'ExcelGains/freg0p500Hz_Stiff_AND_Damping.xlsx';
gainTstep = 1/0.5*10; % time between change in excel gains (s) (Represents the wave period times 20 waves)

Mode = 'One Body Heave Only'; % 'One Body Heave Only' 'Two Body Heave Only' 'Six DOF'
Ts = 0.001; % sampling period 0.001, or 0.0005, or 0.00025 (doesn't get past state 2)
Expand Down
2 changes: 0 additions & 2 deletions Simulink/utils/createSignals.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
msnames = {'MS1','MS2','MS3'};
seed = 13;

% sig = genMultiSine_NInput(fmin,fmax,rLen,'numPhases',NumPhases,'plotFlag',1,'dt',1/fs,'NumExp',3,'NumRepeat',nRepeats)
sig = genMultiSine_NInput(fmins,fmaxs,rLen,'numPhases',NumPhases,'plotFlag',1,'dt',1/fs,'NumExp',nExp,'NumRepeat',nRepeats,'seed',seed);
%sig = whiteNoiseGen(fs,fmin,fmax,rLen,nRepeats);

%% ------------Chirp-----------------------------------
f0 = 1/20;
Expand Down
Binary file modified TwinCAT/LUPAandMiniDAQ/.vs/LUPAandMiniDAQ/v15/.suo
Binary file not shown.

0 comments on commit ce8f475

Please sign in to comment.