sadmen
/
openpilot_comma
mirror of https://github.com/commaai/openpilot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cabana: move dbc related files to dbc/ (#27712)

Browse Source 
* move dbc related files to dbc/

* move generate_dbc_json.py to dbc/
old-commit-hash: 8903e03c88
beeps
Dean Lee 2 years ago committed by GitHub
parent ad5b489005
commit 640d68e3bc
22 changed files with 23 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      tools/cabana/.gitignore
  2. 5
      tools/cabana/SConscript
  3. 2
      tools/cabana/binaryview.h
  4. 2
      tools/cabana/chartswidget.h
  5. 2
      tools/cabana/commands.h
  6. 2
      tools/cabana/dbc/dbc.cc
  7. 0
      tools/cabana/dbc/dbc.h
  8. 2
      tools/cabana/dbc/dbcfile.cc
  9. 2
      tools/cabana/dbc/dbcfile.h
  10. 2
      tools/cabana/dbc/dbcmanager.cc
  11. 4
      tools/cabana/dbc/dbcmanager.h
  12. 0
      tools/cabana/dbc/generate_dbc_json.py
  13. 2
      tools/cabana/historylog.h
  14. 2
      tools/cabana/mainwin.cc
  15. 2
      tools/cabana/mainwin.h
  16. 2
      tools/cabana/messageswidget.h
  17. 2
      tools/cabana/streams/abstractstream.h
  18. 2
      tools/cabana/tests/test_cabana.cc
  19. 2
      tools/cabana/tools/findsimilarbits.cc
  20. 2
      tools/cabana/tools/findsimilarbits.h
  21. 2
      tools/cabana/util.h
  22. 2
      tools/cabana/videowidget.h

2
tools/cabana/.gitignore vendored
Unescape View File

@ -3,5 +3,5 @@ moc_*
_cabana _cabana
settings settings
car_fingerprint_to_dbc.json dbc/car_fingerprint_to_dbc.json
tests/_test_cabana tests/_test_cabana

5
tools/cabana/SConscript
Unescape View File

@ -28,7 +28,8 @@ cabana_env.Depends(assets, Glob('/assets/*', exclude=[assets, assets_src, "asset
prev_moc_path = cabana_env['QT_MOCHPREFIX'] prev_moc_path = cabana_env['QT_MOCHPREFIX']
cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_' cabana_env['QT_MOCHPREFIX'] = os.path.dirname(prev_moc_path) + '/cabana/moc_'
cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc', 'dbc.cc', 'dbcfile.cc', 'dbcmanager.cc', cabana_lib = cabana_env.Library("cabana_lib", ['mainwin.cc', 'streams/livestream.cc', 'streams/abstractstream.cc', 'streams/replaystream.cc', 'binaryview.cc', 'chartswidget.cc', 'historylog.cc', 'videowidget.cc', 'signaledit.cc',
'dbc/dbc.cc', 'dbc/dbcfile.cc', 'dbc/dbcmanager.cc',
'commands.cc', 'messageswidget.cc', 'route.cc', 'settings.cc', 'util.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) 'commands.cc', 'messageswidget.cc', 'route.cc', 'settings.cc', 'util.cc', 'detailwidget.cc', 'tools/findsimilarbits.cc'], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
cabana_env.Program('_cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks) cabana_env.Program('_cabana', ['cabana.cc', cabana_lib, assets], LIBS=cabana_libs, FRAMEWORKS=base_frameworks)
@ -39,5 +40,5 @@ if GetOption('test'):
cabana_env.Program('tests/_test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs]) cabana_env.Program('tests/_test_cabana', ['tests/test_runner.cc', 'tests/test_cabana.cc', cabana_lib], LIBS=[cabana_libs])
def generate_dbc_json(target, source, env): def generate_dbc_json(target, source, env):
env.Execute('tools/cabana/generate_dbc_json.py --out tools/cabana/car_fingerprint_to_dbc.json') env.Execute('tools/cabana/dbc/generate_dbc_json.py --out tools/cabana/dbc/car_fingerprint_to_dbc.json')
cabana_env.Command('generate_dbc_json', [], generate_dbc_json) cabana_env.Command('generate_dbc_json', [], generate_dbc_json)

2
tools/cabana/binaryview.h
Unescape View File

@ -6,7 +6,7 @@
#include <QStyledItemDelegate> #include <QStyledItemDelegate>
#include <QTableView> #include <QTableView>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
class BinaryItemDelegate : public QStyledItemDelegate { class BinaryItemDelegate : public QStyledItemDelegate {

2
tools/cabana/chartswidget.h
Unescape View File

@ -13,7 +13,7 @@
#include <QtCharts/QScatterSeries> #include <QtCharts/QScatterSeries>
#include <QtCharts/QValueAxis> #include <QtCharts/QValueAxis>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
using namespace QtCharts; using namespace QtCharts;

2
tools/cabana/commands.h
Unescape View File

@ -3,7 +3,7 @@
#include <QUndoCommand> #include <QUndoCommand>
#include <QUndoStack> #include <QUndoStack>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
class EditMsgCommand : public QUndoCommand { class EditMsgCommand : public QUndoCommand {

2
tools/cabana/dbc.cc → tools/cabana/dbc/dbc.cc
Unescape View File

@ -1,4 +1,4 @@
#include "tools/cabana/dbc.h" #include "tools/cabana/dbc/dbc.h"
#include "tools/cabana/util.h" #include "tools/cabana/util.h"
uint qHash(const MessageId &item) { uint qHash(const MessageId &item) {

0
tools/cabana/dbc.h → tools/cabana/dbc/dbc.h
Unescape View File

2
tools/cabana/dbcfile.cc → tools/cabana/dbc/dbcfile.cc
Unescape View File

@ -1,4 +1,4 @@
#include "tools/cabana/dbcfile.h" #include "tools/cabana/dbc/dbcfile.h"
#include <QDebug> #include <QDebug>

2
tools/cabana/dbcfile.h → tools/cabana/dbc/dbcfile.h
Unescape View File

@ -8,7 +8,7 @@
#include <QSet> #include <QSet>
#include <QDebug> #include <QDebug>
#include "tools/cabana/dbc.h" #include "tools/cabana/dbc/dbc.h"
const QString AUTO_SAVE_EXTENSION = ".tmp"; const QString AUTO_SAVE_EXTENSION = ".tmp";

2
tools/cabana/dbcmanager.cc → tools/cabana/dbc/dbcmanager.cc
Unescape View File

@ -1,4 +1,4 @@
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include <QFile> #include <QFile>
#include <QRegularExpression> #include <QRegularExpression>

4
tools/cabana/dbcmanager.h → tools/cabana/dbc/dbcmanager.h
Unescape View File

@ -8,8 +8,8 @@
#include <QSet> #include <QSet>
#include <QDebug> #include <QDebug>
#include "tools/cabana/dbc.h" #include "tools/cabana/dbc/dbc.h"
#include "tools/cabana/dbcfile.h" #include "tools/cabana/dbc/dbcfile.h"
typedef QSet<uint8_t> SourceSet; typedef QSet<uint8_t> SourceSet;
const SourceSet SOURCE_ALL = {}; const SourceSet SOURCE_ALL = {};

0
tools/cabana/generate_dbc_json.py → tools/cabana/dbc/generate_dbc_json.py
Unescape View File

2
tools/cabana/historylog.h
Unescape View File

@ -7,7 +7,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QTableView> #include <QTableView>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
#include "tools/cabana/util.h" #include "tools/cabana/util.h"

2
tools/cabana/mainwin.cc
Unescape View File

@ -55,7 +55,7 @@ MainWindow::MainWindow() : QMainWindow() {
main_win = this; main_win = this;
qInstallMessageHandler(qLogMessageHandler); qInstallMessageHandler(qLogMessageHandler);
for (const QString &fn : {"./car_fingerprint_to_dbc.json", "./tools/cabana/car_fingerprint_to_dbc.json"}) { for (const QString &fn : {"./dbc/car_fingerprint_to_dbc.json", "./tools/cabana/dbc/car_fingerprint_to_dbc.json"}) {
QFile json_file(fn); QFile json_file(fn);
if (json_file.open(QIODevice::ReadOnly)) { if (json_file.open(QIODevice::ReadOnly)) {
fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll()); fingerprint_to_dbc = QJsonDocument::fromJson(json_file.readAll());

2
tools/cabana/mainwin.h
Unescape View File

@ -8,7 +8,7 @@
#include <QStatusBar> #include <QStatusBar>
#include "tools/cabana/chartswidget.h" #include "tools/cabana/chartswidget.h"
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/detailwidget.h" #include "tools/cabana/detailwidget.h"
#include "tools/cabana/messageswidget.h" #include "tools/cabana/messageswidget.h"
#include "tools/cabana/videowidget.h" #include "tools/cabana/videowidget.h"

2
tools/cabana/messageswidget.h
Unescape View File

@ -6,7 +6,7 @@
#include <QSet> #include <QSet>
#include <QTableView> #include <QTableView>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
class MessageListModel : public QAbstractTableModel { class MessageListModel : public QAbstractTableModel {

2
tools/cabana/streams/abstractstream.h
Unescape View File

@ -6,7 +6,7 @@
#include <QColor> #include <QColor>
#include <QHash> #include <QHash>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/settings.h" #include "tools/cabana/settings.h"
#include "tools/cabana/util.h" #include "tools/cabana/util.h"
#include "tools/replay/replay.h" #include "tools/replay/replay.h"

2
tools/cabana/tests/test_cabana.cc
Unescape View File

@ -3,7 +3,7 @@
#undef INFO #undef INFO
#include "catch2/catch.hpp" #include "catch2/catch.hpp"
#include "tools/replay/logreader.h" #include "tools/replay/logreader.h"
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
// demo route, first segment // demo route, first segment

2
tools/cabana/tools/findsimilarbits.cc
Unescape View File

@ -8,7 +8,7 @@
#include <QPushButton> #include <QPushButton>
#include <QRadioButton> #include <QRadioButton>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
FindSimilarBitsDlg::FindSimilarBitsDlg(QWidget *parent) : QDialog(parent, Qt::WindowFlags() | Qt::Window) { FindSimilarBitsDlg::FindSimilarBitsDlg(QWidget *parent) : QDialog(parent, Qt::WindowFlags() | Qt::Window) {

2
tools/cabana/tools/findsimilarbits.h
Unescape View File

@ -6,7 +6,7 @@
#include <QSpinBox> #include <QSpinBox>
#include <QTableWidget> #include <QTableWidget>
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
class FindSimilarBitsDlg : public QDialog { class FindSimilarBitsDlg : public QDialog {
Q_OBJECT Q_OBJECT

2
tools/cabana/util.h
Unescape View File

@ -12,7 +12,7 @@
#include <QToolButton> #include <QToolButton>
#include <QVector> #include <QVector>
#include "tools/cabana/dbc.h" #include "tools/cabana/dbc/dbc.h"
class ChangeTracker { class ChangeTracker {
public: public:

2
tools/cabana/videowidget.h
Unescape View File

@ -12,7 +12,7 @@
#include "selfdrive/ui/qt/widgets/cameraview.h" #include "selfdrive/ui/qt/widgets/cameraview.h"
#include "selfdrive/ui/qt/widgets/controls.h" #include "selfdrive/ui/qt/widgets/controls.h"
#include "tools/cabana/dbcmanager.h" #include "tools/cabana/dbc/dbcmanager.h"
#include "tools/cabana/streams/abstractstream.h" #include "tools/cabana/streams/abstractstream.h"
class Slider : public QSlider { class Slider : public QSlider {

Write Preview
Loading…
Cancel
Save