Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
04f558b
Switched to PCAN
MasonDiGi-VT Mar 23, 2024
6ed4ab1
Update readme with run instructions
MasonDiGi-VT Mar 23, 2024
4ffc169
Update readme with run instructions
MasonDiGi-VT Mar 23, 2024
5ecb510
Removed bug
MasonDiGi-VT Mar 23, 2024
1885dfe
Merge branch 'main' into oldCAN
MasonDiGi Apr 3, 2024
1b404cd
Adjusted realistic maxes
MasonDiGi Apr 3, 2024
0dfdb4b
Fix scaling
MasonDiGi Apr 3, 2024
40f10d9
Fixed fullscreen borked
MasonDiGi Apr 3, 2024
0390124
Lowered refresh time
MasonDiGi Apr 3, 2024
a39071c
Update motor temp scaling
MasonDiGi Apr 3, 2024
b8b2aa4
Update BMS temp scaling
MasonDiGi Apr 3, 2024
c200947
Update BMS temp label to be accurate
MasonDiGi Apr 3, 2024
125540f
Changed BMS temp to MC temp
MasonDiGi Apr 3, 2024
c970122
Removed random 's' in backend.cpp
MasonDiGi Apr 3, 2024
9976426
Fixed scaling for pack temperatures
MasonDiGi Apr 3, 2024
f1adc35
Added label for pack soc
MasonDiGi Apr 3, 2024
635aa69
Added labels to sliders
MasonDiGi Apr 3, 2024
a6624b6
Made labels for batteries actually percentages and not decimals
MasonDiGi Apr 3, 2024
a7c1fdf
Changed label for speed to be in rpm for PCAN
MasonDiGi Apr 3, 2024
c2a6464
Oops shouldnt add build folder
MasonDiGi Apr 3, 2024
2bc8792
Rounded RPM value
MasonDiGi Apr 3, 2024
eb70aa0
Fixed stupid order of operations error that messed up the scaling
MasonDiGi Apr 3, 2024
812bd18
Used calcuated bike speed instead of motor speed
MasonDiGi Apr 3, 2024
982af1f
Change rpm label to mph
MasonDiGi Apr 3, 2024
bbc9304
Left-align speed
MasonDiGi Apr 3, 2024
313fd81
Fixed scaling of everything*
MasonDiGi Apr 3, 2024
84df610
More changes
MasonDiGi Apr 3, 2024
c9d8d86
I love scaling
MasonDiGi Apr 3, 2024
7c99a89
Fixed pack scaling - again
MasonDiGi Apr 3, 2024
ddc54c5
Removed MPH label for speed
MasonDiGi Apr 9, 2024
c60a79e
start of lean angle
juliagardin3r Apr 11, 2024
456236b
lean angle?
juliagardin3r Apr 15, 2024
c07e09a
Made a debug screen, which is now default
MasonDiGi Apr 15, 2024
4054781
start of lean angle
juliagardin3r Apr 11, 2024
37ee849
lean angle?
juliagardin3r Apr 15, 2024
913b6d9
Added units to debug screen
MasonDiGi Apr 15, 2024
ad7bb73
Change font size for speed to be bigger
MasonDiGi Apr 16, 2024
2f73cdf
start of lean angle
juliagardin3r Apr 11, 2024
3c647dd
lean angle?
juliagardin3r Apr 15, 2024
e1d1dab
Changed units of bike speed from km/h to mph
MasonDiGi Apr 16, 2024
e0e64dc
Do not make debug screen the default
MasonDiGi Apr 16, 2024
2e84734
start of lean angle
juliagardin3r Apr 11, 2024
d52e17e
lean angle?
juliagardin3r Apr 15, 2024
a9cb178
Made a debug screen, which is now default
MasonDiGi Apr 15, 2024
3be808a
Added units to debug screen
MasonDiGi Apr 15, 2024
25a5092
Changed units of bike speed from km/h to mph
MasonDiGi Apr 16, 2024
ac9dd09
Added lean angle to main screen
MasonDiGi Apr 17, 2024
b6bff1b
start of lean angle
juliagardin3r Apr 11, 2024
83ded84
lean angle?
juliagardin3r Apr 15, 2024
b848cb8
lean angle (but it's just the back)
juliagardin3r Apr 17, 2024
9c25844
lean angle back (in file)
juliagardin3r Apr 17, 2024
cf94f29
Added lean angle to main screen
MasonDiGi Apr 17, 2024
010f79a
Comply with Julia's new lean angle file, me am stoopid
MasonDiGi Apr 17, 2024
719ee68
Added updated lean angle
MasonDiGi Apr 17, 2024
9dc0c51
Added ui changes to make stuff more readable
MasonDiGi Apr 17, 2024
b89036f
Lower label text size a bit to differentiate between different labels
MasonDiGi Apr 17, 2024
79ade24
Made text even smaller
MasonDiGi Apr 17, 2024
5032ce7
start of lean angle
juliagardin3r Apr 11, 2024
1bf28c2
lean angle?
juliagardin3r Apr 15, 2024
433e849
Added framework for IO
MasonDiGi Apr 18, 2024
a25c8ed
Added setButtonStatus to class definition
MasonDiGi Apr 18, 2024
17a7cf3
Added arg to setButtonStatus func
MasonDiGi Apr 18, 2024
80061ec
Force pigpio to work
MasonDiGi Apr 18, 2024
8d8c49a
Pigpio finally working
MasonDiGi Apr 18, 2024
af77550
Start using gpio to switch screens
MasonDiGi Apr 18, 2024
57742ed
Yee haw
MasonDiGi Apr 18, 2024
137fd86
start of lean angle
juliagardin3r Apr 11, 2024
78a576b
lean angle?
juliagardin3r Apr 15, 2024
e2a37df
Force pigpio to work
MasonDiGi Apr 18, 2024
a5e72bc
Pigpio finally working
MasonDiGi Apr 18, 2024
4f10ca9
Fix percentage formatting on debug screen
MasonDiGi Apr 22, 2024
cbce827
Hee hee hee ha
MasonDiGi Apr 23, 2024
596798e
Fixed all god's merge conflicts
MasonDiGi Apr 23, 2024
9f8fa48
Removed warning square and change whole bg if there is a bms fault
MasonDiGi Apr 23, 2024
829aee0
Fixed some formatting
MasonDiGi Apr 24, 2024
c156cbb
Changed a lot of GUI kajiggering
MasonDiGi Apr 24, 2024
f863a84
Shiße
MasonDiGi Apr 24, 2024
429d3c8
Fix over/underfilled bars
MasonDiGi Apr 24, 2024
d3b94bc
Lined everything on the right side up
MasonDiGi Apr 24, 2024
87d223a
Change background rectangles to black with white text
MasonDiGi Apr 24, 2024
d2529a3
leannnnnnnn
juliagardin3r Apr 24, 2024
5e8625a
leannnnnnnnnnnnnn
juliagardin3r Apr 24, 2024
f8e8608
the correct dial was added (for once)
juliagardin3r Apr 24, 2024
9d92817
Make things look good
MasonDiGi Apr 24, 2024
08721b8
Remove stoopid rectangle
MasonDiGi Apr 24, 2024
7622b1e
Added island to battery
MasonDiGi Apr 24, 2024
461df39
Reformat temps
MasonDiGi Apr 25, 2024
f2f75df
Reformat temps, but a second time
MasonDiGi Apr 25, 2024
05ffa8a
Make bike status text a lil smaller
MasonDiGi Apr 25, 2024
79bfca7
Use real data instead of dummy data
MasonDiGi Apr 25, 2024
ad26559
Scale up the battery percentage
MasonDiGi Apr 25, 2024
d3764a8
Use real data for speed
MasonDiGi Apr 25, 2024
ba4523f
Fixed labels for debug screen
MasonDiGi Apr 25, 2024
507da83
Added pack voltage to display
MasonDiGi Apr 25, 2024
41528ef
Changed font
MasonDiGi Apr 25, 2024
02f2adf
Added new font to dash
MasonDiGi Apr 25, 2024
03c58db
Add can pack voltage to debug screen
MasonDiGi Apr 25, 2024
d8b3641
Fix some small things
MasonDiGi Apr 25, 2024
f7ed6e7
Fix voltage scaling
MasonDiGi Apr 25, 2024
d48798e
Fix low cell voltage data
MasonDiGi Apr 25, 2024
cff1827
Implement new battery display
MasonDiGi Apr 27, 2024
a6e08ad
Reformatted temps, but a third time
MasonDiGi Apr 27, 2024
e075ea3
Change bike status to meet all of Colton's deepest desires
MasonDiGi Apr 27, 2024
b5d24f2
Change temp value formatting
MasonDiGi Apr 27, 2024
0bee25e
OMG it actually looks good
MasonDiGi Apr 28, 2024
08b1c11
OK guys it migh talmost be done
MasonDiGi Apr 28, 2024
54ed308
Fix small formatting errors and change rpm conversion to a #DEFINE
MasonDiGi Apr 28, 2024
bf84f14
Fix formatting of indicator connecting lines
MasonDiGi Apr 28, 2024
823b656
Small fixes
MasonDiGi Apr 28, 2024
666f662
Add bike status to CAN
MasonDiGi Apr 28, 2024
4f67bc7
Fix mph indicator
MasonDiGi Apr 28, 2024
101bf82
fix bms fault
MasonDiGi Apr 29, 2024
ac44f8b
Change RPM bar to be percentage of max current
MasonDiGi Apr 29, 2024
87c32b8
Fixed me being silly
MasonDiGi Apr 29, 2024
1501068
Fix left line speedo decoration being silly
MasonDiGi Apr 29, 2024
2cc7baa
Fix MC temp not correct
MasonDiGi Apr 29, 2024
2449694
Fix MC temps but better
MasonDiGi Apr 29, 2024
f1a7d75
Maybe added bike state from CAN
MasonDiGi May 8, 2024
4f46577
Fix current bar
MasonDiGi May 8, 2024
3b6e427
???
MasonDiGi May 8, 2024
39d1e1f
Added web server that outputs json of all bike data from dash
MasonDiGi May 9, 2024
4f9bdfa
Added can data for other types of bms errors/warnings
MasonDiGi May 9, 2024
e68dc0c
Removed extraneous backend files
MasonDiGi May 9, 2024
02e0a46
Add BMS fault details screen - not filled in yet
MasonDiGi May 9, 2024
61ef391
Add strings for bms warnings
MasonDiGi May 9, 2024
6bcf4fd
Add BMS warning light difference between error and warning
MasonDiGi May 9, 2024
9562d5e
Standardize scaling of CAN data because it needs to be done separatel…
MasonDiGi May 19, 2024
6b017ef
Start adding extra debug screens for ECUs
MasonDiGi May 27, 2024
0f16df6
Finish all debug screens with current CAN data
MasonDiGi May 27, 2024
ff57c25
Pi cannot handle folders for some reason
MasonDiGi Jun 9, 2024
0a10aaf
Added temporary testing code for GPS data
MasonDiGi Jul 20, 2024
986f355
Add averaging cell voltages to verify BMS faults
MasonDiGi Jul 22, 2024
0b88419
Add basic GPS code
MasonDiGi Jul 22, 2024
f98b5bc
Add gps parsing code
MasonDiGi Aug 2, 2024
95f1c7d
Change some errors to warnings in backend.cpp
MasonDiGi Aug 2, 2024
65d258d
Correct serial port
MasonDiGi Aug 2, 2024
121d282
Can't have two functions named 'main'
MasonDiGi Aug 2, 2024
304b2e5
Testing
MasonDiGi Aug 2, 2024
9e7c3d0
Migrate changes from pi
MasonDiGi Aug 28, 2024
0988d89
Try using existing gpsd for gps instead of reading serial port
MasonDiGi Aug 28, 2024
40f55ce
Whoops kept build folder in
MasonDiGi Aug 28, 2024
01ad726
Added gps library to compile
MasonDiGi Aug 28, 2024
5b6e94c
Add lat and long to global program
MasonDiGi Aug 30, 2024
d9425a9
I think it helped
MasonDiGi Aug 30, 2024
d6e9384
Maybe?
MasonDiGi Aug 30, 2024
b5d0952
Help me
MasonDiGi Aug 30, 2024
4310540
Add mutex for gps
MasonDiGi Aug 30, 2024
4c26d28
Help me again plz
MasonDiGi Aug 30, 2024
2320ac6
Almost goblinfest
MasonDiGi Aug 30, 2024
038ed51
Plz work
MasonDiGi Aug 30, 2024
9029b7f
Fix debug output
MasonDiGi Aug 30, 2024
e8475cb
Remove duplicate variables
MasonDiGi Aug 30, 2024
da98265
FIx lon printout
MasonDiGi Aug 30, 2024
7a59149
Add gps to web out
MasonDiGi Aug 30, 2024
85b93f0
Turn off debug mode by default
MasonDiGi Aug 30, 2024
9d0a582
Add gps to debug screen
MasonDiGi Aug 30, 2024
cb21b58
Add doxygen theme submodule
MasonDiGi Sep 12, 2024
2945d98
Add doxygen config file
MasonDiGi Sep 12, 2024
f97f7d1
Add doxygen documentation to the code
MasonDiGi Sep 12, 2024
a23071f
Add doxygen html to git repo for gh pages
MasonDiGi Sep 12, 2024
a1c7427
Don't use pigpio if not on a pi
MasonDiGi Mar 26, 2025
293ef54
Can now run on my mac, just won't use libs that don't exist
MasonDiGi Mar 26, 2025
5d4c04c
Fix to compile on a pi
MasonDiGi Mar 26, 2025
782ebe4
Don't constantly print out lat and long
MasonDiGi Mar 26, 2025
142597b
Add support for accessories via PDU CAN
MasonDiGi Mar 31, 2025
20a6925
Merge branch 'main' of github.com:VTBOLT/dash-cpp into oldCAN
MasonDiGi Apr 4, 2025
fa0a0fa
Update doxygen
MasonDiGi Apr 4, 2025
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
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,10 @@
**Debug
**.user
*.qtds.**
**/CMakeCache.txt
**/CMakeCache.txt
.clangd
build/
html/
latex/
.idea/**
.DS_STORE
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "doxygen-awesome-css"]
path = doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
92 changes: 92 additions & 0 deletions Bolt_Dash/CMakeFiles/3.29.2/CMakeCXXCompiler.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
set(CMAKE_CXX_COMPILER "/usr/bin/c++")
set(CMAKE_CXX_COMPILER_ARG1 "")
set(CMAKE_CXX_COMPILER_ID "GNU")
set(CMAKE_CXX_COMPILER_VERSION "13.2.1")
set(CMAKE_CXX_COMPILER_VERSION_INTERNAL "")
set(CMAKE_CXX_COMPILER_WRAPPER "")
set(CMAKE_CXX_STANDARD_COMPUTED_DEFAULT "17")
set(CMAKE_CXX_EXTENSIONS_COMPUTED_DEFAULT "ON")
set(CMAKE_CXX_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters;cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates;cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates;cxx_std_17;cxx_std_20;cxx_std_23")
set(CMAKE_CXX98_COMPILE_FEATURES "cxx_std_98;cxx_template_template_parameters")
set(CMAKE_CXX11_COMPILE_FEATURES "cxx_std_11;cxx_alias_templates;cxx_alignas;cxx_alignof;cxx_attributes;cxx_auto_type;cxx_constexpr;cxx_decltype;cxx_decltype_incomplete_return_types;cxx_default_function_template_args;cxx_defaulted_functions;cxx_defaulted_move_initializers;cxx_delegating_constructors;cxx_deleted_functions;cxx_enum_forward_declarations;cxx_explicit_conversions;cxx_extended_friend_declarations;cxx_extern_templates;cxx_final;cxx_func_identifier;cxx_generalized_initializers;cxx_inheriting_constructors;cxx_inline_namespaces;cxx_lambdas;cxx_local_type_template_args;cxx_long_long_type;cxx_noexcept;cxx_nonstatic_member_init;cxx_nullptr;cxx_override;cxx_range_for;cxx_raw_string_literals;cxx_reference_qualified_functions;cxx_right_angle_brackets;cxx_rvalue_references;cxx_sizeof_member;cxx_static_assert;cxx_strong_enums;cxx_thread_local;cxx_trailing_return_types;cxx_unicode_literals;cxx_uniform_initialization;cxx_unrestricted_unions;cxx_user_literals;cxx_variadic_macros;cxx_variadic_templates")
set(CMAKE_CXX14_COMPILE_FEATURES "cxx_std_14;cxx_aggregate_default_initializers;cxx_attribute_deprecated;cxx_binary_literals;cxx_contextual_conversions;cxx_decltype_auto;cxx_digit_separators;cxx_generic_lambdas;cxx_lambda_init_captures;cxx_relaxed_constexpr;cxx_return_type_deduction;cxx_variable_templates")
set(CMAKE_CXX17_COMPILE_FEATURES "cxx_std_17")
set(CMAKE_CXX20_COMPILE_FEATURES "cxx_std_20")
set(CMAKE_CXX23_COMPILE_FEATURES "cxx_std_23")

set(CMAKE_CXX_PLATFORM_ID "Linux")
set(CMAKE_CXX_SIMULATE_ID "")
set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT "GNU")
set(CMAKE_CXX_SIMULATE_VERSION "")




set(CMAKE_AR "/usr/bin/ar")
set(CMAKE_CXX_COMPILER_AR "/usr/bin/gcc-ar")
set(CMAKE_RANLIB "/usr/bin/ranlib")
set(CMAKE_CXX_COMPILER_RANLIB "/usr/bin/gcc-ranlib")
set(CMAKE_LINKER "/usr/bin/ld")
set(CMAKE_LINKER_LINK "")
set(CMAKE_LINKER_LLD "")
set(CMAKE_CXX_COMPILER_LINKER "/usr/bin/ld")
set(CMAKE_CXX_COMPILER_LINKER_ID "GNU")
set(CMAKE_CXX_COMPILER_LINKER_VERSION 2.40)
set(CMAKE_CXX_COMPILER_LINKER_FRONTEND_VARIANT GNU)
set(CMAKE_MT "")
set(CMAKE_TAPI "CMAKE_TAPI-NOTFOUND")
set(CMAKE_COMPILER_IS_GNUCXX 1)
set(CMAKE_CXX_COMPILER_LOADED 1)
set(CMAKE_CXX_COMPILER_WORKS TRUE)
set(CMAKE_CXX_ABI_COMPILED TRUE)

set(CMAKE_CXX_COMPILER_ENV_VAR "CXX")

set(CMAKE_CXX_COMPILER_ID_RUN 1)
set(CMAKE_CXX_SOURCE_FILE_EXTENSIONS C;M;c++;cc;cpp;cxx;m;mm;mpp;CPP;ixx;cppm;ccm;cxxm;c++m)
set(CMAKE_CXX_IGNORE_EXTENSIONS inl;h;hpp;HPP;H;o;O;obj;OBJ;def;DEF;rc;RC)

foreach (lang IN ITEMS C OBJC OBJCXX)
if (CMAKE_${lang}_COMPILER_ID_RUN)
foreach(extension IN LISTS CMAKE_${lang}_SOURCE_FILE_EXTENSIONS)
list(REMOVE_ITEM CMAKE_CXX_SOURCE_FILE_EXTENSIONS ${extension})
endforeach()
endif()
endforeach()

set(CMAKE_CXX_LINKER_PREFERENCE 30)
set(CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES 1)
set(CMAKE_CXX_LINKER_DEPFILE_SUPPORTED FALSE)

# Save compiler ABI information.
set(CMAKE_CXX_SIZEOF_DATA_PTR "8")
set(CMAKE_CXX_COMPILER_ABI "ELF")
set(CMAKE_CXX_BYTE_ORDER "LITTLE_ENDIAN")
set(CMAKE_CXX_LIBRARY_ARCHITECTURE "")

if(CMAKE_CXX_SIZEOF_DATA_PTR)
set(CMAKE_SIZEOF_VOID_P "${CMAKE_CXX_SIZEOF_DATA_PTR}")
endif()

if(CMAKE_CXX_COMPILER_ABI)
set(CMAKE_INTERNAL_PLATFORM_ABI "${CMAKE_CXX_COMPILER_ABI}")
endif()

if(CMAKE_CXX_LIBRARY_ARCHITECTURE)
set(CMAKE_LIBRARY_ARCHITECTURE "")
endif()

set(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX "")
if(CMAKE_CXX_CL_SHOWINCLUDES_PREFIX)
set(CMAKE_CL_SHOWINCLUDES_PREFIX "${CMAKE_CXX_CL_SHOWINCLUDES_PREFIX}")
endif()





set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "/usr/include/c++/13;/usr/include/c++/13/x86_64-redhat-linux;/usr/include/c++/13/backward;/usr/lib/gcc/x86_64-redhat-linux/13/include;/usr/local/include;/usr/include")
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "stdc++;m;gcc_s;gcc;c;gcc_s;gcc")
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib/gcc/x86_64-redhat-linux/13;/usr/lib64;/lib64;/usr/lib")
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "")
set(CMAKE_CXX_COMPILER_CLANG_RESOURCE_DIR "")
Binary file not shown.
15 changes: 15 additions & 0 deletions Bolt_Dash/CMakeFiles/3.29.2/CMakeSystem.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
set(CMAKE_HOST_SYSTEM "Linux-6.8.4-200.fc39.x86_64")
set(CMAKE_HOST_SYSTEM_NAME "Linux")
set(CMAKE_HOST_SYSTEM_VERSION "6.8.4-200.fc39.x86_64")
set(CMAKE_HOST_SYSTEM_PROCESSOR "x86_64")



set(CMAKE_SYSTEM "Linux-6.8.4-200.fc39.x86_64")
set(CMAKE_SYSTEM_NAME "Linux")
set(CMAKE_SYSTEM_VERSION "6.8.4-200.fc39.x86_64")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")

set(CMAKE_CROSSCOMPILING "FALSE")

set(CMAKE_SYSTEM_LOADED 1)
Loading