Whole project now uses autotools

Energy monitor commands

-Energy monitor commands
-=======================
-
-Trigger
-    Start
-    Stop
-    On Pin
-
-Mode
-    Dual ADC
-        One current, one voltage
-    Oversampled
-        Interleaved?
-        Constant number of samples averaged
-        or dynamic?
-            PID controller for number of samples averaged
-            trapezium interpolation
-
-Resolution
-    6-12 bit
-
-Retrigger
-    Pin
-
-LEDs
-
-
-Host Features
-=============
-
-Commands
-    connect [SERIAL]
-        choose the device, list serial numbers if multiple devs
-    power
-        output power avg per second
-        until kbhit
-    start
-    stop
-        stop measurement
-        display
-            energy
-            time
-            sample/s
-            avg power
-            peak power
-    ontrigger PIN
-    mode MODE
-        dual
-        oversampled
-        normal
-    resolution RES
-        6, 8, 10, 12
-    retrigger PIN
-        assert 1 on this pin while capturing
-    graph
-        launch python graph on streaming results
-    output FILENAME
-        save output to FILENAME
-    setserial SERID
-        set the serial ID
-    setresistor
-        set the value of the shunt resistor, in ohms
-
-commands seperated by ;
-
-Cmdline
-    specify commands on the command line

host/INSTALL → INSTALL

 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -309,10 +309,9 @@ causes the specified `gcc' to be used as the C compiler (unless it is
 overridden in the site shell script).
 
 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf limitation.  Until the limitation is lifted, you can use
-this workaround:
+an Autoconf bug.  Until the bug is fixed you can use this workaround:
 
-     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+     CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
 
 `configure' Invocation
 ======================
@@ -368,3 +367,4 @@ operates.
 
 `configure' also accepts some other, not widely useful, options.  Run
 `configure --help' for more details.
+

LICENSE

-STM32F4DISCOVERY Energy Monitor
-Copyright (C) 2013 James Pallister
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
\ No newline at end of file

Makefile

-CC=arm-none-eabi-gcc
-
-FLAGS += -T libopencm3_stm32f4.ld
-FLAGS += -D STM32F4
-FLAGS += -g -fno-common -save-temps
-FLAGS += -mcpu=cortex-m4 -mthumb
-FLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
-
-SRC += energy_monitor.c
-
-HOST_SRC = host/host_receiver.o host/libusbinterface.o host/dataprocessor.o host/helper.o
-
-.PHONY: firmware hostapp all
-
-all: energy_monitor host_receiver
-
-energy_monitor: energy_monitor.c Makefile
-	$(CC) $(FLAGS) $(SRC) -o energy_monitor -lopencm3_stm32f4
-
-host_receiver:
-	cd host; ./configure
-	$(MAKE) -C host
-
-clean:
-	$(MAKE) -C host clean
-	rm -f energy_monitor

Makefile.am

+SUBDIRS=src/host src/firmware
+
+ACLOCAL_AMFLAGS= -I m4

autogen.sh

+
+autoreconf -f -i
+

host/configure.ac → configure.ac

@@ -2,20 +2,26 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([stm32-host-receiver], [0.0.1], [BUG-REPORT-ADDRESS])
+AC_INIT([stm32f4-energy-monitor], [1.0], [james.pallister@embecosm.com])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE
+AC_PROG_LIBTOOL
 LT_INIT
-AC_CONFIG_SRCDIR([host_receiver.cpp])
+AC_CONFIG_SRCDIR([src/host/host_receiver.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 AC_LANG([C++])
 
-# Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
 
+AC_PROG_CC([arm-none-eabi-gcc])
+
+# TODO check if a suitable arm compiler exists
+# Check to see if it can compile code for cortex-m4f
+# Check to see if libopencm3 is available
+
 # Check for compiler flags.
 AX_CXX_COMPILE_STDCXX_11([noext],[mandatory])
 
@@ -25,8 +31,11 @@ BOOST_REGEX([n])
 BOOST_THREADS([n])
 BOOST_SYSTEM([n])
 
-AC_CHECK_LIB([readline], [main],, [AC_MSG_ERROR([Cannot find readline library. Please install it.])])
-AC_CHECK_LIB([usb-1.0], [main],, [AC_MSG_ERROR([Cannot find usb-1.0 library. Please install it.])])
+# Save libraries (don't want to compile energy_monitor with them)
+save_LIBS="$LIBS"
+AC_CHECK_LIB([readline], [main], [], [AC_MSG_ERROR([Cannot find readline library. Please install it.])])
+AC_CHECK_LIB([usb-1.0], [main], [], [AC_MSG_ERROR([Cannot find usb-1.0 library. Please install it.])])
+LIBS="$save_LIBS"
 
 # Python checking adapted from gdb's configure.ac
 # It's license, and original code can be obtained from
@@ -53,8 +62,14 @@ AC_DEFUN([AC_TRY_LIBPYTHON],
     esac
     found_usable_python=no
     AC_MSG_CHECKING([for ${version}])
-    AC_LINK_IFELSE(AC_LANG_PROGRAM([[#include "Python.h"]],
-                   [[Py_Initialize ();]]),
+    AC_LINK_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM(
+                    [[
+                        #include "Python.h"
+                    ]],
+
+                    [[
+                        Py_Initialize ();
+                    ]])])],
                    [have_libpython_var=${version}
                     found_usable_python=yes
                     PYTHON_CPPFLAGS=$new_CPPFLAGS
@@ -67,12 +82,18 @@ AC_DEFUN([AC_TRY_LIBPYTHON],
 AC_ARG_WITH(python,
             AS_HELP_STRING([--with-python=PYTHON], [also build host receiver as a python module (/path/to/python)]),
             [],
+            [with_python=`which python`])
+AC_ARG_WITH(python,
+            [AS_HELP_STRING([--without-python],[disable building of host receiver as a python module])],
+            [],
             [with_python=no])
+
 AC_MSG_CHECKING([whether to use python])
 AC_MSG_RESULT([$with_python])
 
 if test "${with_python}" = no; then
     AC_MSG_WARN([python module will not be compiled])
+    have_libpython=no
 else
     python_bin="${with_python}"
     if test ! -f "${python_bin}"; then
@@ -108,15 +129,8 @@ else
 fi
 AC_SUBST(PYTHON_CPPFLAGS)
 AC_SUBST(PYTHON_LIBS)
+AM_CONDITIONAL([BUILD_PYMODULE], [test x$have_libpython != xno])
 
-# Checks for header files.
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_CHECK_HEADER_STDBOOL
-AC_TYPE_SSIZE_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([sqrt])
 
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile src/host/Makefile src/firmware/Makefile])
 AC_OUTPUT

host/Makefile.am

-bin_PROGRAMS=host_receiver
-lib_LTLIBRARIES=pyenergy.la
-host_receiver_SOURCES=helper.cpp dataprocessor.cpp libusbinterface.cpp host_receiver.cpp
-pyenergy_la_SOURCES=$(host_receiver_SOURCES) pymodule.cpp
-
-host_receiver_CPPFLAGS = $(BOOST_CPPFLAGS)
-host_receiver_LDADD = $(BOOST_REGEX_LIBS) $(BOOST_THREAD_LIBS) $(BOOST_SYSTEM_LIBS)
-host_receiver_LDFLAGS = $(BOOST_REGEX_LDFLAGS) $(BOOST_THREAD_LDFLAGS) $(BOOST_SYSTEM_LDFLAGS)
-
-pyenergy_la_CPPFLAGS = $(PYTHON_CPPFLAGS)
-pyenergy_la_LIBADD = $(BOOST_PYTHON_LIBS) $(BOOST_PYTHON3_LIBS) $(PYTHON_LIBS) $(host_receiver_LDADD)
-pyenergy_la_LDFLAGS = $(BOOST_PYTHON_LDFLAGS) $(BOOST_PYTHON3_LDFLAGS) -module -shared -avoid-version $(host_receiver_LDFLAGS)
-
-ACLOCAL_AMFLAGS=-Im4

host/build-aux/compile

-#! /bin/sh
-# Wrapper for compilers which do not understand '-c -o'.
-
-scriptversion=2012-10-14.11; # UTC
-
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-nl='
-'
-
-# We need space, tab and new line, in precisely that order.  Quoting is
-# there to prevent tools from complaining about whitespace usage.
-IFS=" ""	$nl"
-
-file_conv=
-
-# func_file_conv build_file lazy
-# Convert a $build file to $host form and store it in $file
-# Currently only supports Windows hosts. If the determined conversion
-# type is listed in (the comma separated) LAZY, no conversion will
-# take place.
-func_file_conv ()
-{
-  file=$1
-  case $file in
-    / | /[!/]*) # absolute file, and not a UNC file
-      if test -z "$file_conv"; then
-	# lazily determine how to convert abs files
-	case `uname -s` in
-	  MINGW*)
-	    file_conv=mingw
-	    ;;
-	  CYGWIN*)
-	    file_conv=cygwin
-	    ;;
-	  *)
-	    file_conv=wine
-	    ;;
-	esac
-      fi
-      case $file_conv/,$2, in
-	*,$file_conv,*)
-	  ;;
-	mingw/*)
-	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
-	  ;;
-	cygwin/*)
-	  file=`cygpath -m "$file" || echo "$file"`
-	  ;;
-	wine/*)
-	  file=`winepath -w "$file" || echo "$file"`
-	  ;;
-      esac
-      ;;
-  esac
-}
-
-# func_cl_dashL linkdir
-# Make cl look for libraries in LINKDIR
-func_cl_dashL ()
-{
-  func_file_conv "$1"
-  if test -z "$lib_path"; then
-    lib_path=$file
-  else
-    lib_path="$lib_path;$file"
-  fi
-  linker_opts="$linker_opts -LIBPATH:$file"
-}
-
-# func_cl_dashl library
-# Do a library search-path lookup for cl
-func_cl_dashl ()
-{
-  lib=$1
-  found=no
-  save_IFS=$IFS
-  IFS=';'
-  for dir in $lib_path $LIB
-  do
-    IFS=$save_IFS
-    if $shared && test -f "$dir/$lib.dll.lib"; then
-      found=yes
-      lib=$dir/$lib.dll.lib
-      break
-    fi
-    if test -f "$dir/$lib.lib"; then
-      found=yes
-      lib=$dir/$lib.lib
-      break
-    fi
-    if test -f "$dir/lib$lib.a"; then
-      found=yes
-      lib=$dir/lib$lib.a
-      break
-    fi
-  done
-  IFS=$save_IFS
-
-  if test "$found" != yes; then
-    lib=$lib.lib
-  fi
-}
-
-# func_cl_wrapper cl arg...
-# Adjust compile command to suit cl
-func_cl_wrapper ()
-{
-  # Assume a capable shell
-  lib_path=
-  shared=:
-  linker_opts=
-  for arg
-  do
-    if test -n "$eat"; then
-      eat=
-    else
-      case $1 in
-	-o)
-	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
-	  eat=1
-	  case $2 in
-	    *.o | *.[oO][bB][jJ])
-	      func_file_conv "$2"
-	      set x "$@" -Fo"$file"
-	      shift
-	      ;;
-	    *)
-	      func_file_conv "$2"
-	      set x "$@" -Fe"$file"
-	      shift
-	      ;;
-	  esac
-	  ;;
-	-I)
-	  eat=1
-	  func_file_conv "$2" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-I*)
-	  func_file_conv "${1#-I}" mingw
-	  set x "$@" -I"$file"
-	  shift
-	  ;;
-	-l)
-	  eat=1
-	  func_cl_dashl "$2"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-l*)
-	  func_cl_dashl "${1#-l}"
-	  set x "$@" "$lib"
-	  shift
-	  ;;
-	-L)
-	  eat=1
-	  func_cl_dashL "$2"
-	  ;;
-	-L*)
-	  func_cl_dashL "${1#-L}"
-	  ;;
-	-static)
-	  shared=false
-	  ;;
-	-Wl,*)
-	  arg=${1#-Wl,}
-	  save_ifs="$IFS"; IFS=','
-	  for flag in $arg; do
-	    IFS="$save_ifs"
-	    linker_opts="$linker_opts $flag"
-	  done
-	  IFS="$save_ifs"
-	  ;;
-	-Xlinker)
-	  eat=1
-	  linker_opts="$linker_opts $2"
-	  ;;
-	-*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
-	  func_file_conv "$1"
-	  set x "$@" -Tp"$file"
-	  shift
-	  ;;
-	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
-	  func_file_conv "$1" mingw
-	  set x "$@" "$file"
-	  shift
-	  ;;
-	*)
-	  set x "$@" "$1"
-	  shift
-	  ;;
-      esac
-    fi
-    shift
-  done
-  if test -n "$linker_opts"; then
-    linker_opts="-link$linker_opts"
-  fi
-  exec "$@" $linker_opts
-  exit 1
-}
-
-eat=
-
-case $1 in
-  '')
-     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand '-c -o'.
-Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file 'INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "compile $scriptversion"
-    exit $?
-    ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
-    func_cl_wrapper "$@"      # Doesn't return...
-    ;;
-esac
-
-ofile=
-cfile=
-
-for arg
-do
-  if test -n "$eat"; then
-    eat=
-  else
-    case $1 in
-      -o)
-	# configure might choose to run compile as 'compile cc -o foo foo.c'.
-	# So we strip '-o arg' only if arg is an object.
-	eat=1
-	case $2 in
-	  *.o | *.obj)
-	    ofile=$2
-	    ;;
-	  *)
-	    set x "$@" -o "$2"
-	    shift
-	    ;;
-	esac
-	;;
-      *.c)
-	cfile=$1
-	set x "$@" "$1"
-	shift
-	;;
-      *)
-	set x "$@" "$1"
-	shift
-	;;
-    esac
-  fi
-  shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
-  # If no '-o' option was seen then we might have been invoked from a
-  # pattern rule where we don't need one.  That is ok -- this is a
-  # normal compilation that the losing compiler can handle.  If no
-  # '.c' file was seen then we are probably linking.  That is also
-  # ok.
-  exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use '[/\\:.-]' here to ensure that we don't use the same name
-# that we are using for the .o file.  Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-while true; do
-  if mkdir "$lockdir" >/dev/null 2>&1; then
-    break
-  fi
-  sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
-  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
-  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:

host/config.h.in

-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Defined if the requested minimum BOOST version is satisfied */
-#undef HAVE_BOOST
-
-/* Define to 1 if you have <boost/python.hpp> */
-#undef HAVE_BOOST_PYTHON_HPP
-
-/* Define to 1 if you have <boost/regex.hpp> */
-#undef HAVE_BOOST_REGEX_HPP
-
-/* Define to 1 if you have <boost/system/error_code.hpp> */
-#undef HAVE_BOOST_SYSTEM_ERROR_CODE_HPP
-
-/* Define to 1 if you have <boost/thread.hpp> */
-#undef HAVE_BOOST_THREAD_HPP
-
-/* define if the compiler supports basic C++11 syntax */
-#undef HAVE_CXX11
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `readline' library (-lreadline). */
-#undef HAVE_LIBREADLINE
-
-/* Define to 1 if you have the `usb-1.0' library (-lusb-1.0). */
-#undef HAVE_LIBUSB_1_0
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `sqrt' function. */
-#undef HAVE_SQRT
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to `int' if <sys/types.h> does not define. */
-#undef ssize_t

src/firmware/Makefile.am

+bin_PROGRAMS=energy_monitor
+energy_monitor_SOURCES=energy_monitor.c
+
+CC= arm-none-eabi-gcc
+AM_CFLAGS  = -D STM32F4
+AM_CFLAGS += -mcpu=cortex-m4 -mthumb
+AM_CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+
+#AM_LDFLAGS  = -mcpu=cortex-m4 -mthumb
+#AM_LDFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16
+AM_LDFLAGS = -lopencm3_stm32f4

src/host/configure.ac

+
+AC_CHECK_LIB([readline], [main],, [AC_MSG_ERROR([Cannot find readline library. Please install it.])])
+AC_CHECK_LIB([usb-1.0], [main],, [AC_MSG_ERROR([Cannot find usb-1.0 library. Please install it.])])
+