From 41849684692ab66a0020381057f3f52f2ad5971a Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Wed, 23 Aug 2017 16:41:51 +0800 Subject: [PATCH 1/2] esp32: by default, set 40MHz crystal frequency --- components/esp32/cpu_freq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp32/cpu_freq.c b/components/esp32/cpu_freq.c index f5ccd13df7..3fa5fb531c 100644 --- a/components/esp32/cpu_freq.c +++ b/components/esp32/cpu_freq.c @@ -36,7 +36,7 @@ void esp_set_cpu_freq(void) // wait uart tx finish, otherwise some uart output will be lost uart_tx_wait_idle(CONFIG_CONSOLE_UART_NUM); - rtc_init_lite(XTAL_AUTO); + rtc_init_lite(XTAL_40M); // work around a bug that RTC fast memory may be isolated // from the system after rtc_init_lite SET_PERI_REG_MASK(RTC_CNTL_PWC_REG, RTC_CNTL_FASTMEM_FORCE_NOISO_M); From 18dbdd46f442e415944310934fe69ca0a4d1f479 Mon Sep 17 00:00:00 2001 From: He Yin Ling Date: Thu, 24 Aug 2017 11:38:52 +0800 Subject: [PATCH 2/2] CI: checkout relative branch of test_script test script interface could change. we need to use the correct version of test script to run test on old release versions of IDF. --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b640a99f02..f86bd4e0a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -337,6 +337,7 @@ check_doc_links: # clone test bench - git clone $GITLAB_SSH_SERVER/yinling/auto_test_script.git - cd auto_test_script + - git checkout ${CI_COMMIT_REF_NAME} || echo "Using default branch..." # run test - python CIRunner.py -l $LOG_PATH -c $CONFIG_FILE -e $LOCAL_ENV_CONFIG_PATH -t $TEST_CASE_FILE_PATH -m $MODULE_UPDATE_FILE bin_path $APP_NAME $BIN_PATH @@ -364,6 +365,7 @@ check_doc_links: # clone test bench - git clone $GITLAB_SSH_SERVER/yinling/auto_test_script.git - cd auto_test_script + - git checkout ${CI_COMMIT_REF_NAME} || echo "Using default branch..." # run test - python CIRunner.py -l $LOG_PATH -c $CONFIG_FILE -e $LOCAL_ENV_CONFIG_PATH -t $TEST_CASE_FILE_PATH -m $MODULE_UPDATE_FILE bin_path $APP_NAME $BIN_PATH @@ -380,7 +382,7 @@ check_doc_links: APP_NAME: "ut" TEST_CASE_FILE_PATH: "$CI_PROJECT_DIR/components/idf_test/unit_test" MODULE_UPDATE_FILE: "$CI_PROJECT_DIR/tools/unit-test-app/ModuleDefinition.yml" - + dependencies: - build_esp_idf_tests