diff --git a/.gitignore b/.gitignore index 1a75f42..51a806a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +Software/telemetry_system_transmitter/build +Software/telemetry_system_recorder/build Software/telemetry_system_recorder/build Software/telemetry_system_transmitter/build diff --git a/Miscellaneous/tests.xlsx b/Miscellaneous/tests.xlsx index a2a11af..adb9448 100644 Binary files a/Miscellaneous/tests.xlsx and b/Miscellaneous/tests.xlsx differ diff --git a/Report/Original project/diagrams/BlocDiagram.drawio b/Report/Original project/diagrams/BlocDiagram.drawio new file mode 100644 index 0000000..0a2d7a0 --- /dev/null +++ b/Report/Original project/diagrams/BlocDiagram.drawio @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/BlocDiagram2.png b/Report/Original project/diagrams/BlocDiagram2.png new file mode 100644 index 0000000..5f30fee Binary files /dev/null and b/Report/Original project/diagrams/BlocDiagram2.png differ diff --git a/Report/Original project/diagrams/bootSequence.drawio b/Report/Original project/diagrams/bootSequence.drawio new file mode 100644 index 0000000..c780502 --- /dev/null +++ b/Report/Original project/diagrams/bootSequence.drawio @@ -0,0 +1,306 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/canButtonSequence.drawio b/Report/Original project/diagrams/canButtonSequence.drawio new file mode 100644 index 0000000..ba9fa78 --- /dev/null +++ b/Report/Original project/diagrams/canButtonSequence.drawio @@ -0,0 +1,247 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/canDataSequence.drawio b/Report/Original project/diagrams/canDataSequence.drawio new file mode 100644 index 0000000..3963fdc --- /dev/null +++ b/Report/Original project/diagrams/canDataSequence.drawio @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/canGpsReceiveSequence.drawio b/Report/Original project/diagrams/canGpsReceiveSequence.drawio new file mode 100644 index 0000000..6b0f6f2 --- /dev/null +++ b/Report/Original project/diagrams/canGpsReceiveSequence.drawio @@ -0,0 +1,153 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/canGpsSendSequence.drawio b/Report/Original project/diagrams/canGpsSendSequence.drawio new file mode 100644 index 0000000..def50dd --- /dev/null +++ b/Report/Original project/diagrams/canGpsSendSequence.drawio @@ -0,0 +1,244 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/configReceiveActivity.drawio b/Report/Original project/diagrams/configReceiveActivity.drawio new file mode 100644 index 0000000..5cba4c2 --- /dev/null +++ b/Report/Original project/diagrams/configReceiveActivity.drawio @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/configSendActivity.drawio b/Report/Original project/diagrams/configSendActivity.drawio new file mode 100644 index 0000000..7deb0e5 --- /dev/null +++ b/Report/Original project/diagrams/configSendActivity.drawio @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/flowRecording.drawio b/Report/Original project/diagrams/flowRecording.drawio new file mode 100644 index 0000000..53f99f0 --- /dev/null +++ b/Report/Original project/diagrams/flowRecording.drawio @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/flowTransmitting.drawio b/Report/Original project/diagrams/flowTransmitting.drawio new file mode 100644 index 0000000..2ea6a7e --- /dev/null +++ b/Report/Original project/diagrams/flowTransmitting.drawio @@ -0,0 +1,240 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/gpsCanFrames.drawio b/Report/Original project/diagrams/gpsCanFrames.drawio new file mode 100644 index 0000000..c51b581 --- /dev/null +++ b/Report/Original project/diagrams/gpsCanFrames.drawio @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Report/Original project/diagrams/gpsTimeSequence.drawio b/Report/Original project/diagrams/gpsTimeSequence.drawio new file mode 100644 index 0000000..b3fd16c --- /dev/null +++ b/Report/Original project/diagrams/gpsTimeSequence.drawio @@ -0,0 +1,302 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/busmaster/BMS.def b/Software/busmaster/BMS.def index a3dc020..8c79b0e 100644 --- a/Software/busmaster/BMS.def +++ b/Software/busmaster/BMS.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_bmsSend_100 \ No newline at end of file +OnTimer_bmsSend_5 \ No newline at end of file diff --git a/Software/busmaster/CarSimulator.cfx b/Software/busmaster/CarSimulator.cfx index 71e7c43..1284501 100644 --- a/Software/busmaster/CarSimulator.cfx +++ b/Software/busmaster/CarSimulator.cfx @@ -329,9 +329,9 @@ SHOWNORMAL RESTORETOMAXIMIZED - 173 + 179 10 - 451 + 457 359 @@ -429,9 +429,9 @@ SHOWNORMAL RESTORETOMAXIMIZED - 173 + 179 10 - 451 + 457 359 @@ -514,9 +514,9 @@ SHOWNORMAL RESTORETOMAXIMIZED - 173 + 179 10 - 451 + 457 359 @@ -524,10 +524,10 @@ SHOWNORMAL SETMINPOSITION - 173 - 903 - 828 - 1763 + 72 + 1047 + 727 + 1907 diff --git a/Software/busmaster/INVERTER.def b/Software/busmaster/INVERTER.def index 98ba087..405cc49 100644 --- a/Software/busmaster/INVERTER.def +++ b/Software/busmaster/INVERTER.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_inverterTmr_100 \ No newline at end of file +OnTimer_inverterTmr_5 \ No newline at end of file diff --git a/Software/busmaster/LVS.def b/Software/busmaster/LVS.def index 21cb12e..c9fe708 100644 --- a/Software/busmaster/LVS.def +++ b/Software/busmaster/LVS.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_lvsTmr_100 \ No newline at end of file +OnTimer_lvsTmr_5 \ No newline at end of file diff --git a/Software/busmaster/MISC.def b/Software/busmaster/MISC.def index 00d7d5c..6816179 100644 --- a/Software/busmaster/MISC.def +++ b/Software/busmaster/MISC.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_miscTmr_100 \ No newline at end of file +OnTimer_miscTmr_5 \ No newline at end of file diff --git a/Software/busmaster/MOTOR.def b/Software/busmaster/MOTOR.def index 31d6035..c45594a 100644 --- a/Software/busmaster/MOTOR.def +++ b/Software/busmaster/MOTOR.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_motorTmr_20 \ No newline at end of file +OnTimer_motorTmr_5 \ No newline at end of file diff --git a/Software/busmaster/SPEEDTEST.def b/Software/busmaster/SPEEDTEST.def index 5b61592..55fce91 100644 --- a/Software/busmaster/SPEEDTEST.def +++ b/Software/busmaster/SPEEDTEST.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_speedtestTmr_5 \ No newline at end of file +OnTimer_speedtestTmr_1 \ No newline at end of file diff --git a/Software/busmaster/SUSPENSION.def b/Software/busmaster/SUSPENSION.def index ec54a04..db7f7a3 100644 --- a/Software/busmaster/SUSPENSION.def +++ b/Software/busmaster/SUSPENSION.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_suspensionTmr_10 \ No newline at end of file +OnTimer_suspensionTmr_5 \ No newline at end of file diff --git a/Software/busmaster/TIRE.def b/Software/busmaster/TIRE.def index 53e044d..e9283e8 100644 --- a/Software/busmaster/TIRE.def +++ b/Software/busmaster/TIRE.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_tireSend_100 \ No newline at end of file +OnTimer_tireSend_5 \ No newline at end of file diff --git a/Software/busmaster/TORK.def b/Software/busmaster/TORK.def index dfc1036..36b434c 100644 --- a/Software/busmaster/TORK.def +++ b/Software/busmaster/TORK.def @@ -19,4 +19,4 @@ vSetGetMessageName vSetTimeNow vSetGetFirstCANdbName -OnTimer_torkTmr_10 \ No newline at end of file +OnTimer_torkTmr_5 \ No newline at end of file diff --git a/Software/busmaster/bms.cpp b/Software/busmaster/bms.cpp index 1d9831e..6fdf0fd 100644 --- a/Software/busmaster/bms.cpp +++ b/Software/busmaster/bms.cpp @@ -18,15 +18,15 @@ int tempHVBat; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_bmsSend_100( ); +GCC_EXTERN void GCC_EXPORT OnTimer_bmsSend_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_bmsSend_100 */ -void OnTimer_bmsSend_100( ) +/* Start BUSMASTER generated function - OnTimer_bmsSend_5 */ +void OnTimer_bmsSend_5( ) { /* TODO */ voltageHVS= rand()%5 + 548; @@ -43,4 +43,4 @@ tx.data[5]=tempHVBat; tx.data[6]=0; tx.data[7]=0; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_bmsSend_100 */ +}/* End BUSMASTER generated function - OnTimer_bmsSend_5 */ diff --git a/Software/busmaster/bms.dll b/Software/busmaster/bms.dll index 34aa9b4..276f706 100644 Binary files a/Software/busmaster/bms.dll and b/Software/busmaster/bms.dll differ diff --git a/Software/busmaster/bms.o b/Software/busmaster/bms.o index 55c44a7..322b700 100644 Binary files a/Software/busmaster/bms.o and b/Software/busmaster/bms.o differ diff --git a/Software/busmaster/inverter.cpp b/Software/busmaster/inverter.cpp index da774ab..b3aaf95 100644 --- a/Software/busmaster/inverter.cpp +++ b/Software/busmaster/inverter.cpp @@ -19,15 +19,15 @@ int brake; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_inverterTmr_100( ); +GCC_EXTERN void GCC_EXPORT OnTimer_inverterTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_inverterTmr_100 */ -void OnTimer_inverterTmr_100( ) +/* Start BUSMASTER generated function - OnTimer_inverterTmr_5 */ +void OnTimer_inverterTmr_5( ) { /* TODO */ tempMot= rand()%5 + 80; @@ -53,4 +53,4 @@ tx.data[1]=brake; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_inverterTmr_100 */ +}/* End BUSMASTER generated function - OnTimer_inverterTmr_5 */ diff --git a/Software/busmaster/inverter.dll b/Software/busmaster/inverter.dll index 167c1c2..6088b2b 100644 Binary files a/Software/busmaster/inverter.dll and b/Software/busmaster/inverter.dll differ diff --git a/Software/busmaster/inverter.o b/Software/busmaster/inverter.o index 4a9464d..e84e6fc 100644 Binary files a/Software/busmaster/inverter.o and b/Software/busmaster/inverter.o differ diff --git a/Software/busmaster/lvs.cpp b/Software/busmaster/lvs.cpp index 2ea9023..a59f604 100644 --- a/Software/busmaster/lvs.cpp +++ b/Software/busmaster/lvs.cpp @@ -17,15 +17,15 @@ int tempCoolSys; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_lvsTmr_100( ); +GCC_EXTERN void GCC_EXPORT OnTimer_lvsTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_lvsTmr_100 */ -void OnTimer_lvsTmr_100( ) +/* Start BUSMASTER generated function - OnTimer_lvsTmr_5 */ +void OnTimer_lvsTmr_5( ) { /* TODO */ tempLVBat= rand()%5 + 50; @@ -41,4 +41,4 @@ tx.data[5]=0; tx.data[6]=0; tx.data[7]=0; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_lvsTmr_100 */ +}/* End BUSMASTER generated function - OnTimer_lvsTmr_5 */ diff --git a/Software/busmaster/lvs.dll b/Software/busmaster/lvs.dll index b329d94..d3171b9 100644 Binary files a/Software/busmaster/lvs.dll and b/Software/busmaster/lvs.dll differ diff --git a/Software/busmaster/lvs.o b/Software/busmaster/lvs.o index d1e51c5..3fd42b3 100644 Binary files a/Software/busmaster/lvs.o and b/Software/busmaster/lvs.o differ diff --git a/Software/busmaster/misc.cpp b/Software/busmaster/misc.cpp index a334e43..ab0a5bd 100644 --- a/Software/busmaster/misc.cpp +++ b/Software/busmaster/misc.cpp @@ -17,15 +17,15 @@ int inertial; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_miscTmr_100( ); +GCC_EXTERN void GCC_EXPORT OnTimer_miscTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_miscTmr_100 */ -void OnTimer_miscTmr_100( ) +/* Start BUSMASTER generated function - OnTimer_miscTmr_5 */ +void OnTimer_miscTmr_5( ) { /* TODO */ steering= rand()%5 + 30; @@ -42,4 +42,4 @@ tx.data[5]=0; tx.data[6]=0; tx.data[7]=0; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_miscTmr_100 */ +}/* End BUSMASTER generated function - OnTimer_miscTmr_5 */ diff --git a/Software/busmaster/misc.dll b/Software/busmaster/misc.dll index 20ca2a3..f698a92 100644 Binary files a/Software/busmaster/misc.dll and b/Software/busmaster/misc.dll differ diff --git a/Software/busmaster/misc.o b/Software/busmaster/misc.o index a33ad95..d041d63 100644 Binary files a/Software/busmaster/misc.o and b/Software/busmaster/misc.o differ diff --git a/Software/busmaster/motor.cpp b/Software/busmaster/motor.cpp index 301b2e9..5a1c904 100644 --- a/Software/busmaster/motor.cpp +++ b/Software/busmaster/motor.cpp @@ -18,15 +18,15 @@ int carSpeed; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_motorTmr_20( ); +GCC_EXTERN void GCC_EXPORT OnTimer_motorTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_motorTmr_20 */ -void OnTimer_motorTmr_20( ) +/* Start BUSMASTER generated function - OnTimer_motorTmr_5 */ +void OnTimer_motorTmr_5( ) { /* TODO */ power= rand()%5000 + 55000; @@ -43,4 +43,4 @@ void OnTimer_motorTmr_20( ) tx.data[6]=0; tx.data[7]=0; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_motorTmr_20 */ +}/* End BUSMASTER generated function - OnTimer_motorTmr_5 */ diff --git a/Software/busmaster/motor.dll b/Software/busmaster/motor.dll index 8201ee4..edd1829 100644 Binary files a/Software/busmaster/motor.dll and b/Software/busmaster/motor.dll differ diff --git a/Software/busmaster/motor.o b/Software/busmaster/motor.o index 1a5d2aa..b7174b2 100644 Binary files a/Software/busmaster/motor.o and b/Software/busmaster/motor.o differ diff --git a/Software/busmaster/speedtest.cpp b/Software/busmaster/speedtest.cpp index 4c515cb..73b97c5 100644 --- a/Software/busmaster/speedtest.cpp +++ b/Software/busmaster/speedtest.cpp @@ -18,15 +18,15 @@ int tempHVBat; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_speedtestTmr_5( ); +GCC_EXTERN void GCC_EXPORT OnTimer_speedtestTmr_1( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_speedtestTmr_5 */ -void OnTimer_speedtestTmr_5( ) +/* Start BUSMASTER generated function - OnTimer_speedtestTmr_1 */ +void OnTimer_speedtestTmr_1( ) { /* TODO */ voltageHVS= rand()%5 + 548; @@ -58,19 +58,4 @@ tx.data[5]=tempHVBat; tx.data[6]=0; tx.data[7]=0; SendMsg(tx); - -voltageHVS= rand()%5 + 548; -currentHVS= rand()%5 + 80; -tempHVBat= rand()%5 + 50; -tx.id=0x114; -tx.dlc=8; -tx.data[0]=voltageHVS >> 8; -tx.data[1]=voltageHVS; -tx.data[2]=currentHVS >> 8; -tx.data[3]=currentHVS; -tx.data[4]=tempHVBat >> 8; -tx.data[5]=tempHVBat; -tx.data[6]=0; -tx.data[7]=0; -SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_speedtestTmr_5 */ +}/* End BUSMASTER generated function - OnTimer_speedtestTmr_1 */ diff --git a/Software/busmaster/speedtest.dll b/Software/busmaster/speedtest.dll index 81c7aee..22ee974 100644 Binary files a/Software/busmaster/speedtest.dll and b/Software/busmaster/speedtest.dll differ diff --git a/Software/busmaster/speedtest.o b/Software/busmaster/speedtest.o index 1f630c5..156d97d 100644 Binary files a/Software/busmaster/speedtest.o and b/Software/busmaster/speedtest.o differ diff --git a/Software/busmaster/suspension.cpp b/Software/busmaster/suspension.cpp index e704f94..cf9c0d7 100644 --- a/Software/busmaster/suspension.cpp +++ b/Software/busmaster/suspension.cpp @@ -19,15 +19,15 @@ int suspBR; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_suspensionTmr_10( ); +GCC_EXTERN void GCC_EXPORT OnTimer_suspensionTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_suspensionTmr_10 */ -void OnTimer_suspensionTmr_10( ) +/* Start BUSMASTER generated function - OnTimer_suspensionTmr_5 */ +void OnTimer_suspensionTmr_5( ) { /* TODO */ @@ -47,4 +47,4 @@ void OnTimer_suspensionTmr_10( ) tx.data[6]=suspBR >> 8; tx.data[7]=suspBR; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_suspensionTmr_10 */ +}/* End BUSMASTER generated function - OnTimer_suspensionTmr_5 */ diff --git a/Software/busmaster/suspension.dll b/Software/busmaster/suspension.dll index c4f8927..58d1d77 100644 Binary files a/Software/busmaster/suspension.dll and b/Software/busmaster/suspension.dll differ diff --git a/Software/busmaster/suspension.o b/Software/busmaster/suspension.o index d96181e..8855d26 100644 Binary files a/Software/busmaster/suspension.o and b/Software/busmaster/suspension.o differ diff --git a/Software/busmaster/tire.cpp b/Software/busmaster/tire.cpp index 70353e8..1b89c75 100644 --- a/Software/busmaster/tire.cpp +++ b/Software/busmaster/tire.cpp @@ -24,15 +24,15 @@ int pressBR; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_tireSend_100( ); +GCC_EXTERN void GCC_EXPORT OnTimer_tireSend_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_tireSend_100 */ -void OnTimer_tireSend_100( ) +/* Start BUSMASTER generated function - OnTimer_tireSend_5 */ +void OnTimer_tireSend_5( ) { /* TODO */ tempFL= rand()%5 + 90; @@ -78,4 +78,4 @@ SendMsg(tx); SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_tireSend_100 */ +}/* End BUSMASTER generated function - OnTimer_tireSend_5 */ diff --git a/Software/busmaster/tire.dll b/Software/busmaster/tire.dll index a7afb66..20f4632 100644 Binary files a/Software/busmaster/tire.dll and b/Software/busmaster/tire.dll differ diff --git a/Software/busmaster/tire.o b/Software/busmaster/tire.o index 533ad3b..ee7d48e 100644 Binary files a/Software/busmaster/tire.o and b/Software/busmaster/tire.o differ diff --git a/Software/busmaster/tork.cpp b/Software/busmaster/tork.cpp index 11bc399..7042ace 100644 --- a/Software/busmaster/tork.cpp +++ b/Software/busmaster/tork.cpp @@ -18,15 +18,15 @@ int torkMOT; /* Start BUSMASTER Function Prototype */ -GCC_EXTERN void GCC_EXPORT OnTimer_torkTmr_10( ); +GCC_EXTERN void GCC_EXPORT OnTimer_torkTmr_5( ); /* End BUSMASTER Function Prototype */ /* Start BUSMASTER Function Wrapper Prototype */ /* End BUSMASTER Function Wrapper Prototype */ -/* Start BUSMASTER generated function - OnTimer_torkTmr_10 */ -void OnTimer_torkTmr_10( ) +/* Start BUSMASTER generated function - OnTimer_torkTmr_5 */ +void OnTimer_torkTmr_5( ) { /* TODO */ torkBL= rand()%5 + 46; @@ -43,4 +43,4 @@ tx.data[5]=torkMOT; tx.data[6]=0; tx.data[7]=0; SendMsg(tx); -}/* End BUSMASTER generated function - OnTimer_torkTmr_10 */ +}/* End BUSMASTER generated function - OnTimer_torkTmr_5 */ diff --git a/Software/busmaster/tork.dll b/Software/busmaster/tork.dll index 2167957..4456439 100644 Binary files a/Software/busmaster/tork.dll and b/Software/busmaster/tork.dll differ diff --git a/Software/busmaster/tork.o b/Software/busmaster/tork.o index 9a5aa2a..b82dab2 100644 Binary files a/Software/busmaster/tork.o and b/Software/busmaster/tork.o differ