projects / fw / altos / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 611ef44) | patch
ao-eeprom: Handle merge conflict from easymotor-v3 branch
authorKeith Packard <keithp@keithp.com>
Fri, 28 Oct 2022 02:19:59 +0000 (19:19 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 28 Oct 2022 02:22:56 +0000 (19:22 -0700)
commit898eeb609aa7eb078161a78ac48c727a5255a51c
tree6640f94714b768b9481c76ba8301639d9bee40b6tree | snapshot
parent611ef4497b97bcf5239d6bc2ee13eeba9efd1503commit | diff
ao-eeprom: Handle merge conflict from easymotor-v3 branch

Had two copies of the new easymotor log format parsing bits.

Signed-off-by: Keith Packard <keithp@keithp.com>
ao-tools/ao-eeprom/ao-eeprom.c diff | blob | history
ao-tools/lib/ao-eeprom-read.h diff | blob | history
AltOS - the operating system for Altus Metrum products