-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
User/dillonsd/AuxBmsWorks #193
Open
VioletLiGonzales
wants to merge
77
commits into
master
Choose a base branch
from
user/Dillonsd/AuxBMSTesting
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
77 commits
Select commit
Hold shift + click to select a range
7847df8
SFT-121 Generating code for aux bms v2
badeniran e1bbfa4
SFT 167. Defined and initialized variables
badeniran 5095c64
Merge pull request #164 from UCSolarCarTeam/user/embedded/SFT-167-Def…
badeniran 837f399
SFT-175. Contactor control code and unit tests.
badeniran 20cdd23
Merge pull request #168 from UCSolarCarTeam/user/embedded/SFT-175-Cre…
badeniran 1e807d8
SFT-189 CAN Interrupt and Filter Config
badeniran fd03b21
Merge pull request #169 from UCSolarCarTeam/user/embedded/SFT-189-Do-…
badeniran be0972a
Implemeted Read Aux Voltage Task
badeniran cc10aaa
SFT-190. Create functions and unit tests for orion work.
badeniran fd3a335
Merge pull request #175 from UCSolarCarTeam/user/embedded/SFT-190-cre…
badeniran b1473fa
SFT 200. Creating tasks relating to CAN Tx work.
badeniran 3add054
Merge branch 'feature/aux-bms-rearchitecture' into user/embedded/SFT-…
badeniran e1df3c1
Merge pull request #177 from UCSolarCarTeam/user/embedded/SFT-200-Cre…
badeniran e5b4e3a
Merge branch 'feature/aux-bms-rearchitecture' of https://github.com/U…
badeniran 24f746d
Finished dev work. Need to do unit tests
badeniran 4e8ffcc
SFT 202. Functions and tests for aux voltage read.
badeniran a79efd9
Merge pull request #178 from UCSolarCarTeam/user/embedded/SFT-202-Cre…
badeniran 22b52da
Adding unit tests
badeniran 3ddc09c
Merge pull request #179 from UCSolarCarTeam/user/embedded/SFT-202-Cre…
badeniran 1487dbb
SFT 203. Implementing error handling
badeniran e34e603
Merge pull request #181 from UCSolarCarTeam/user/embedded/SFT-203/imp…
badeniran 8469703
SFT 204. Implemented memory debug task
badeniran c4cf94f
Merge pull request #182 from UCSolarCarTeam/user/embedded/SFT-204/imp…
badeniran 1ce5656
Removed magic numbers. Added unit tests to travis.
badeniran 2a5fa76
Changing travis for auxbmsv2
badeniran ac31247
Changed travis back. Trying using our own round function
badeniran c01fa81
made round function comment clearer
badeniran b3e8388
Merge pull request #184 from UCSolarCarTeam/user/badeniran/aux-bms-cl…
badeniran b03ae6f
Initial fixes done. At a stable state
badeniran f8297c1
Pushed up to OrionInterfaceTaskTest. Need to generate mocks for Trip.c
badeniran 1bda236
remocked trip.c, fix Trip and OrionInterface tests
JessieG123 129f555
created test for updateAuxTrip
JessieG123 005e8ff
Fix TripTest.c
duan-le 4c79f8b
Add two more tests for updateAuxTrip
duan-le c285b92
Fix unneccessary way of calling checkProtectionTrip
duan-le ebd6589
Run remaining tests
duan-le 3fe947c
Split tripDuetoHighTempAndCurrent into two variables
duan-le 6b59276
Removing checkProtectionTrip()
duan-le 4aeea47
Simplify checkDischargeTrip and checkChargeTrip
duan-le af152c3
add mocks for trip
JessieG123 cd74684
Redoing OrionInterfaceTest
duan-le 6e3c5a7
Add shouldDisconnectContactors test
duan-le fac559f
Initial fixes done. At a stable state
badeniran 06c8b73
Pushed up to OrionInterfaceTaskTest. Need to generate mocks for Trip.c
badeniran da4ffd0
remocked trip.c, fix Trip and OrionInterface tests
JessieG123 d9c53db
created test for updateAuxTrip
JessieG123 91412c6
Fix TripTest.c
duan-le cd549f2
Add two more tests for updateAuxTrip
duan-le cb0ac31
Fix unneccessary way of calling checkProtectionTrip
duan-le 083cb37
Run remaining tests
duan-le ec21b70
Split tripDuetoHighTempAndCurrent into two variables
duan-le 74d4ead
Removing checkProtectionTrip()
duan-le d6fb466
Simplify checkDischargeTrip and checkChargeTrip
duan-le e3d966f
add mocks for trip
JessieG123 813bdda
Redoing OrionInterfaceTest
duan-le 64cc882
Add shouldDisconnectContactors test
duan-le 76dca24
Finish tests
duan-le 6e0db6b
Change to contactorControlEvenFlags to defined macros
duan-le 9a692dd
Merge branch 'feature/aux-bms-rearchitecture' into user/embedded/pull…
duan-le 7170db6
Merge pull request #188 from UCSolarCarTeam/user/embedded/pull-reques…
duan-le 66a2a8c
commented line 374-378 in main.c
JessieG123 4162182
Trying SPI global IRQ disabled
4092baa
Migrating to STM 6.4.0 from 6.0.0
96fcd62
debug changes
JessieG123 a3ac36d
debug changes
JessieG123 25a6694
in v2 we only get one adc value which we use for calculation but in t…
JessieG123 f907e5b
astyle and removing previous debug function in orionInterface
JessieG123 76bed0a
fixed can rx to receive all messages from orion before putting in the…
JessieG123 26d5560
Added tracealyzer capabilities to AuxBmsV2
VioletLiGonzales d1e792f
Increased Number of Tasks for tracealyzer
VioletLiGonzales eda7fd5
add function to get states of task
JessieG123 e666473
Merge branch 'user/Dillonsd/AuxBMSTesting' of github.com:UCSolarCarTe…
JessieG123 739d529
Fixed Delay problems, source of initial *prevWakeTime should be TaskT…
VioletLiGonzales 7f4f697
Fixed failing readAuxVoltage, changed from DMA SPI to regular SPI call
VioletLiGonzales 0f627fa
Updated Lights code to account for new AuxBMS can packet
VioletLiGonzales ab5a8e7
Updated DriverControls to account for new AuxBms can packet
VioletLiGonzales 3fa934f
Merge remote-tracking branch 'origin/master' into user/Dillonsd/AuxBM…
VioletLiGonzales File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
Binary file not shown.
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 |
---|---|---|
|
@@ -39,7 +39,7 @@ STM32L152-Discovery.elf.launch | |
*.tmp | ||
|
||
# Other | ||
.tags | ||
.tags* | ||
*swap | ||
.fuse* | ||
.vscode/ | ||
|
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
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 |
---|---|---|
@@ -0,0 +1,207 @@ | ||
/** | ||
***************************************************************************** | ||
** | ||
** File : syscalls.c | ||
** | ||
** Author : Auto-generated by System workbench for STM32 | ||
** | ||
** Abstract : System Workbench Minimal System calls file | ||
** | ||
** For more information about which c-functions | ||
** need which of these lowlevel functions | ||
** please consult the Newlib libc-manual | ||
** | ||
** Target : STMicroelectronics STM32 | ||
** | ||
** Distribution: The file is distributed “as is,” without any warranty | ||
** of any kind. | ||
** | ||
***************************************************************************** | ||
** @attention | ||
** | ||
** <h2><center>© COPYRIGHT(c) 2019 STMicroelectronics</center></h2> | ||
** | ||
** Redistribution and use in source and binary forms, with or without modification, | ||
** are permitted provided that the following conditions are met: | ||
** 1. Redistributions of source code must retain the above copyright notice, | ||
** this list of conditions and the following disclaimer. | ||
** 2. Redistributions in binary form must reproduce the above copyright notice, | ||
** this list of conditions and the following disclaimer in the documentation | ||
** and/or other materials provided with the distribution. | ||
** 3. Neither the name of STMicroelectronics nor the names of its contributors | ||
** may be used to endorse or promote products derived from this software | ||
** without specific prior written permission. | ||
** | ||
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
** | ||
***************************************************************************** | ||
*/ | ||
|
||
/* Includes */ | ||
#include <sys/stat.h> | ||
#include <stdlib.h> | ||
#include <errno.h> | ||
#include <stdio.h> | ||
#include <signal.h> | ||
#include <time.h> | ||
#include <sys/time.h> | ||
#include <sys/times.h> | ||
|
||
|
||
/* Variables */ | ||
//#undef errno | ||
extern int errno; | ||
extern int __io_putchar(int ch) __attribute__((weak)); | ||
extern int __io_getchar(void) __attribute__((weak)); | ||
|
||
register char * stack_ptr asm("sp"); | ||
|
||
char *__env[1] = { 0 }; | ||
char **environ = __env; | ||
|
||
|
||
/* Functions */ | ||
void initialise_monitor_handles() | ||
{ | ||
} | ||
|
||
int _getpid(void) | ||
{ | ||
return 1; | ||
} | ||
|
||
int _kill(int pid, int sig) | ||
{ | ||
errno = EINVAL; | ||
return -1; | ||
} | ||
|
||
void _exit (int status) | ||
{ | ||
_kill(status, -1); | ||
while (1) {} /* Make sure we hang here */ | ||
} | ||
|
||
__attribute__((weak)) int _read(int file, char *ptr, int len) | ||
{ | ||
int DataIdx; | ||
|
||
for (DataIdx = 0; DataIdx < len; DataIdx++) | ||
{ | ||
*ptr++ = __io_getchar(); | ||
} | ||
|
||
return len; | ||
} | ||
|
||
__attribute__((weak)) int _write(int file, char *ptr, int len) | ||
{ | ||
int DataIdx; | ||
|
||
for (DataIdx = 0; DataIdx < len; DataIdx++) | ||
{ | ||
__io_putchar(*ptr++); | ||
} | ||
return len; | ||
} | ||
|
||
caddr_t _sbrk(int incr) | ||
{ | ||
extern char end asm("end"); | ||
static char *heap_end; | ||
char *prev_heap_end; | ||
|
||
if (heap_end == 0) | ||
heap_end = &end; | ||
|
||
prev_heap_end = heap_end; | ||
if (heap_end + incr > stack_ptr) | ||
{ | ||
// write(1, "Heap and stack collision\n", 25); | ||
// abort(); | ||
errno = ENOMEM; | ||
return (caddr_t) -1; | ||
} | ||
|
||
heap_end += incr; | ||
|
||
return (caddr_t) prev_heap_end; | ||
} | ||
|
||
int _close(int file) | ||
{ | ||
return -1; | ||
} | ||
|
||
|
||
int _fstat(int file, struct stat *st) | ||
{ | ||
st->st_mode = S_IFCHR; | ||
return 0; | ||
} | ||
|
||
int _isatty(int file) | ||
{ | ||
return 1; | ||
} | ||
|
||
int _lseek(int file, int ptr, int dir) | ||
{ | ||
return 0; | ||
} | ||
|
||
int _open(char *path, int flags, ...) | ||
{ | ||
/* Pretend like we always fail */ | ||
return -1; | ||
} | ||
|
||
int _wait(int *status) | ||
{ | ||
errno = ECHILD; | ||
return -1; | ||
} | ||
|
||
int _unlink(char *name) | ||
{ | ||
errno = ENOENT; | ||
return -1; | ||
} | ||
|
||
int _times(struct tms *buf) | ||
{ | ||
return -1; | ||
} | ||
|
||
int _stat(char *file, struct stat *st) | ||
{ | ||
st->st_mode = S_IFCHR; | ||
return 0; | ||
} | ||
|
||
int _link(char *old, char *new) | ||
{ | ||
errno = EMLINK; | ||
return -1; | ||
} | ||
|
||
int _fork(void) | ||
{ | ||
errno = EAGAIN; | ||
return -1; | ||
} | ||
|
||
int _execve(char *name, char **argv, char **env) | ||
{ | ||
errno = ENOMEM; | ||
return -1; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this file generated for EpsilonAuxBMS? Dillonsd Trying SPI global IRQ disabled