Commit Graph
82 Commits
Author SHA1 Message Date
Paul Guenette 820fd72ae8 Merge branch 'bugfix/watchdog_fix' into RazorsEdge 2019-05-25 14:15:24 +02:00
Paul Guenette 987a14b8c7 Merge branch 'feature/63-dc-bus-limit' into RazorsEdge 2019-05-25 14:14:20 +02:00
Paul Guenette 3c144749cd Fix bad enum 2019-05-25 13:55:37 +02:00
Paul Guenette 687cf5b877 Merge branch 'Endstops' into develop 2019-05-25 13:53:38 +02:00
Paul Guenette 2abae9034b Change how the watchdog_reset_ value is handled 2019-05-24 23:54:38 +02:00
Paul Guenette 35d07595ac Fix bad struct and enums 2019-04-23 21:52:11 +02:00
Paul Guenette 1e5b82ca8b Merge branch 'devel' into Endstops 2019-04-23 21:48:43 +02:00
Paul Guenette 09a164d0ca Add dc_bus_over_power error 2019-03-25 20:52:36 +01:00
Paul Guenette 0c68cd9298 Fix error code for Estop 2019-03-23 09:35:05 +01:00
Paul Guenette 5fee14a378 Merge branch 'devel' into feature/CAN 2019-03-23 09:33:42 +01:00
Oskar Weigl fe0486aa8d Merge branch 'devel' into pr/Nomadluap/316 2019-03-18 20:24:19 -07:00
Paul Guenette 632fb4f7d1 Add heartbeat_rate to config protocol 2019-03-15 23:02:41 +01:00
Paul Guenette fa22c7a2ba Add configurable can_heartbeat_rate in ms 2019-03-15 23:01:21 +01:00
Paul Guenette 1296537582 Assign different can_node_ids to each axis by default 2019-03-08 21:53:02 +01:00
Paul Belanger 42384f3ef9 Initial implementation of comms watchdog
- Added watchdog timeout property to Axis::Config_t:
  axis.config.watchdog_timeout

- Added axis protocol function to feed watchdog timer:
  axis.watchdog_feed()

- Axis::run_control_loop now checks for watchdog expiration.

- Ascii protocol: add support for watchdog

  - The following ASCII commands now automatically update the watchdog:
    p, v, t, c, q

  - Added a 'u' command to update the watchdog of a motor without
    modifying setpoints.

  - Updated ascii protocol documentation to reflect new commands and
    effects.

- Updated getting started guide to mention watchdog settings and
  functions in protocol.

Please note: due to unavailability of hardware at this time, I have been
unable to test this code on an Odrive.
2019-03-06 14:40:59 -05:00
Paul Guenette 40ad2a0060 Merge branch 'devel' into feature/CAN 2019-03-01 22:56:11 +01:00
Oskar Weigl e3785a2aa2 make index only active when required 2019-02-11 18:42:22 -08:00
Oskar Weigl f17c96360f push index and dir search into encoder object 2019-02-11 17:32:48 -08:00
Oskar Weigl 2a12c1ac61 Merge branch 'devel' into preroll 2019-02-10 20:11:18 -08:00
Paul Guenette 335604c652 Merge branch 'devel' into feature/CAN 2019-02-06 19:12:47 +01:00
Oskar Weigl 15983cc4f0 Thermal current limit with linear derating 2019-01-16 01:19:36 -08:00
Unknown e6dfa54d00 Merge branch 'devel' into Endstops 2018-12-06 23:37:04 -05:00
Unknown f1dc6dd822 Merge branch 'devel' into feature/CAN 2018-11-27 23:10:25 -05:00
Oskar Weigl d9612ab534 circular position setpoint mode 2018-11-24 14:09:38 -08:00
Unknown ffbf24ff31 Merge branch 'devel' into feature/CAN 2018-10-28 18:37:49 -04:00
Oskar Weigl b09d1e9e25 make step/dir pins configurable 2018-10-22 21:03:13 -07:00
Oskar Weigl 3cb9a8d584 rename axis.enable_step_dir to axis.step_dir_active 2018-10-20 18:24:25 -07:00
Oskar Weigl d7644daaca make encoder dir find and overspeed check 2018-10-10 15:35:41 -07:00
Oskar Weigl 8c286f0a6d Lockin based index search working, clean out old search 2018-10-10 14:23:10 -07:00
Oskar Weigl b28f453833 explicit state prerequisite checks 2018-10-08 19:59:18 -07:00
Oskar Weigl 3a61b4a6ac lockin with enc sense working 2018-10-08 19:40:44 -07:00
Oskar Weigl 123d79ee46 hm something causes a hardfault 2018-10-07 23:30:24 -07:00
Oskar Weigl d42522daa4 Merge branch 'devel' into preroll 2018-10-07 17:24:18 -07:00
Unknown 3e4610a068 Merge remote-tracking branch 'madcowswe/devel' into feature/CAN 2018-10-07 13:33:15 -04:00
Oskar Weigl b7d77e2ded Merge branch 'master' into devel 2018-10-06 19:31:15 -07:00
Unknown a2ebb7085c Merge branch 'devel' into Endstops 2018-10-06 13:33:21 -04:00
Unknown 82c21c6a03 Merge branch 'devel' into feature/CAN 2018-10-06 13:32:44 -04:00
Oskar Weigl 987baeaa5e Merge branch 'devel' into preroll 2018-10-06 01:48:33 -07:00
Oskar Weigl d29697255a fix axis state machine jumping out of idle when there is an error 2018-10-06 01:47:36 -07:00
Oskar Weigl 85540cb1ab move check_for_errors to inline 2018-10-06 01:39:53 -07:00
Unknown 4fa09d6bbc Get CAN_SIMPLE to compile 2018-10-05 22:20:04 -04:00
je310 2c5b4f93a1 Update axis.hpp
Added direction  in the comments for the error codes to go look at the relevant hpp. When skimming the help documentation one assumes you arrive at an unhelpful error, such as ERROR_MOTOR_FAILED, when there is more information to be had.
2018-10-05 12:43:43 +01:00
Unknown 538236ab21 Each axis needs a can nodeID 2018-10-04 18:50:56 -04:00
Oskar Weigl ca83df6155 can do lockin spin at constant speed 2018-10-02 01:35:32 -07:00
Oskar Weigl a65212e2b7 move check_for_errors to inline 2018-10-02 00:44:42 -07:00
Unknown dc693ebd9c Merge branch 'devel' into Endstops 2018-09-27 20:42:30 -04:00
Oskar Weigl e88abb56eb pull in configs and enum into class for Axis and Motor, for consistency 2018-09-24 22:59:36 -07:00
Unknown 9b0bc6f840 Make Endstops objects instead of structs in Axis 2018-09-08 18:25:51 -04:00
Unknown c65e7265e7 Move traj planning config to trap_traj config object 2018-09-03 17:13:14 -04:00
Unknown 21bdf453c3 Fix bugs in homing by actually testing and using the debugger... 2018-09-02 01:59:35 -04:00