From 79f7efeaf91b2995a7c8bc89858fcbaee6d412a5 Mon Sep 17 00:00:00 2001 From: CommanderRedYT Date: Tue, 8 Feb 2022 10:59:47 +0100 Subject: [PATCH] Fixed some software bugs (#258) --- config_comred.cmake | 2 +- config_greyhash.cmake | 2 +- config_mick.cmake | 2 +- config_peter.cmake | 2 +- config_seatbot.cmake | 2 +- ignore.tar.gz.gpg | Bin 1372 -> 1538 bytes main/can.cpp | 14 ++++++++++---- main/can.h | 1 - main/displays/lockscreen.cpp | 1 - main/globals.cpp | 4 ++++ main/globals.h | 1 + 11 files changed, 20 insertions(+), 11 deletions(-) diff --git a/config_comred.cmake b/config_comred.cmake index ecb6c75..f88ed80 100644 --- a/config_comred.cmake +++ b/config_comred.cmake @@ -81,5 +81,5 @@ set(BOBBYCAR_BUILDFLAGS if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") - message(WARNING "Including lockscreen_plugin") + message(WARNING "Including plugins") endif() diff --git a/config_greyhash.cmake b/config_greyhash.cmake index 9e70a30..22b9627 100644 --- a/config_greyhash.cmake +++ b/config_greyhash.cmake @@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") - message(WARNING "Including lockscreen_plugin") + message(WARNING "Including plugins") endif() diff --git a/config_mick.cmake b/config_mick.cmake index 0d3578b..fba536b 100644 --- a/config_mick.cmake +++ b/config_mick.cmake @@ -74,5 +74,5 @@ set(BOBBYCAR_BUILDFLAGS if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") - message(WARNING "Including lockscreen_plugin") + message(WARNING "Including plugins") endif() diff --git a/config_peter.cmake b/config_peter.cmake index e5b4e65..beff0e5 100644 --- a/config_peter.cmake +++ b/config_peter.cmake @@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") - message(WARNING "Including lockscreen_plugin") + message(WARNING "Including plugins") endif() diff --git a/config_seatbot.cmake b/config_seatbot.cmake index e4e47e0..b16f286 100644 --- a/config_seatbot.cmake +++ b/config_seatbot.cmake @@ -79,5 +79,5 @@ set(BOBBYCAR_BUILDFLAGS #if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") # include("${CMAKE_CURRENT_SOURCE_DIR}/ignore/lockscreen_plugin.cmake") -# message(WARNING "Including lockscreen_plugin") +# message(WARNING "Including plugins") #endif() diff --git a/ignore.tar.gz.gpg b/ignore.tar.gz.gpg index efe3e5f168dc992fba602555609fbc4d3c913f42..55ca9aa87e0a8587eee442e9391dd17d40f63588 100644 GIT binary patch literal 1538 zcmeC-WnpJ#YR)ZBJR1-Z|NGKW14hjvvrV$LYi1qa+G2RGMEKyf0tTB|r=M)U{ zelt#AH~ZEq>;K1ROga1e2)FmX>j%Cb>AE@JA%23J=^h@IW2<|&s=R-=ddK6Q)bfKY zcFQfF$~xw=$km^mZ^QHan&G!KtE3t_ou4RuIGwlPg7S*l-;)FC1pB$rQ?O#W{&i|Zyj~HoS!Q`_|Dz@;K8*2V2 zUvx`bY4m<}TD?+Jg4|v)+a@2M9+UO+gRTb7T(zs_=tHiJlQ#Q>a%fzk;`i7p5`sKCwtE zSk2V>eXHM|TYI#h-qU%zuJ^IqJ*~fwRK-lzZx^(07X7!roPFWWg1JK8M+z^_j=1yv zz*JV7d-C%PRGGZL9h6kHS?PJmT|lVReu`P}elC5# zQjgtFZh71~R+<@pz-#fxt?XuhbP|j{TW96|EW5B^PKUyWGp`uF*Umdx_Uf)3yR-{? zaY4jafA9L%(;WhhmySJKFT*DdOi@=UsBva^9%; z_Ws?Vhu$5nTex$3E*$<9uJnnZzpG_-d zw(==1pFMSNn9c3Ac9wPg`xf)hi_tl-RPbk2+8M2k3w+E*vH6Vxdjfv!@)JMUxWjO% z=v}6QAn}h1U#*ST*I&|-;k8XnJ3S-w#F6jkdg84jbV{07Eb~MqJTm_GB|ol>?4P#t z)H(ZA8#PwF4+&b5k#D%r?eXls^`ACOoWZ~Lr+36$&b&8XO1=W20Vf^r`nq)L9zU=m zQT1T@{g1&b_q!^`87}z|*_$?D$&;whWd;@+50^<+EOK;Q-Pi1pKXcRb{FPM)RE+PZms*Xt1glFZDtr<%Aaz5*&H^m*Sx2gIin+&uglnQw|l=y_x&&% zy~#HhoYS)5-xtH=x9f0s#@qzqIpqfbW<1Q@a0)uKhQSKRZ!yN%haa{sGlt Q1}9h5t7g6E+vCd#099f6Bme*a literal 1372 zcmeC-WnpJ#@(lkS9LlO~^XJl$E=I$G)H5=Y-=F8%|4?A$El}UIcdztk--RnrO~2H0 zpY^r;DV7tp7kx5wXI)s6H>qlFq;lro3;dVAu2YE&m6KRo$Em73H`w>*H-ovqRX<+& zd*;>eytB$~KU=SU+WO%1Y>!#0y^mXKa{HD~5`VW(_;2KlsF|-0e-qe0(QT>j3|3X= z-??@o4NrSA{3GhG7K;j3|4`Ig7GuRY=kB&`J#I5gHh4Ql=^SmJ=KeD!(l-isAWYiIDNIk>hDiO zJxOb$>+ISUW`bdov3ocCNI3$aCb{@tZz2t2Hbh z^{c$Rrp&cUg>k=e^De2+_tg4S4q5N=J$frWdqT(Eb18TKIOtA@HV(h0pW&ELZ9OSu zU%G;(z|E^#5@i#OS1CPOXIuU<`mAD=>j`^vY=aMdc^nKg#hxyrAtBbd56OSnU zN^3rD9l-fR&vvS|{-LbCREyWU1S%yTd%eDxw`s$6-Eg1wZGFj;HtJf0-g=!F_I}wW zZi#g6o%@AvWv2Xa|7z}EIKwg{)}_>;?R9q1qhiYf&d+S-diRd4w?439eb>ov(Tms; z%AbW^PSTtCD9(E4_L&~1-?;>Q{`6g-Yxb=R5ld$K38e41#Js*$<;|W?8?=tr^gdSG zdthJC8mqg@esC5{y~{N*PdD6GAc{3LzC}!MidTkpS$MzE*?hfk-&#smKFl+| zv+urt!)7mzL+AR0ZaZzBwfwPi!OTN7(RYo!CP{oLy)B$2dvQ`5!@}K~%{#a*@O%&L zh$*|*-F_ybe3HSGrJMD;85EKtS@`#Et15wqlEJ5PQP z*E^iZ8MUUt=t|K9z8g^*LrRm)7EV(yfdv*!^7Lz;`VUy_=GBL zm71|zf3N(V^_JBKr>+0*xMG_k_r^EDpO>sY{!Mjx$7-cBTm3k^Uas5r;L&wSld^gZ zh47bte5)Vnm_E&8TQ)Q6VVnFZ@0p?QUONBW7^nPxnC;;vH9cSHxr&z=W3#tm^8LlE wn-*+bTYt4!B6`1|Wzg*RO`jRFSZg;e3C&}BX_N7K)vTgvibrO5{`$ua0CGs6RsaA1 diff --git a/main/can.cpp b/main/can.cpp index 788ee21..87401ce 100644 --- a/main/can.cpp +++ b/main/can.cpp @@ -373,12 +373,18 @@ void sendCanCommands() if (back) send(MotorController::Command::Enable, back->command.right.enable); break; case 1: +#ifdef HAS_SIMPLIFIED + SIMPLIFIED_CONTROLTYPE +#endif if (front) send(MotorController::Command::CtrlTyp, front->command.left.ctrlTyp); if (front) send(MotorController::Command::CtrlTyp, front->command.right.ctrlTyp); if (back) send(MotorController::Command::CtrlTyp, back->command.left.ctrlTyp); if (back) send(MotorController::Command::CtrlTyp, back->command.right.ctrlTyp); break; case 2: +#ifdef HAS_SIMPLIFIED + SIMPLIFIED_CONTROLMODE +#endif if (front) send(MotorController::Command::CtrlMod, front->command.left.ctrlMod); if (front) send(MotorController::Command::CtrlMod, front->command.right.ctrlMod); if (back) send(MotorController::Command::CtrlMod, back->command.left.ctrlMod); @@ -386,7 +392,7 @@ void sendCanCommands() handbremse::finishedMotorUpdate = true; break; case 3: -#if defined(HAS_SIMPLIFIED) +#ifdef HAS_SIMPLIFIED SIMPLIFIED_IMOTMAX #endif if (front) send(MotorController::Command::IMotMax, front->command.left.iMotMax); @@ -395,7 +401,7 @@ void sendCanCommands() if (back) send(MotorController::Command::IMotMax, back->command.right.iMotMax); break; case 4: -#if defined(HAS_SIMPLIFIED) +#ifdef HAS_SIMPLIFIED SIMPLIFIED_IDCMAX #endif if (front) send(MotorController::Command::IDcMax, front->command.left.iDcMax); @@ -404,7 +410,7 @@ void sendCanCommands() if (back) send(MotorController::Command::IDcMax, back->command.right.iDcMax); break; case 5: -#if defined(HAS_SIMPLIFIED) +#ifdef HAS_SIMPLIFIED SIMPLIFIED_NMOTMAX #endif if (front) send(MotorController::Command::NMotMax, front->command.left.nMotMax); @@ -413,7 +419,7 @@ void sendCanCommands() if (back) send(MotorController::Command::NMotMax, back->command.right.nMotMax); break; case 6: -#if defined(HAS_SIMPLIFIED) +#ifdef HAS_SIMPLIFIED SIMPLIFIED_FIELDWEAKMAX #endif if (front) send(MotorController::Command::FieldWeakMax, front->command.left.fieldWeakMax); diff --git a/main/can.h b/main/can.h index e501dc3..4b23b03 100644 --- a/main/can.h +++ b/main/can.h @@ -9,7 +9,6 @@ #include #ifdef CAN_PLUGIN -#pragma message "Activating Can Plugin" #include CAN_PLUGIN #endif diff --git a/main/displays/lockscreen.cpp b/main/displays/lockscreen.cpp index 8fff86e..333e837 100644 --- a/main/displays/lockscreen.cpp +++ b/main/displays/lockscreen.cpp @@ -102,7 +102,6 @@ void Lockscreen::redraw() else espgui::switchScreen(); #ifdef LOCKSCREEN_PLUGIN -#pragma message "Activating Lockscreen Plugin" #include LOCKSCREEN_PLUGIN #endif return; diff --git a/main/globals.cpp b/main/globals.cpp index 58c2c15..e1d7f48 100644 --- a/main/globals.cpp +++ b/main/globals.cpp @@ -17,6 +17,10 @@ float avgSpeedKmh{}; float sumCurrent{}; bool isLocked{}; +#ifdef GLOBALS_SOURCE +GLOBALS_SOURCE +#endif + bool simplified = #if defined(HAS_SIMPLIFIED) true diff --git a/main/globals.h b/main/globals.h index 838373b..ab12846 100644 --- a/main/globals.h +++ b/main/globals.h @@ -47,6 +47,7 @@ extern bool isLocked; #ifdef GLOBALS_PLUGIN #include GLOBALS_PLUGIN +GLOBALS_HEADER #endif extern bool simplified;