-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #128 from Northeastern-Electric-Racing/nero-design…
…-update updated nerodesign
- Loading branch information
Showing
28 changed files
with
1,786 additions
and
651 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,115 +0,0 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE QtCreatorProject> | ||
| <!-- Written by QtDesignStudio 4.5.1, 2024-10-30T04:32:03. --> | ||
| <qtcreator> | ||
| <data> | ||
| <variable>EnvironmentId</variable> | ||
| <value type="QByteArray">{8cc7a412-b525-49ef-bbee-0b31ae85f947}</value> | ||
| </data> | ||
| <data> | ||
| <variable>ProjectExplorer.Project.ActiveTarget</variable> | ||
| <value type="qlonglong">0</value> | ||
| </data> | ||
| <data> | ||
| <variable>ProjectExplorer.Project.EditorSettings</variable> | ||
| <valuemap type="QVariantMap"> | ||
| <value type="bool" key="EditorConfiguration.AutoIndent">true</value> | ||
| <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> | ||
| <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> | ||
| <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> | ||
| <value type="QString" key="language">Cpp</value> | ||
| <valuemap type="QVariantMap" key="value"> | ||
| <value type="QByteArray" key="CurrentPreferences">CppGlobal</value> | ||
| </valuemap> | ||
| </valuemap> | ||
| <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> | ||
| <value type="QString" key="language">QmlJS</value> | ||
| <valuemap type="QVariantMap" key="value"> | ||
| <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value> | ||
| </valuemap> | ||
| </valuemap> | ||
| <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value> | ||
| <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> | ||
| <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> | ||
| <value type="int" key="EditorConfiguration.IndentSize">4</value> | ||
| <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> | ||
| <value type="int" key="EditorConfiguration.MarginColumn">80</value> | ||
| <value type="bool" key="EditorConfiguration.MouseHiding">true</value> | ||
| <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> | ||
| <value type="int" key="EditorConfiguration.PaddingMode">1</value> | ||
| <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value> | ||
| <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value> | ||
| <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> | ||
| <value type="bool" key="EditorConfiguration.ShowMargin">false</value> | ||
| <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value> | ||
| <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value> | ||
| <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> | ||
| <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> | ||
| <value type="int" key="EditorConfiguration.TabSize">8</value> | ||
| <value type="bool" key="EditorConfiguration.UseGlobal">true</value> | ||
| <value type="bool" key="EditorConfiguration.UseIndenter">false</value> | ||
| <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> | ||
| <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> | ||
| <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> | ||
| <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> | ||
| <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value> | ||
| <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> | ||
| <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value> | ||
| <value type="bool" key="EditorConfiguration.tintMarginArea">true</value> | ||
| </valuemap> | ||
| </data> | ||
| <data> | ||
| <variable>ProjectExplorer.Project.Target.0</variable> | ||
| <valuemap type="QVariantMap"> | ||
| <value type="QString" key="DeviceType">Desktop</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 6.7.1</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 6.7.1</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{63f87550-2541-4163-9631-08b7fea781da}</value> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">0</value> | ||
| <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> | ||
| <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> | ||
| <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Deploy</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> | ||
| </valuemap> | ||
| <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> | ||
| <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/> | ||
| <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> | ||
| </valuemap> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> | ||
| <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> | ||
| <valuelist type="QVariantList" key="CustomOutputParsers"/> | ||
| <value type="int" key="PE.EnvironmentAspect.Base">0</value> | ||
| <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> | ||
| <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Runtime</value> | ||
| <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.Qml</value> | ||
| <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey"></value> | ||
| <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value> | ||
| <value type="QString" key="QmlProjectManager.QmlRunConfiguration.LastUsedLanguage">en</value> | ||
| <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value> | ||
| <value type="bool" key="QmlProjectManager.QmlRunConfiguration.UseMultiLanguage">true</value> | ||
| <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> | ||
| <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value> | ||
| </valuemap> | ||
| <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value> | ||
| </valuemap> | ||
| </data> | ||
| <data> | ||
| <variable>ProjectExplorer.Project.TargetCount</variable> | ||
| <value type="qlonglong">1</value> | ||
| </data> | ||
| <data> | ||
| <variable>ProjectExplorer.Project.Updater.FileVersion</variable> | ||
| <value type="int">22</value> | ||
| </data> | ||
| <data> | ||
| <variable>Version</variable> | ||
| <value type="int">22</value> | ||
| </data> | ||
| </qtcreator> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,125 +0,0 @@ | ||
| // Copyright (C) 2021 The Qt Company Ltd. | ||
| // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only | ||
| import QtQuick 6.5 | ||
| import NERO | ||
| import QtQuick.Timeline 1.0 | ||
|
|
||
| Window { | ||
| width: 800 | ||
| height: 480 | ||
| color: "black" | ||
|
|
||
| visible: true | ||
| title: "NERO" | ||
|
|
||
| FontLoader { | ||
| id: webFont | ||
| source: "fonts/Roboto-Black.ttf" | ||
| } | ||
|
|
||
| Pit { | ||
| id: pitScreen | ||
| } | ||
| //EfficiencyScreen {} | ||
| // OffScreen {} | ||
| Timeline { | ||
| id: appTimeline | ||
| animations: [ | ||
| TimelineAnimation { | ||
| id: appAnimation | ||
| pingPong: true | ||
| running: true | ||
| loops: -1 | ||
| duration: 5000 | ||
| to: 5000 | ||
| from: 0 | ||
| } | ||
| ] | ||
| startFrame: 0 | ||
| endFrame: 5000 | ||
| enabled: true | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "currentSpeed" | ||
| Keyframe { | ||
| value: 0 | ||
| frame: 0 | ||
| } | ||
|
|
||
| Keyframe { | ||
| value: 5 | ||
| frame: 5000 | ||
| } | ||
| } | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "stateOfChargePercentage" | ||
| Keyframe { | ||
| value: 0 | ||
| frame: 0 | ||
| } | ||
|
|
||
| Keyframe { | ||
| value: 100 | ||
| frame: 4988 | ||
| } | ||
| } | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "packTempValue" | ||
| Keyframe { | ||
| value: -20 | ||
| frame: 0 | ||
| } | ||
|
|
||
| Keyframe { | ||
| value: 50 | ||
| frame: 4988 | ||
| } | ||
| } | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "motorTempValue" | ||
| Keyframe { | ||
| value: -20 | ||
| frame: 0 | ||
| } | ||
|
|
||
| Keyframe { | ||
| value: 50 | ||
| frame: 4988 | ||
| } | ||
| } | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "isTalking" | ||
| Keyframe { | ||
| value: true | ||
| frame: 0 | ||
| } | ||
| Keyframe { | ||
| value: false | ||
| frame: 4988 | ||
| } | ||
| } | ||
|
|
||
| KeyframeGroup { | ||
| target: pitScreen | ||
| property: "stateOfChargePercentage" | ||
| Keyframe { | ||
| value: 0 | ||
| frame: 0 | ||
| } | ||
|
|
||
| Keyframe { | ||
| value: 100 | ||
| frame: 4988 | ||
| } | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.