Jelajahi Sumber

[BT-6709]add two build for difference orders (mts, beeline)

balbekova 5 tahun lalu
induk
melakukan
117d2924b7
3 mengubah file dengan 16 tambahan dan 3 penghapusan
  1. 5 2
      Makefile
  2. 7 1
      modules/Makefile
  3. 4 0
      modules/settings_api_bt6709.c

+ 5 - 2
Makefile

@@ -68,8 +68,11 @@ release_6703:
 release_6707:
 	$(MAKE) -C modules HARDWARE=bt6707 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 
-release_6709:
-	$(MAKE) -C modules HARDWARE=bt6709 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+release_6709_mts:
+	$(MAKE) -C modules HARDWARE=bt6709 ORDER=mts VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
+
+release_6709_beeline:
+	$(MAKE) -C modules HARDWARE=bt6709 ORDER=beeline VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release
 
 release_6710:
 	$(MAKE) -C modules HARDWARE=bt6710 VERBOSE=1 DEBUG=0 PRINTF=custom MAC=EC-4C-4D-00-80-0A release

+ 7 - 1
modules/Makefile

@@ -21,6 +21,8 @@ CFLAGS += -DPRINTF_$(shell echo $(PRINTF) | tr a-z A-Z)
 
 CFLAGS += -DHARDWARE_$(shell echo $(HARDWARE) | tr a-z A-Z)
 
+CFLAGS += -DORDER_$(shell echo $(ORDER) | tr a-z A-Z)
+
 INCLUDES = -I../config
 INCLUDES += -I../stm32/stm32f4xx_spl/inc 
 INCLUDES += -I../stm32/system
@@ -247,8 +249,12 @@ endif
 $(FSDATA_DIR)/fsdata.c: $(WUI_DIR)/*
 	mkdir -p $(FSDATA_DIR)
 	../docs/makefsdata.pl $(FSDATA_DIR) $(WUI_DIR)
-	
+
+ifneq (,$(filter $(ORDER),mts beeline))	
+ARTIFACTS_PATH := ~/Releases/$(HARDWARE)/$(ORDER)
+else
 ARTIFACTS_PATH := ~/Releases/$(HARDWARE)
+endif
 RELEASE_VERSION := $(shell ../projects/gcc/tools/version.sh $(HARDWARE) $(INCLUDES))
 RELEASE_PATH := $(ARTIFACTS_PATH)/$(RELEASE_VERSION)
 

+ 4 - 0
modules/settings_api_bt6709.c

@@ -221,6 +221,10 @@ void SETTINGS_SetFlagNotificationDef(void)
     for(i = 0; i < ALL_TRAPS; i++ ) {
         sSettings.sFlagNotification[i] = 1;
     }
+#ifdef ORDER_BEELINE
+    sSettings.sFlagNotification[BATTERY_CHANGE_ALARM] = 0;
+    sSettings.sFlagNotification[BATTERY_CHANGE_MORM] = 0;
+#endif
 }
 
 /**