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.

Sign up for GitHub

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

Ner build fixups #213

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Ner build fixups #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
63afea1
flash, debug, serial work
jr1221 Oct 14, 2024
2aa0add
works on linux
jr1221 Oct 14, 2024
cc57546
final fixes
jr1221 Oct 17, 2024
ee6f032
bump submodule
jr1221 Oct 17, 2024
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
2 changes: 1 addition & 1 deletion Drivers/Embedded-Base
Open in desktop
Submodule Embedded-Base updated 80 files
+19 −0 .github/workflows/format-check.yml
+4 −1 .gitignore
+10 −0 .pre-commit-config.yaml
+9 −0 cangen/CANField.py
+18 −2 cangen/CANMsg.py
+120 −50 cangen/README.md
+11 −3 cangen/Result.py
+248 −50 cangen/RustSynth.py
+567 −0 cangen/RustSynthFromJSON.py
+2 −1 cangen/YAMLParser.py
+4 −1 cangen/__init__.py
+529 −0 cangen/can-messages/bms.json
+0 −377 cangen/can-messages/bms.yaml
+119 −0 cangen/can-messages/calypso_cmd.json
+182 −0 cangen/can-messages/charger.json
+0 −93 cangen/can-messages/charger.yaml
+961 −0 cangen/can-messages/dti.json
+0 −543 cangen/can-messages/dti.yaml
+629 −0 cangen/can-messages/mpu.json
+0 −318 cangen/can-messages/mpu.yaml
+729 −0 cangen/can-messages/msb.json
+0 −384 cangen/can-messages/msb.yaml
+36 −0 cangen/can-messages/wheel.json
+0 −18 cangen/can-messages/wheel.yaml
+130 −0 cangen/jsongen
+16 −0 ftdi_flash.cfg
+1 −0 general/.clang-format-ignore
+20 −29 general/include/LTC4015.h
+7 −5 general/include/ads131m04.h
+43 −36 general/include/lsm6dso.h
+49 −47 general/include/ltc68041.h
+7 −5 general/include/m24c32.h
+16 −14 general/include/max7314.h
+3 −4 general/include/mcp23008.h
+26 −21 general/include/pca9539.h
+12 −12 general/include/pi4ioe.h
+21 −19 general/include/sht30.h
+256 −183 general/include/vl6180x_api.h
+39 −31 general/include/vl6180x_cfg.h
+356 −296 general/include/vl6180x_def.h
+46 −30 general/include/vl6180x_i2c.h
+115 −94 general/include/vl6180x_platform.h
+17 −13 general/include/vl6180x_types.h
+49 −43 general/src/LTC4015.c
+78 −66 general/src/ads131m04.c
+56 −35 general/src/lsm6dso.c
+824 −736 general/src/ltc68041.c
+47 −41 general/src/m24c32.c
+136 −120 general/src/max7314.c
+12 −12 general/src/mcp23008.c
+18 −16 general/src/pca9539.c
+39 −39 general/src/pi4ioe.c
+48 −44 general/src/sht30.c
+2,459 −2,467 general/src/vl6180x_api.c
+163 −165 general/src/vl6180x_i2c.c
+115 −0 launchpad.py
+4 −7 middleware/include/c_utils.h
+17 −23 middleware/include/eepromdirectory.h
+52 −0 middleware/include/i2c_utility.h
+13 −13 middleware/include/pid.h
+13 −13 middleware/include/ringbuffer.h
+10 −11 middleware/include/timer.h
+13 −14 middleware/src/c_utils.c
+66 −75 middleware/src/eepromdirectory.c
+176 −0 middleware/src/i2c_utility.c
+46 −47 middleware/src/pid.c
+60 −60 middleware/src/ringbuffer.c
+16 −17 middleware/src/timer.c
+3 −0 ner_environment/build_system/__init__.py
+295 −0 ner_environment/build_system/build_system.py
+50 −0 ner_environment/build_system/clang_restage.py
+73 −0 ner_environment/build_system/miniterm.py
+168 −0 ner_environment/ner_setup.py
+5 −0 ner_environment/requirements.txt
+19 −0 ner_environment/setup.py
+7 −0 openocd.cfg
+6 −6 platforms/stm32f405/include/can.h
+18 −12 platforms/stm32f405/src/can.c
+3 −3 platforms/stm32g431/include/fdcan.h
+5 −6 platforms/stm32g431/src/fdcan.c
5 changes: 3 additions & 2 deletions compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ services:
build: .
network_mode: host
privileged: true
extra_hosts:
- "host.docker.internal:host-gateway"
volumes:
- type: bind
source: .
Expand All @@ -17,6 +19,5 @@ services:
- DEBUG_PORT=/dev/ttyACM0
- STM_TARGET_NAME=stm32f4
- USBIP_PORT=1-1.3
devices:
- "/dev/ttyACM0:/dev/ttyACM0"


6 changes: 0 additions & 6 deletions flash.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,3 @@ source [find target/${STM_TARGET_NAME}x.cfg]

# Set the adapter speed
adapter speed 5000

# find elf
set elf_file "build/cerberus.elf"

# Program the ELF file
program $elf_file verify reset exit