Skip to content
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.

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

Add navigation page and autopilot task #28

Open
wants to merge 43 commits into
base: kbox-v0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
ea9ace0
Add files via upload
matrixlinks Mar 21, 2017
3b0ed7d
Delete main.cpp
matrixlinks Mar 21, 2017
cef86c2
Add autopilot functionality
matrixlinks Mar 21, 2017
bdae883
Adding autopilot functionality
matrixlinks Mar 21, 2017
3c3720a
Adding autopilot functionality
matrixlinks Mar 21, 2017
9a17bd6
Adding autopilot functionality
matrixlinks Mar 21, 2017
49afcf6
Adding autopilot functionality
matrixlinks Mar 21, 2017
e827589
Added variable to configure KBOX orientation
matrixlinks Mar 21, 2017
db87e76
Warning when IMU not configured
matrixlinks Mar 21, 2017
f74058c
Rudder sensor input on bat3
matrixlinks Mar 21, 2017
8d32f7a
Create test
matrixlinks Mar 21, 2017
37f5edd
Delete test
matrixlinks Mar 21, 2017
84e2047
Create test
matrixlinks Mar 21, 2017
3c0fb54
Adding PID library
matrixlinks Mar 21, 2017
4157c50
Delete test
matrixlinks Mar 21, 2017
a10acb1
Adds autopilot functionality
matrixlinks Mar 22, 2017
222e808
Add RudderSensor task
matrixlinks Mar 23, 2017
534ea02
Reformat IMU message generation
matrixlinks Mar 23, 2017
b14cb22
Improve autopilot functionality
matrixlinks Mar 23, 2017
32a19b0
Suppressed debug message
matrixlinks Mar 23, 2017
4ca6c68
Added RudderSensor task
matrixlinks Mar 23, 2017
7f13d34
Format fixes and add RudderSensor message
matrixlinks Mar 23, 2017
3759b36
Add RudderSensor task
matrixlinks Mar 23, 2017
af382de
Add RudderSensor task
matrixlinks Mar 23, 2017
f13b9f4
Wrong location
matrixlinks Mar 23, 2017
4a7b4ce
File in wrong location
matrixlinks Mar 23, 2017
3002738
Update Navigation page
matrixlinks Mar 23, 2017
dd59141
Removed RudderSensor task
matrixlinks Mar 30, 2017
d11ed62
Removed RudderSensorTask (relocated to ADCTask)
matrixlinks Mar 30, 2017
5fce3c3
Reload correct file
matrixlinks Mar 30, 2017
b6935c8
Various minor edits
matrixlinks Mar 30, 2017
1558573
Move IMUSequence inside function
matrixlinks Mar 30, 2017
839101e
Add RudderSensor functionality to ADCTask
matrixlinks Mar 30, 2017
0cb29fd
Delete RudderSensorTask.cpp
matrixlinks Mar 30, 2017
11e8794
Delete RudderSensorTask.h
matrixlinks Mar 30, 2017
d55348d
Use MAXRUDDERSWING to set default rudder position
matrixlinks Mar 30, 2017
52a7115
Make ADCTask and IMUTask use const class variables for configuration
sarfata Apr 1, 2017
9aa8f6d
Removing Arduino-PID-Library to re-add it as a subtree
sarfata Apr 1, 2017
785ed14
Squashed 'lib/Arduino-PID-Library/' content from commit 5adeed5
sarfata Apr 1, 2017
7dbe35a
Merge commit '785ed147204832fecd5a5405f7d2d0b4f68b796e' as 'lib/Ardui…
sarfata Apr 1, 2017
039985b
Finalizing adding the Arduino PID Lib as a subtree
sarfata Apr 1, 2017
aeba2ff
Move headingPID inside AutoPilotTask
sarfata Apr 1, 2017
ce0b4b9
fix indentation
sarfata Apr 1, 2017
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ separately.
- [Adafruit BMP280](https://github.com/adafruit/Adafruit_BMP280_Library) is under the BSD license
- [Adafruit BNO055](https://github.com/adafruit/Adafruit_BNO055/) is under the MIT license
- [ADC library](https://github.com/pedvide/ADC) is a permissive custom license
- [Arduino PID Library](https://github.com/br3ttb/Arduino-PID-Library/) is
under the GPLv3
- [FlexCAN](https://github.com/teachop/FlexCAN_Library) does not seem to have a
license [yet](https://github.com/teachop/FlexCAN_Library/issues/12)
- [i2c_t3](https://github.com/nox771/i2c_t3) is under the LGPL
Expand Down
195 changes: 195 additions & 0 deletions lib/Arduino-PID-Library/PID_v1.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
/**********************************************************************************************
* Arduino PID Library - Version 1.1.1
* by Brett Beauregard <[email protected]> brettbeauregard.com
*
* This Library is licensed under a GPLv3 License
**********************************************************************************************/

#if ARDUINO >= 100
#include "Arduino.h"
#else
#include "WProgram.h"
#endif

#include <PID_v1.h>

/*Constructor (...)*********************************************************
* The parameters specified here are those for for which we can't set up
* reliable defaults, so we need to have the user set them.
***************************************************************************/
PID::PID(double* Input, double* Output, double* Setpoint,
double Kp, double Ki, double Kd, int ControllerDirection)
{

myOutput = Output;
myInput = Input;
mySetpoint = Setpoint;
inAuto = false;

PID::SetOutputLimits(0, 255); //default output limit corresponds to
//the arduino pwm limits

SampleTime = 100; //default Controller Sample Time is 0.1 seconds

PID::SetControllerDirection(ControllerDirection);
PID::SetTunings(Kp, Ki, Kd);

lastTime = millis()-SampleTime;
}


/* Compute() **********************************************************************
* This, as they say, is where the magic happens. this function should be called
* every time "void loop()" executes. the function will decide for itself whether a new
* pid Output needs to be computed. returns true when the output is computed,
* false when nothing has been done.
**********************************************************************************/
bool PID::Compute()
{
if(!inAuto) return false;
unsigned long now = millis();
unsigned long timeChange = (now - lastTime);
if(timeChange>=SampleTime)
{
/*Compute all the working error variables*/
double input = *myInput;
double error = *mySetpoint - input;
ITerm+= (ki * error);
if(ITerm > outMax) ITerm= outMax;
else if(ITerm < outMin) ITerm= outMin;
double dInput = (input - lastInput);

/*Compute PID Output*/
double output = kp * error + ITerm- kd * dInput;

if(output > outMax) output = outMax;
else if(output < outMin) output = outMin;
*myOutput = output;

/*Remember some variables for next time*/
lastInput = input;
lastTime = now;
return true;
}
else return false;
}


/* SetTunings(...)*************************************************************
* This function allows the controller's dynamic performance to be adjusted.
* it's called automatically from the constructor, but tunings can also
* be adjusted on the fly during normal operation
******************************************************************************/
void PID::SetTunings(double Kp, double Ki, double Kd)
{
if (Kp<0 || Ki<0 || Kd<0) return;

dispKp = Kp; dispKi = Ki; dispKd = Kd;

double SampleTimeInSec = ((double)SampleTime)/1000;
kp = Kp;
ki = Ki * SampleTimeInSec;
kd = Kd / SampleTimeInSec;

if(controllerDirection ==REVERSE)
{
kp = (0 - kp);
ki = (0 - ki);
kd = (0 - kd);
}
}

/* SetSampleTime(...) *********************************************************
* sets the period, in Milliseconds, at which the calculation is performed
******************************************************************************/
void PID::SetSampleTime(int NewSampleTime)
{
if (NewSampleTime > 0)
{
double ratio = (double)NewSampleTime
/ (double)SampleTime;
ki *= ratio;
kd /= ratio;
SampleTime = (unsigned long)NewSampleTime;
}
}

/* SetOutputLimits(...)****************************************************
* This function will be used far more often than SetInputLimits. while
* the input to the controller will generally be in the 0-1023 range (which is
* the default already,) the output will be a little different. maybe they'll
* be doing a time window and will need 0-8000 or something. or maybe they'll
* want to clamp it from 0-125. who knows. at any rate, that can all be done
* here.
**************************************************************************/
void PID::SetOutputLimits(double Min, double Max)
{
if(Min >= Max) return;
outMin = Min;
outMax = Max;

if(inAuto)
{
if(*myOutput > outMax) *myOutput = outMax;
else if(*myOutput < outMin) *myOutput = outMin;

if(ITerm > outMax) ITerm= outMax;
else if(ITerm < outMin) ITerm= outMin;
}
}

/* SetMode(...)****************************************************************
* Allows the controller Mode to be set to manual (0) or Automatic (non-zero)
* when the transition from manual to auto occurs, the controller is
* automatically initialized
******************************************************************************/
void PID::SetMode(int Mode)
{
bool newAuto = (Mode == AUTOMATIC);
if(newAuto && !inAuto)
{ /*we just went from manual to auto*/
PID::Initialize();
}
inAuto = newAuto;
}

/* Initialize()****************************************************************
* does all the things that need to happen to ensure a bumpless transfer
* from manual to automatic mode.
******************************************************************************/
void PID::Initialize()
{
ITerm = *myOutput;
lastInput = *myInput;
if(ITerm > outMax) ITerm = outMax;
else if(ITerm < outMin) ITerm = outMin;
}

/* SetControllerDirection(...)*************************************************
* The PID will either be connected to a DIRECT acting process (+Output leads
* to +Input) or a REVERSE acting process(+Output leads to -Input.) we need to
* know which one, because otherwise we may increase the output when we should
* be decreasing. This is called from the constructor.
******************************************************************************/
void PID::SetControllerDirection(int Direction)
{
if(inAuto && Direction !=controllerDirection)
{
kp = (0 - kp);
ki = (0 - ki);
kd = (0 - kd);
}
controllerDirection = Direction;
}

/* Status Funcions*************************************************************
* Just because you set the Kp=-1 doesn't mean it actually happened. these
* functions query the internal state of the PID. they're here for display
* purposes. this are the functions the PID Front-end uses for example
******************************************************************************/
double PID::GetKp(){ return dispKp; }
double PID::GetKi(){ return dispKi;}
double PID::GetKd(){ return dispKd;}
int PID::GetMode(){ return inAuto ? AUTOMATIC : MANUAL;}
int PID::GetDirection(){ return controllerDirection;}

80 changes: 80 additions & 0 deletions lib/Arduino-PID-Library/PID_v1.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
#ifndef PID_v1_h
#define PID_v1_h
#define LIBRARY_VERSION 1.1.1

class PID
{


public:

//Constants used in some of the functions below
#define AUTOMATIC 1
#define MANUAL 0
#define DIRECT 0
#define REVERSE 1

//commonly used functions **************************************************************************
PID(double*, double*, double*, // * constructor. links the PID to the Input, Output, and
double, double, double, int); // Setpoint. Initial tuning parameters are also set here

void SetMode(int Mode); // * sets PID to either Manual (0) or Auto (non-0)

bool Compute(); // * performs the PID calculation. it should be
// called every time loop() cycles. ON/OFF and
// calculation frequency can be set using SetMode
// SetSampleTime respectively

void SetOutputLimits(double, double); //clamps the output to a specific range. 0-255 by default, but
//it's likely the user will want to change this depending on
//the application



//available but not commonly used functions ********************************************************
void SetTunings(double, double, // * While most users will set the tunings once in the
double); // constructor, this function gives the user the option
// of changing tunings during runtime for Adaptive control
void SetControllerDirection(int); // * Sets the Direction, or "Action" of the controller. DIRECT
// means the output will increase when error is positive. REVERSE
// means the opposite. it's very unlikely that this will be needed
// once it is set in the constructor.
void SetSampleTime(int); // * sets the frequency, in Milliseconds, with which
// the PID calculation is performed. default is 100



//Display functions ****************************************************************
double GetKp(); // These functions query the pid for interal values.
double GetKi(); // they were created mainly for the pid front-end,
double GetKd(); // where it's important to know what is actually
int GetMode(); // inside the PID.
int GetDirection(); //

private:
void Initialize();

double dispKp; // * we'll hold on to the tuning parameters in user-entered
double dispKi; // format for display purposes
double dispKd; //

double kp; // * (P)roportional Tuning Parameter
double ki; // * (I)ntegral Tuning Parameter
double kd; // * (D)erivative Tuning Parameter

int controllerDirection;

double *myInput; // * Pointers to the Input, Output, and Setpoint variables
double *myOutput; // This creates a hard link between the variables and the
double *mySetpoint; // PID, freeing the user from having to constantly tell us
// what these values are. with pointers we'll just know.

unsigned long lastTime;
double ITerm, lastInput;

unsigned long SampleTime;
double outMin, outMax;
bool inAuto;
};
#endif

11 changes: 11 additions & 0 deletions lib/Arduino-PID-Library/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
***************************************************************
* Arduino PID Library - Version 1.1.1
* by Brett Beauregard <[email protected]> brettbeauregard.com
*
* This Library is licensed under a GPLv3 License
***************************************************************

- For an ultra-detailed explanation of why the code is the way it is, please visit:
http://brettbeauregard.com/blog/2011/04/improving-the-beginners-pid-introduction/

- For function documentation see: http://playground.arduino.cc/Code/PIDLibrary
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/********************************************************
* PID Adaptive Tuning Example
* One of the benefits of the PID library is that you can
* change the tuning parameters at any time. this can be
* helpful if we want the controller to be agressive at some
* times, and conservative at others. in the example below
* we set the controller to use Conservative Tuning Parameters
* when we're near setpoint and more agressive Tuning
* Parameters when we're farther away.
********************************************************/

#include <PID_v1.h>

#define PIN_INPUT 0
#define PIN_OUTPUT 3

//Define Variables we'll be connecting to
double Setpoint, Input, Output;

//Define the aggressive and conservative Tuning Parameters
double aggKp=4, aggKi=0.2, aggKd=1;
double consKp=1, consKi=0.05, consKd=0.25;

//Specify the links and initial tuning parameters
PID myPID(&Input, &Output, &Setpoint, consKp, consKi, consKd, DIRECT);

void setup()
{
//initialize the variables we're linked to
Input = analogRead(PIN_INPUT);
Setpoint = 100;

//turn the PID on
myPID.SetMode(AUTOMATIC);
}

void loop()
{
Input = analogRead(PIN_INPUT);

double gap = abs(Setpoint-Input); //distance away from setpoint
if (gap < 10)
{ //we're close to setpoint, use conservative tuning parameters
myPID.SetTunings(consKp, consKi, consKd);
}
else
{
//we're far from setpoint, use aggressive tuning parameters
myPID.SetTunings(aggKp, aggKi, aggKd);
}

myPID.Compute();
analogWrite(PIN_OUTPUT, Output);
}


35 changes: 35 additions & 0 deletions lib/Arduino-PID-Library/examples/PID_Basic/PID_Basic.ino
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/********************************************************
* PID Basic Example
* Reading analog input 0 to control analog PWM output 3
********************************************************/

#include <PID_v1.h>

#define PIN_INPUT 0
#define PIN_OUTPUT 3

//Define Variables we'll be connecting to
double Setpoint, Input, Output;

//Specify the links and initial tuning parameters
double Kp=2, Ki=5, Kd=1;
PID myPID(&Input, &Output, &Setpoint, Kp, Ki, Kd, DIRECT);

void setup()
{
//initialize the variables we're linked to
Input = analogRead(PIN_INPUT);
Setpoint = 100;

//turn the PID on
myPID.SetMode(AUTOMATIC);
}

void loop()
{
Input = analogRead(PIN_INPUT);
myPID.Compute();
analogWrite(PIN_OUTPUT, Output);
}


Loading