Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

diff --git a/ao-bringup/turnon_easymotor b/ao-bringup/turnon_easymotor
index b9bc00772af3169d580ceb9512c24a84e2e8b680..306e0ad9c4e7d8b0c9676c0d97a4147374c80b1e 100755 (executable)
--- a/ao-bringup/turnon_easymotor
+++ b/ao-bringup/turnon_easymotor
@@ -44,7 +44,7 @@ esac
 
 echo $DFU_UTIL
 
-$DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $REPO/loaders/easymotor-v$VERSION*.elf
+$DFU_UTIL -v -v -R -a 0 -s 0x08000000:leave -D $REPO/loaders/easymotor-v$VERSION*.bin
 
 sleep 3
 

diff --git a/configure.ac b/configure.ac
index 7de4d369c123de5dcd20a846af7b37862c0f0e24..ece8ac9386b957a33f18d50b5d5f2a74a143ac60 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,13 +18,13 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 1.9.6.4)
+AC_INIT([altos], 1.9.7)
 ANDROID_VERSION=27
 AC_CONFIG_SRCDIR([src/kernel/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-RELEASE_DATE=2021-03-28
+RELEASE_DATE=2021-04-12
 AC_SUBST(RELEASE_DATE)
 
 DOC_DATE=`LC_ALL=C date -d $RELEASE_DATE +'%d %b %Y'`