Skip to content
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
wants to merge 77 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
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 Jul 25, 2020
e1bbfa4
SFT 167. Defined and initialized variables
badeniran Jul 25, 2020
5095c64
Merge pull request #164 from UCSolarCarTeam/user/embedded/SFT-167-Def…
badeniran Aug 8, 2020
837f399
SFT-175. Contactor control code and unit tests.
badeniran Aug 8, 2020
20cdd23
Merge pull request #168 from UCSolarCarTeam/user/embedded/SFT-175-Cre…
badeniran Sep 12, 2020
1e807d8
SFT-189 CAN Interrupt and Filter Config
badeniran Sep 12, 2020
fd03b21
Merge pull request #169 from UCSolarCarTeam/user/embedded/SFT-189-Do-…
badeniran Sep 12, 2020
be0972a
Implemeted Read Aux Voltage Task
badeniran Sep 26, 2020
cc10aaa
SFT-190. Create functions and unit tests for orion work.
badeniran Sep 12, 2020
fd3a335
Merge pull request #175 from UCSolarCarTeam/user/embedded/SFT-190-cre…
badeniran Nov 3, 2020
b1473fa
SFT 200. Creating tasks relating to CAN Tx work.
badeniran Sep 26, 2020
3add054
Merge branch 'feature/aux-bms-rearchitecture' into user/embedded/SFT-…
badeniran Nov 8, 2020
e1df3c1
Merge pull request #177 from UCSolarCarTeam/user/embedded/SFT-200-Cre…
badeniran Nov 8, 2020
e5b4e3a
Merge branch 'feature/aux-bms-rearchitecture' of https://github.com/U…
badeniran Nov 8, 2020
24f746d
Finished dev work. Need to do unit tests
badeniran Nov 27, 2020
4e8ffcc
SFT 202. Functions and tests for aux voltage read.
badeniran Nov 27, 2020
a79efd9
Merge pull request #178 from UCSolarCarTeam/user/embedded/SFT-202-Cre…
badeniran Nov 28, 2020
22b52da
Adding unit tests
badeniran Nov 28, 2020
3ddc09c
Merge pull request #179 from UCSolarCarTeam/user/embedded/SFT-202-Cre…
badeniran Nov 28, 2020
1487dbb
SFT 203. Implementing error handling
badeniran Nov 28, 2020
e34e603
Merge pull request #181 from UCSolarCarTeam/user/embedded/SFT-203/imp…
badeniran Nov 28, 2020
8469703
SFT 204. Implemented memory debug task
badeniran Nov 28, 2020
c4cf94f
Merge pull request #182 from UCSolarCarTeam/user/embedded/SFT-204/imp…
badeniran Nov 28, 2020
1ce5656
Removed magic numbers. Added unit tests to travis.
badeniran Dec 5, 2020
2a5fa76
Changing travis for auxbmsv2
badeniran Dec 5, 2020
ac31247
Changed travis back. Trying using our own round function
badeniran Dec 5, 2020
c01fa81
made round function comment clearer
badeniran Dec 5, 2020
b3e8388
Merge pull request #184 from UCSolarCarTeam/user/badeniran/aux-bms-cl…
badeniran Jan 8, 2021
b03ae6f
Initial fixes done. At a stable state
badeniran Jan 29, 2021
f8297c1
Pushed up to OrionInterfaceTaskTest. Need to generate mocks for Trip.c
badeniran Jan 30, 2021
1bda236
remocked trip.c, fix Trip and OrionInterface tests
JessieG123 Jan 30, 2021
129f555
created test for updateAuxTrip
JessieG123 Jan 30, 2021
005e8ff
Fix TripTest.c
duan-le Feb 5, 2021
4c79f8b
Add two more tests for updateAuxTrip
duan-le Feb 5, 2021
c285b92
Fix unneccessary way of calling checkProtectionTrip
duan-le Feb 5, 2021
ebd6589
Run remaining tests
duan-le Feb 5, 2021
3fe947c
Split tripDuetoHighTempAndCurrent into two variables
duan-le Feb 26, 2021
6b59276
Removing checkProtectionTrip()
duan-le Mar 5, 2021
4aeea47
Simplify checkDischargeTrip and checkChargeTrip
duan-le Mar 5, 2021
af152c3
add mocks for trip
JessieG123 Mar 5, 2021
cd74684
Redoing OrionInterfaceTest
duan-le Mar 13, 2021
6e3c5a7
Add shouldDisconnectContactors test
duan-le Mar 13, 2021
fac559f
Initial fixes done. At a stable state
badeniran Jan 29, 2021
06c8b73
Pushed up to OrionInterfaceTaskTest. Need to generate mocks for Trip.c
badeniran Jan 30, 2021
da4ffd0
remocked trip.c, fix Trip and OrionInterface tests
JessieG123 Jan 30, 2021
d9c53db
created test for updateAuxTrip
JessieG123 Jan 30, 2021
91412c6
Fix TripTest.c
duan-le Feb 5, 2021
cd549f2
Add two more tests for updateAuxTrip
duan-le Feb 5, 2021
cb0ac31
Fix unneccessary way of calling checkProtectionTrip
duan-le Feb 5, 2021
083cb37
Run remaining tests
duan-le Feb 5, 2021
ec21b70
Split tripDuetoHighTempAndCurrent into two variables
duan-le Feb 26, 2021
74d4ead
Removing checkProtectionTrip()
duan-le Mar 5, 2021
d6fb466
Simplify checkDischargeTrip and checkChargeTrip
duan-le Mar 5, 2021
e3d966f
add mocks for trip
JessieG123 Mar 5, 2021
813bdda
Redoing OrionInterfaceTest
duan-le Mar 13, 2021
64cc882
Add shouldDisconnectContactors test
duan-le Mar 13, 2021
76dca24
Finish tests
duan-le Mar 14, 2021
6e0db6b
Change to contactorControlEvenFlags to defined macros
duan-le Mar 14, 2021
9a692dd
Merge branch 'feature/aux-bms-rearchitecture' into user/embedded/pull…
duan-le Mar 14, 2021
7170db6
Merge pull request #188 from UCSolarCarTeam/user/embedded/pull-reques…
duan-le Mar 14, 2021
66a2a8c
commented line 374-378 in main.c
JessieG123 Feb 19, 2022
4162182
Trying SPI global IRQ disabled
Mar 5, 2022
4092baa
Migrating to STM 6.4.0 from 6.0.0
Mar 5, 2022
96fcd62
debug changes
JessieG123 Mar 19, 2022
a3ac36d
debug changes
JessieG123 Mar 19, 2022
25a6694
in v2 we only get one adc value which we use for calculation but in t…
JessieG123 Mar 23, 2022
f907e5b
astyle and removing previous debug function in orionInterface
JessieG123 Mar 23, 2022
76bed0a
fixed can rx to receive all messages from orion before putting in the…
JessieG123 Mar 28, 2022
26d5560
Added tracealyzer capabilities to AuxBmsV2
VioletLiGonzales Apr 14, 2022
d1e792f
Increased Number of Tasks for tracealyzer
VioletLiGonzales Apr 16, 2022
eda7fd5
add function to get states of task
JessieG123 Apr 30, 2022
e666473
Merge branch 'user/Dillonsd/AuxBMSTesting' of github.com:UCSolarCarTe…
JessieG123 Apr 30, 2022
739d529
Fixed Delay problems, source of initial *prevWakeTime should be TaskT…
VioletLiGonzales May 8, 2022
7f4f697
Fixed failing readAuxVoltage, changed from DMA SPI to regular SPI call
VioletLiGonzales May 14, 2022
0f627fa
Updated Lights code to account for new AuxBMS can packet
VioletLiGonzales May 14, 2022
ab5a8e7
Updated DriverControls to account for new AuxBms can packet
VioletLiGonzales May 14, 2022
3fa934f
Merge remote-tracking branch 'origin/master' into user/Dillonsd/AuxBM…
VioletLiGonzales May 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ STM32L152-Discovery.elf.launch
*.tmp

# Other
.tags
.tags*
*swap
.fuse*
.vscode/
Expand Down
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ script:
- (cd EpsilonDriverControls && ./make.sh)
- (cd EpsilonCCS && make)
- (cd EpsilonAuxBMS && ./make.sh)
- (cd EpsilonAuxBmsV2 && ./make.sh)
- "! (./format.sh EpsilonCCS | grep Formatted)"
- "! (./format.sh EpsilonLights | grep Formatted)"
- "! (./format.sh EpsilonDriverControls | grep Formatted)"
- "! (./format.sh EpsilonAuxBMS | grep Formatted)"
- "! (./format.sh EpsilonAuxBmsV2 | grep Formatted)"

language: c
207 changes: 207 additions & 0 deletions EpsilonAuxBMS/Src/syscalls.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
/**
Copy link
Member

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

*****************************************************************************
**
** 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>&copy; 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;
}
Loading