From a6fd40d4fdf73777a23eeb9bda1b2efeac60af2f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 4 Aug 2015 11:11:20 +0900 Subject: [PATCH] update Chopstx and ADC driver --- ChangeLog | 7 +++++++ chopstx | 2 +- src/adc_stm32f103.c | 2 ++ src/sys.h | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d47fe4b..936cc97 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2015-08-04 Niibe Yutaka + + * src/adc_stm32f103.c: Update from NeuG 1.0.3. + + * chopstx: Update to 0.08. + * src/sys.h: Update. + 2015-08-03 Niibe Yutaka * test/features/steps.py (set_msg): Python3 fix. diff --git a/chopstx b/chopstx index 83486ef..218102c 160000 --- a/chopstx +++ b/chopstx @@ -1 +1 @@ -Subproject commit 83486efd5f7857e539c79ed9c947cec854468240 +Subproject commit 218102c5c4232876dd74ce537eb0f13fdd8701dc diff --git a/src/adc_stm32f103.c b/src/adc_stm32f103.c index 567df8d..ca766a7 100644 --- a/src/adc_stm32f103.c +++ b/src/adc_stm32f103.c @@ -169,6 +169,8 @@ get_adc_config (uint32_t config[4]) case BOARD_ID_MAPLE_MINI: case BOARD_ID_STM32_PRIMER2: case BOARD_ID_STM8S_DISCOVERY: + case BOARD_ID_ST_DONGLE: + case BOARD_ID_ST_NUCLEO_F103: default: config[0] = 0; config[1] = ADC_SMPR2_SMP_AN0(ADC_SAMPLE_1P5) diff --git a/src/sys.h b/src/sys.h index 3127341..370aa1c 100644 --- a/src/sys.h +++ b/src/sys.h @@ -7,6 +7,8 @@ #define BOARD_ID_STBEE 0x945c37e8 #define BOARD_ID_STM32_PRIMER2 0x21e5798d #define BOARD_ID_STM8S_DISCOVERY 0x2f0976bb +#define BOARD_ID_ST_DONGLE 0x2cd4e471 +#define BOARD_ID_ST_NUCLEO_F103 0x9b87c16d extern const uint8_t sys_version[8]; extern const uint32_t sys_board_id;