Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
48a41b2
Reformatted with clang-format.
dcharatan Oct 5, 2019
acddf78
Added screen mode enum.
dcharatan Oct 5, 2019
8796ba6
Fixed reserved keyword.
dcharatan Oct 5, 2019
106801d
Semicolon.
dcharatan Oct 5, 2019
c4d757a
Test HELLO.
dcharatan Oct 5, 2019
061c035
Kill paintEvent.
dcharatan Oct 5, 2019
4e1bf40
All red screen test.
dcharatan Oct 5, 2019
2f8026a
killall screens
peterhuson Oct 5, 2019
81e1364
Merge branch 'dcharatan/multipleScreens' of github.com:peterhuson/fsa…
peterhuson Oct 5, 2019
41b757e
Test
dcharatan Oct 5, 2019
d74f3f8
Merge branch 'dcharatan/multipleScreens' of github.com:peterhuson/fsa…
peterhuson Oct 5, 2019
2545d46
Removed images from QRC.
dcharatan Oct 5, 2019
e41a788
Merge branch 'dcharatan/multipleScreens' of github.com:peterhuson/fsa…
peterhuson Oct 5, 2019
3799c36
Acceleration mode test.
dcharatan Oct 5, 2019
ef25b2e
Merge branch 'dcharatan/multipleScreens' of github.com:peterhuson/fsa…
peterhuson Oct 5, 2019
d074612
Remove buttons.
dcharatan Oct 5, 2019
b01e30d
Merge branch 'dcharatan/multipleScreens' of github.com:peterhuson/fsa…
peterhuson Oct 5, 2019
c547ca8
Add debug profile
peterhuson Oct 5, 2019
510aa63
Declare debug in header
peterhuson Oct 5, 2019
a5d1aba
Test large value positioning
peterhuson Oct 5, 2019
9a9e3b7
Add value sizes
peterhuson Oct 5, 2019
bf6aab2
Add distinction between small and large itemHeight
peterhuson Oct 5, 2019
0b8b45c
Fix X Position starts on the left
peterhuson Oct 5, 2019
4c75bbf
Tweak debug values
peterhuson Oct 5, 2019
5e4a233
Tweaking values
peterhuson Oct 5, 2019
8097f8c
Four big values
peterhuson Oct 5, 2019
2d2b2af
RPM is on top
peterhuson Oct 5, 2019
c2651ae
RPM Bigger pls
peterhuson Oct 5, 2019
1dfd98d
Ok chill out now
peterhuson Oct 5, 2019
3aeb824
Resizing more fonts
peterhuson Oct 5, 2019
446749b
Reduce Clutter
peterhuson Oct 5, 2019
e17336a
Final clutter
peterhuson Oct 5, 2019
4897bef
Do we have Gotham?
peterhuson Oct 5, 2019
046acbb
Do we have Futura?
peterhuson Oct 5, 2019
f76c9d3
Do we have Futura?
peterhuson Oct 5, 2019
467d317
Do we have Ubuntu?
peterhuson Oct 5, 2019
5c0a1da
Do we have Asap?
peterhuson Oct 5, 2019
209b6d7
Do we have Asap?
peterhuson Oct 5, 2019
e435e1c
Do we have Asap?
peterhuson Oct 5, 2019
2bb6c05
Add Acceleration profile
peterhuson Oct 5, 2019
610f1cc
Enums are weird
peterhuson Oct 5, 2019
5fe2df3
Center Speed in Accel
peterhuson Oct 5, 2019
1dcfaf3
Added Blueno
dcharatan Oct 5, 2019
ed0b2b1
Add blueno to background of accel
peterhuson Oct 5, 2019
66e32d3
Remove printfs
peterhuson Oct 5, 2019
daf4b3c
The right wheel speed sensor is our source of truth
peterhuson Oct 5, 2019
a779528
Translate Qstring to float
peterhuson Oct 5, 2019
cb88217
Slow Down speed ramp
peterhuson Oct 5, 2019
8ea3851
Test RPM Sign
peterhuson Oct 5, 2019
f9c9a69
Add Speed
peterhuson Oct 5, 2019
1dcd1ae
Tweak Position
peterhuson Oct 5, 2019
3df8506
Tweak Position again
peterhuson Oct 5, 2019
7f1667b
Trying David's positioning
peterhuson Oct 5, 2019
82ed92c
David's positioning final
peterhuson Oct 5, 2019
114d000
Add labels to debug
peterhuson Oct 5, 2019
8176c3f
Add labels
peterhuson Oct 5, 2019
a16bdc0
Reposition
peterhuson Oct 5, 2019
a4c7edd
Add Left Col and Right Col
peterhuson Oct 5, 2019
ab4e99f
Reduce label font size
peterhuson Oct 5, 2019
7ec8061
Make fields the same width as labels
peterhuson Oct 5, 2019
215eb92
Endurance drawer
njk345 Oct 5, 2019
0fa342d
Update mainwidget.h
njk345 Oct 5, 2019
eae273b
Update mainwidget.cpp
njk345 Oct 5, 2019
be19167
Switch to endurance
peterhuson Oct 5, 2019
30d3086
Stick to endurance
peterhuson Oct 5, 2019
081f947
Update mainwidget.cpp
njk345 Oct 5, 2019
86c1ec1
Merge branch 'dcharatan/multipleScreens' of https://github.com/peterh…
njk345 Oct 5, 2019
405b644
Reformat endurance screen
njk345 Oct 5, 2019
0403acd
Switch to acceleration profile for driving day
peterhuson Oct 6, 2019
8c299eb
Fix typo
peterhuson Oct 6, 2019
e27954a
Edit initial speed
peterhuson Oct 6, 2019
1c41148
Add Gear position
peterhuson Oct 23, 2019
17174ce
Change gear to int
peterhuson Oct 23, 2019
48bc6aa
Tweak positions of speeds
peterhuson Oct 23, 2019
ba8f5af
strings cannot be ints
peterhuson Oct 23, 2019
2f0a572
Add gear to acceleration
peterhuson Oct 23, 2019
a5ce71a
Reposition gear on acceleration screen
peterhuson Oct 23, 2019
96e99bb
Merge branch 'master' of https://github.com/peterhuson/fsae-apollo in…
peterhuson Oct 23, 2019
5d37ea6
Ignore IDE files
peterhuson Oct 23, 2019
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
107 changes: 107 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
Language: Cpp
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
AlignOperands: true
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: false
SplitEmptyRecord: false
SplitEmptyNamespace: false
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: AfterColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 140
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: false
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
Priority: 2
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
Priority: 3
- Regex: '.*'
Priority: 1
IncludeIsMainRegex: '(Test)?$'
IndentCaseLabels: false
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 4
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: false
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 19
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Right
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 4
UseTab: Never
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
venv*
.idea/
/build
/.vscode
*.pyc
Expand Down
19 changes: 0 additions & 19 deletions .idea/$CACHE_FILE$

This file was deleted.

18 changes: 0 additions & 18 deletions .idea/$PRODUCT_WORKSPACE_FILE$

This file was deleted.

2 changes: 0 additions & 2 deletions .idea/.gitignore

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/fsae-apollo.iml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/webResources.xml

This file was deleted.

Binary file added display/backgrounds/blueno.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions display/main.qrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<RCC>
<qresource prefix="/">
<file>backgrounds/BlackOnWhite.png</file>
<file>backgrounds/blueno.png</file>
</qresource>
</RCC>
Loading