Merge branch 'smart_charger' (1a6a2261) · Commits · humanoides / darwin / darwin_stm32_fw · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

darwin_stm32_fw
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

1a6a2261

Commit 1a6a2261 authored 8 years ago by =Sergi Hernandez Juan

Downloads
- Plain Diff

Merge branch 'smart_charger'

Conflicts:
	include/darwin_registers.h

parents 82d4f2d2 35b92d29

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

Makefile 12 additions, 2 deletions

Makefile
include/darwin_registers.h 41 additions, 8 deletions

include/darwin_registers.h
include/dyn_battery.h 100 additions, 0 deletions

include/dyn_battery.h
include/eeprom_init.h 5 additions, 1 deletion

include/eeprom_init.h
include/motion_manager.h 4 additions, 0 deletions

include/motion_manager.h
include/smart_charger.h 121 additions, 0 deletions

include/smart_charger.h
src/darwin_dyn_master.c 1 addition, 1 deletion

src/darwin_dyn_master.c
src/darwin_dyn_master_v2.c 1 addition, 1 deletion

src/darwin_dyn_master_v2.c
src/darwin_dyn_slave.c 4 additions, 0 deletions

src/darwin_dyn_slave.c
src/eeprom.c 3 additions, 1 deletion

src/eeprom.c
src/motion_manager.c 47 additions, 4 deletions

src/motion_manager.c
src/ram.c 4 additions, 0 deletions

src/ram.c
src/smart_charger.c 168 additions, 0 deletions

src/smart_charger.c
src/test_charger.c 167 additions, 0 deletions

src/test_charger.c

with 678 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment