Merge pull request #2479 from particle-iot/fix/deprecate-tinker-fqc

Deprecate tinker fqc

Author: scott-brust

.gitmodules

@@ -51,3 +51,6 @@
 [submodule "third_party/ambd_sdk/ambd_sdk"]
 	path = third_party/ambd_sdk/ambd_sdk
 	url = https://github.com/particle-iot/realtek_ambd_sdk_public.git
+[submodule "third_party/coremark/coremark"]
+	path = third_party/coremark/coremark
+	url = https://github.com/particle-iot/coremark

build/release.sh

@@ -337,7 +337,7 @@ if [ $PLATFORM_ID -eq 12 ] || [ $PLATFORM_ID -eq 13 ] || [ $PLATFORM_ID -eq 15 ]
     if [ "$MODULAR" = "n" ]; then
         declare -a apps=("tinker-serial1-debugging" "tinker-serial-debugging")
     else
-        declare -a apps=("tinker" "tinker-fqc")
+        declare -a apps=("tinker")
     fi
 
     for app in ${apps[@]}; do

third_party/coremark/Makefile

@@ -0,0 +1,12 @@
+MODULE=coremark
+COREMARK_MODULE_PATH=.
+
+# Target this makefile is building.
+TARGET_TYPE = a
+
+BUILD_PATH_EXT=$(COREMARK_BUILD_PATH_EXT)
+
+DEPENDENCIES += services
+
+PROJECT_ROOT ?= ../..
+include ../../build/arm-tlm.mk

third_party/coremark/build.mk

@@ -0,0 +1,9 @@
+TARGET_COREMARK_SRC_PATH = $(COREMARK_MODULE_PATH)/coremark
+
+# C source files included in this build.
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_list_join.c
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_main.c
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_matrix.c
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_portme.c
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_state.c
+CSRC += $(TARGET_COREMARK_SRC_PATH)/core_util.c

third_party/coremark/coremark

@@ -0,0 +1,7 @@
+COREMARK_MODULE_NAME = coremark
+COREMARK_MODULE_PATH ?= $(PROJECT_ROOT)/third_party/$(COREMARK_MODULE_NAME)
+include $(COREMARK_MODULE_PATH)/include.mk
+
+COREMARK_BUILD_PATH_EXT = $(BUILD_TARGET_PLATFORM)
+COREMARK_LIB_DIR = $(BUILD_PATH_BASE)/$(COREMARK_MODULE_NAME)/$(COREMARK_BUILD_PATH_EXT)
+COREMARK_LIB_DEP = $(COREMARK_LIB_DIR)/lib$(COREMARK_MODULE_NAME).a

third_party/coremark/import.mk

@@ -0,0 +1,2 @@
+TARGET_COREMARK_PATH = $(COREMARK_MODULE_PATH)
+INCLUDE_DIRS += $(COREMARK_MODULE_PATH)/coremark

third_party/coremark/include.mk

@@ -18,7 +18,7 @@
 /* Includes ------------------------------------------------------------------*/
 #include "application.h"
 #include <cctype>
-#if HAL_PLATFORM_RTL872X
+#if HAL_PLATFORM_RTL872X && ENABLE_FQC_FUNCTIONALITY
 #include "request_handler.h"
 #include "src/burnin_test.h"
 #endif
@@ -128,7 +128,7 @@ void setup()
     Particle.function("analogread", tinkerAnalogRead);
     Particle.function("analogwrite", tinkerAnalogWrite);
 
-#if HAL_PLATFORM_RTL872X
+#if HAL_PLATFORM_RTL872X && ENABLE_FQC_FUNCTIONALITY
     BurninTest::instance()->setup();
 #endif
 }
@@ -138,7 +138,7 @@ void loop()
 {
     //This will run in a loop
 
-#if HAL_PLATFORM_RTL872X
+#if HAL_PLATFORM_RTL872X && ENABLE_FQC_FUNCTIONALITY
     BurninTest::instance()->loop();
 #endif
 }
@@ -260,7 +260,7 @@ int tinkerAnalogWrite(String command)
     return -1;
 }
 
-#if HAL_PLATFORM_RTL872X
+#if HAL_PLATFORM_RTL872X && ENABLE_FQC_FUNCTIONALITY
 // Tinker app specific USB requests. For P2 these are FQC commands
 void ctrl_request_custom_handler(ctrl_request* req) {
     particle::RequestHandler::instance()->process(req);

user/applications/tinker-fqc/tinker-fqc.mk

@@ -0,0 +1,8 @@
+ifeq ($(APP),tinker)
+COREMARK_DEPENDENCY = third_party/coremark
+
+include $(PROJECT_ROOT)/$(COREMARK_DEPENDENCY)/import.mk
+
+LIBS += $(notdir $(COREMARK_DEPENDENCY))
+LIB_DIRS += $(COREMARK_LIB_DIR)
+endif