Merge branch 'gingerbread-cupcake'

Conflicts:
	src/libsc/k60/ab_encoder.cpp
	src/libsc/k60/dir_encoder.cpp

Author: nkming2

MakeConfig.inc

@@ -22,6 +22,12 @@ CPPFLAGS+=-DK60_2014_INNO=1
 SCCC_MCU=MK60DZ10
 $(info Config = 2014_INNO)
 
+else ifeq ($(SCCC_CONFIG),2014_INNO_FX)
+BIN_SUFFIX:=$(BIN_SUFFIX)-2014-inno-fx
+CPPFLAGS+=-DK60_2014_INNO=1
+SCCC_MCU=MK60F15
+$(info Config = 2014_INNO_FX)
+
 else ifeq ($(SCCC_CONFIG),2014_MAGNETIC)
 BIN_SUFFIX:=$(BIN_SUFFIX)-2014-magnetic
 CPPFLAGS+=-DK60_2014_MAGNETIC=1
@@ -34,6 +40,18 @@ CPPFLAGS+=-DK60_VCAN_FX15DEV=1
 SCCC_MCU=MK60F15
 $(info Config = VCAN_FX15DEV)
 
+else ifeq ($(SCCC_CONFIG),2015_CAMERA)
+BIN_SUFFIX:=$(BIN_SUFFIX)-2015-camera
+CPPFLAGS+=-DK60_2015_CAMERA=1
+SCCC_MCU=MK60F15
+$(info Config = 2015_CAMERA)
+
+else ifeq ($(SCCC_CONFIG),2015_MAGNETIC)
+BIN_SUFFIX:=$(BIN_SUFFIX)-2015-magnetic
+CPPFLAGS+=-DK60_2015_MAGNETIC=1
+SCCC_MCU=MK60F15
+$(info Config = 2015_MAGNETIC)
+
 else
 $(error Missing/Unknown config '$(SCCC_CONFIG)' (set SCCC_CONFIG))
 

Makefile

@@ -7,7 +7,7 @@ OUT_OBJ_PATH=obj
 TOOLCHAIN_PREFIX=arm-none-eabi-
 CC=$(TOOLCHAIN_PREFIX)gcc
 CXX=$(TOOLCHAIN_PREFIX)g++
-AR=$(TOOLCHAIN_PREFIX)ar
+AR=$(TOOLCHAIN_PREFIX)gcc-ar
 
 # Additional include dirs
 ALL_INC_PATHS=$(INC_PATH) $(SRC_PATH)
@@ -35,6 +35,14 @@ $(info Make version = $(MAKE_VERSION))
 
 endif
 
+ifdef WIN32
+# TODO Also print CC version on win32
+
+else ifdef UNIX
+$(info CC = $(shell $(CC) --version | (read -r line; echo $$line)))
+
+endif
+
 $(info User include paths = $(ALL_INC_PATHS))
 $(info User symbols = $(ALL_SYMBOLS))
 
@@ -53,6 +61,8 @@ CCFLAGS+=-fmessage-length=0
 CCFLAGS+=-flto -ffunction-sections -fdata-sections
 CCFLAGS+=-fno-strict-aliasing
 CCFLAGS+=-Wall -Wextra
+# Wmissing-field-initializers is causing too much false warnings
+CCFLAGS+=-Wno-missing-field-initializers
 
 ifeq ($(SCCC_BUILD),DEBUG)
 BIN_SUFFIX:=$(BIN_SUFFIX)-d

inc/libbase/cmsis/core_cm4.h

@@ -13,6 +13,7 @@
 
 #include <functional>
 
+#include "libbase/k60/dma.h"
 #include "libbase/k60/misc_utils.h"
 #include "libbase/k60/pin.h"
 #include "libbase/k60/pinout_macros.h"
@@ -123,7 +124,7 @@ class Adc
 		 * @note Having listener and continuous mode both set will most likely
 		 * result in the listener being called in a dead lock manner
 		 */
-		OnConversionCompleteListener conversion_listener;
+		OnConversionCompleteListener conversion_isr;
 	};
 
 	static constexpr int kModuleChannelCount = 36;
@@ -183,6 +184,19 @@ class Adc
 		m_config.avg_pass = avg_pass;
 	}
 
+	/**
+	 * Config this Adc up to be ready to serve conversion result as DMA source,
+	 * and set @a config accordingly. The following options are also set besides
+	 * mux_src and src:<br>
+	 * Dma::Config::minor_bytes = 1 or 2 (depending on the resolution)
+	 *
+	 * @note To use DMA, Config::conversion_isr must NOT be set for this Adc.
+	 * Otherwise, the operation will fail and no changes would be made to
+	 * @a config
+	 * @param config
+	 */
+	void ConfigResultAsDmaSrc(Dma::Config *config);
+
 private:
 	bool InitModule(const Pin::Name pin);
 	bool InitModule(const Adc::Name adc);

inc/libbase/cmsis/core_cm4_simd.h

@@ -21,19 +21,19 @@ namespace k60
 class AdcUtils
 {
 public:
-	static Uint GetModule(const Adc::Name pin)
+	static Uint GetModule(const Adc::Name adc)
 	{
-		return static_cast<Uint>(pin) / Adc::kModuleChannelCount;
+		return static_cast<Uint>(adc) / Adc::kModuleChannelCount;
 	}
 
-	static Uint GetChannel(const Adc::Name pin)
+	static Uint GetChannel(const Adc::Name adc)
 	{
-		return static_cast<Uint>(pin) % Adc::kModuleChannelCount;
+		return static_cast<Uint>(adc) % Adc::kModuleChannelCount;
 	}
 
-	static Uint GetChannelNumber(const Adc::Name pin)
+	static Uint GetChannelNumber(const Adc::Name adc)
 	{
-		const Uint channel = GetChannel(pin);
+		const Uint channel = GetChannel(adc);
 		if (channel >= (Uint)Adc::Name::kAdc0Ad4B)
 		{
 			return channel - 4;

inc/libbase/cmsis/core_cmFunc.h

@@ -0,0 +1,42 @@
+/*
+ * cache.h
+ *
+ * Author: Ming Tsang
+ * Copyright (c) 2014-2015 HKUST SmartCar Team
+ * Refer to LICENSE for details
+ */
+
+#pragma once
+
+namespace libbase
+{
+namespace k60
+{
+
+class Cache
+{
+public:
+	struct Config
+	{
+		bool is_enable;
+	};
+
+	static Cache& Get()
+	{
+		static Cache inst;
+		return inst;
+	}
+
+	void Init(const Config &config);
+
+private:
+	Cache();
+
+	void InitPc();
+	void InitPs();
+
+	bool m_is_init;
+};
+
+}
+}