Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qthing
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jens Nolte
qthing
Commits
a6a71f6f
Commit
a6a71f6f
authored
4 years ago
by
Jens Nolte
Browse files
Options
Downloads
Patches
Plain Diff
Fix problems after rebase
parent
f321a9b3
No related branches found
Branches containing commit
No related tags found
1 merge request
!16
Merge dev branch into master
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
qthing/CMakeLists.txt
+1
-1
1 addition, 1 deletion
qthing/CMakeLists.txt
qthing/include/qthing/core.hpp
+0
-4
0 additions, 4 deletions
qthing/include/qthing/core.hpp
with
1 addition
and
5 deletions
qthing/CMakeLists.txt
+
1
−
1
View file @
a6a71f6f
...
...
@@ -2,7 +2,7 @@ idf_component_register(
SRC_DIRS
"."
"leds"
"legacy"
#
"legacy"
"network"
"peripherals"
"system"
...
...
This diff is collapsed.
Click to expand it.
qthing/include/qthing/core.hpp
+
0
−
4
View file @
a6a71f6f
...
...
@@ -66,10 +66,6 @@ class Component {
virtual
std
::
shared_ptr
<
Driver
>
driver
()
{
return
NULL
;
};
public
:
Component
(
const
Component
&
)
=
delete
;
Component
&
operator
=
(
const
Component
&
)
=
delete
;
static
constexpr
bool
isComponent
()
{
return
true
;
}
virtual
~
Component
()
{}
virtual
void
describe
(
DeviceDescription
&
description
)
=
0
;
};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment