Merge branch 'master' of https://gitlab.iri.upc.edu/humanoides/cm510_controller_fw
Conflicts: motion/Makefile
Showing
- communications/Makefile 1 addition, 1 deletioncommunications/Makefile
- communications/include/dynamixel_master.h 1 addition, 0 deletionscommunications/include/dynamixel_master.h
- communications/include/serial_console.h 3 additions, 0 deletionscommunications/include/serial_console.h
- communications/src/dynamixel_master.c 7 additions, 0 deletionscommunications/src/dynamixel_master.c
- communications/src/examples/Makefile 1 addition, 1 deletioncommunications/src/examples/Makefile
- communications/src/examples/main.c 2 additions, 2 deletionscommunications/src/examples/main.c
- communications/src/serial_console.c 33 additions, 0 deletionscommunications/src/serial_console.c
- controllers/Makefile 1 addition, 1 deletioncontrollers/Makefile
- controllers/include/cm510_cfg.h 1 addition, 1 deletioncontrollers/include/cm510_cfg.h
- controllers/src/cm510.c 8 additions, 2 deletionscontrollers/src/cm510.c
- controllers/src/examples/Makefile 1 addition, 1 deletioncontrollers/src/examples/Makefile
- controllers/src/examples/main.c 2 additions, 2 deletionscontrollers/src/examples/main.c
- dyn_devices/Makefile 1 addition, 1 deletiondyn_devices/Makefile
- dyn_devices/include/exp_board.h 1 addition, 0 deletionsdyn_devices/include/exp_board.h
- dyn_devices/include/exp_board_reg.h 2 additions, 1 deletiondyn_devices/include/exp_board_reg.h
- dyn_devices/src/examples/Makefile 1 addition, 1 deletiondyn_devices/src/examples/Makefile
- dyn_devices/src/examples/exp_board_ex.c 28 additions, 28 deletionsdyn_devices/src/examples/exp_board_ex.c
- dyn_devices/src/examples/servos_ex.c 2 additions, 2 deletionsdyn_devices/src/examples/servos_ex.c
- dyn_devices/src/exp_board/exp_board.c 11 additions, 0 deletionsdyn_devices/src/exp_board/exp_board.c
- examples/dexter/dexter_robot 1 addition, 0 deletionsexamples/dexter/dexter_robot
Loading
Please register or sign in to comment