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.

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

V30.3.0 #143

Merged
merged 10 commits into from
Jun 11, 2024
Merged

V30.3.0 #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4919972
Removed Create Connect button and Create Connected State Label
erinharrington-12 Apr 2, 2024
e67e935
Removed A,B,C buttons from bottom of Create3ExampleWidget UI
erinharrington-12 Apr 3, 2024
ee0d75f
Temporarily commenting out everything in Create3ExampleWidget
erinharrington-12 Apr 3, 2024
1e71f1d
Added example programs to main Create 3 page
erinharrington-12 Apr 3, 2024
0632bb9
Layout changes to Create3Widget
erinharrington-12 Apr 9, 2024
2a50bb8
Added includes
erinharrington-12 Apr 16, 2024
7da7e2e
Tello Network Widget UI
erinharrington-12 Jun 11, 2024
4afe887
Removed kj exception from catch
erinharrington-12 Jun 11, 2024
4b0a69a
formatting adjustment to Create3 IP
erinharrington-12 Jun 11, 2024
8d0e646
Removed TelloNetworksWidget.ui
erinharrington-12 Jun 11, 2024
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
84 changes: 42 additions & 42 deletions include/botui/Create3ExampleWidget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
#ifndef _CREATE3EXAMPLEWIDGET_H_
#define _CREATE3EXAMPLEWIDGET_H_

#include "StandardWidget.h"

#include <QRegularExpression>
#include <QStringListModel>
namespace Ui
{
class Create3ExampleWidget;
}

class Create3SensorModel;

class Create3ExampleWidget : public StandardWidget
{
Q_OBJECT
public:
Create3ExampleWidget(Device *device, QWidget *parent = 0);
~Create3ExampleWidget();

private slots:

int create3Connect();
int isConnected();
void indexChanged(int index);
void run();

private:
Ui::Create3ExampleWidget *ui;

Create3SensorModel *_model;
double m_setpointVal;
double m_feedbackVal;
int m_position_1;
double m_vel_1;
void update();
QStringListModel *model;
void updatePids();
};

#endif
// #ifndef _CREATE3EXAMPLEWIDGET_H_
// #define _CREATE3EXAMPLEWIDGET_H_

// #include "StandardWidget.h"

// #include <QRegularExpression>
// #include <QStringListModel>
// namespace Ui
// {
// class Create3ExampleWidget;
// }

// class Create3SensorModel;

// class Create3ExampleWidget : public StandardWidget
// {
// Q_OBJECT
// public:
// Create3ExampleWidget(Device *device, QWidget *parent = 0);
// ~Create3ExampleWidget();

// private slots:

// int create3Connect();
// int isConnected();
// void indexChanged(int index);
// void run();

// private:
// Ui::Create3ExampleWidget *ui;

// Create3SensorModel *_model;
// double m_setpointVal;
// double m_feedbackVal;
// int m_position_1;
// double m_vel_1;
// void update();
// QStringListModel *model;
// void updatePids();
// };

// #endif
14 changes: 6 additions & 8 deletions include/botui/Create3Widget.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "StandardWidget.h"

#include <QRegularExpression>
#include <QStringListModel>
#include <QProcess>

namespace Ui
Expand All @@ -15,30 +16,27 @@ class Create3SensorModel;

class Create3Widget : public StandardWidget
{
Q_OBJECT
Q_OBJECT
public:
Create3Widget(Device *device, QWidget *parent = 0);
~Create3Widget();

private slots:

void create3Connect();
// void resetServer();
void sensorList();
void exampleList();
QString getIP();
void toggleChanged();

void indexChanged(int index);
void run();

private:
Ui::Create3Widget *ui;

Create3SensorModel *_model;
Create3SensorModel *_model;
double m_setpointVal;
double m_feedbackVal;
int m_position_1;
QStringListModel *model;
double m_vel_1;
};


#endif
Loading