From: AceVest Date: Mon, 27 May 2019 01:12:50 +0000 (+0800) Subject: ... X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/doc/ChangeLog.html?a=commitdiff_plain;h=01e977c8ea96f43159168e833a387b12181467c8;p=acecode.git ... --- diff --git a/learn/doc/mac_bash_profile b/learn/doc/mac_bash_profile index beec5df..e123bb7 100644 --- a/learn/doc/mac_bash_profile +++ b/learn/doc/mac_bash_profile @@ -39,7 +39,6 @@ export PATH="/usr/local/opt/ncurses/bin:$PATH" export GREP_OPTIONS="--exclude-dir=\.svn" - # export LC_ALL LANG 解决ssh登录服务器，服务器报这个错 # -bash: warning: setlocale: LC_CTYPE: cannot change locale (UTF-8): No such file or directory export LC_ALL=zh_CN.UTF-8 diff --git a/learn/stm32/F103/.settings/language.settings.xml b/learn/stm32/F103/.settings/language.settings.xml index 5ccf38d..f90e2ce 100644 --- a/learn/stm32/F103/.settings/language.settings.xml +++ b/learn/stm32/F103/.settings/language.settings.xml @@ -5,7 +5,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/learn/stm32/F103/F103 Run.cfg b/learn/stm32/F103/F103 Run.cfg index 0dfaba6..0102e6a 100644 --- a/learn/stm32/F103/F103 Run.cfg +++ b/learn/stm32/F103/F103 Run.cfg @@ -1,16 +1,16 @@ -# This is an OneNetMini board with a single STM32F103C8Tx chip +# This is an genericBoard board with a single STM32F103C8Tx chip # # Generated by System Workbench for STM32 # Take care that such file, as generated, may be overridden without any early notice. Please have a look to debug launch configuration setup(s) -source [find interface/stlink.cfg] +source [find interface/stlink-tcp.cfg] set WORKAREASIZE 0x5000 transport select "hla_swd" set CHIPNAME STM32F103C8Tx -set BOARDNAME OneNetMini +set BOARDNAME genericBoard # CHIPNAMES state set CHIPNAME_CPU0_ACTIVATED 1 diff --git a/learn/stm32/F103/src/main.c b/learn/stm32/F103/src/main.c index 62a5b30..e87669d 100644 --- a/learn/stm32/F103/src/main.c +++ b/learn/stm32/F103/src/main.c @@ -11,16 +11,14 @@ #include "gpio.h" #include "rcc.h" - +#include "systick.h" unsigned int pin = 9; void SystemInit() { - InitSystemClock(); - // 使能时钟 RCCEnableGPIOBClock(); @@ -28,6 +26,8 @@ void SystemInit() { } void delay() { + Delay(); + return; int i=965536; while(i--); } diff --git a/learn/stm32/F103/src/rcc.c b/learn/stm32/F103/src/rcc.c index 2948ec5..eb48dd7 100644 --- a/learn/stm32/F103/src/rcc.c +++ b/learn/stm32/F103/src/rcc.c @@ -7,10 +7,6 @@ #include "rcc.h" -void __RCCEnableAPB2(uint32_t en) { - RCC->APB2ENR |= en; -} - #define RCC_CR_HSION 0x00000001 #define RCC_CR_HSIRDY 0x00000002 @@ -22,7 +18,14 @@ void __RCCEnableAPB2(uint32_t en) { #define RCC_CR_PLLRDY 0x02000000 -#define RCC_CFGR_HPRE_DIV_MASK 0x000000F0 + +#define RCC_CFGR_SW_MASK 0x00000003 +#define RCC_CFGR_SW_HSI 0x00000000 +#define RCC_CFGR_SW_HSE 0x00000001 +#define RCC_CFGR_SW_PLL 0x00000002 + + +#define RCC_CFGR_HPRE_MASK 0x000000F0 #define RCC_CFGR_HPRE_DIV1 0x00000000 #define RCC_CFGR_HPRE_DIV2 0x00000080 #define RCC_CFGR_HPRE_DIV4 0x00000090 @@ -34,80 +37,142 @@ void __RCCEnableAPB2(uint32_t en) { #define RCC_CFGR_HPRE_DIV512 0x000000F0 -#define RCC_CFGR_PPRE1_DIV_MASK 0x0000007FF +#define RCC_CFGR_PPRE1_MASK 0x000000700 #define RCC_CFGR_PPRE1_DIV1 0x00000000 #define RCC_CFGR_PPRE1_DIV2 0x00000400 #define RCC_CFGR_PPRE1_DIV4 0x00000500 #define RCC_CFGR_PPRE1_DIV8 0x00000600 #define RCC_CFGR_PPRE1_DIV16 0x00000700 -#define RCC_CFGR_PPRE2_DIV_MASK 0x000038FF +#define RCC_CFGR_PPRE2_MASK 0x00003800 #define RCC_CFGR_PPRE2_DIV1 0x00000000 #define RCC_CFGR_PPRE2_DIV2 0x00002000 #define RCC_CFGR_PPRE2_DIV4 0x00002800 #define RCC_CFGR_PPRE2_DIV8 0x00003000 #define RCC_CFGR_PPRE2_DIV16 0x00003800 -#define RCC_CFGR_PLLMULL_MASK 0x003C0000 -#define RCC_CFGR_PLLMULL_2 0x00000000 -#define RCC_CFGR_PLLMULL_3 0x00040000 -#define RCC_CFGR_PLLMULL_4 0x00080000 -#define RCC_CFGR_PLLMULL_5 0x000C0000 -#define RCC_CFGR_PLLMULL_6 0x00100000 -#define RCC_CFGR_PLLMULL_7 0x00140000 -#define RCC_CFGR_PLLMULL_8 0x00180000 -#define RCC_CFGR_PLLMULL_9 0x001C0000 -#define RCC_CFGR_PLLMULL_10 0x00200000 -#define RCC_CFGR_PLLMULL_11 0x00200000 -#define RCC_CFGR_PLLMULL_12 0x00280000 -#define RCC_CFGR_PLLMULL_13 0x002C0000 -#define RCC_CFGR_PLLMULL_14 0x00300000 -#define RCC_CFGR_PLLMULL_15 0x00340000 -#define RCC_CFGR_PLLMULL_16 0x00380000 +#define RCC_CFGR_ADCPRE_MASK 0x0000C000 +#define RCC_CFGR_ADCPRE_DIV2 0x00000000 +#define RCC_CFGR_ADCPRE_DIV4 0x00004000 +#define RCC_CFGR_ADCPRE_DIV6 0x00008000 +#define RCC_CFGR_ADCPRE_DIV8 0x0000C000 +#define RCC_CFGR_PLLSRC_MASK 0x00010000 +#define RCC_CFGR_PLLSRC_HSI 0x00000000 +#define RCC_CFGR_PLLSRC_HSE 0x00010000 #define RCC_CFGR_PLLXTYPE_MASK 0x00020000 #define RCC_CFGR_PLLXTYPE_HSE 0x00000000 #define RCC_CFGR_PLLXTYPE_HSE_HALF 0x00020000 -#define RCC_CFGR_PLLSRC_MASK 0x00010000 -#define RCC_CFGR_PLLSRC_HSI 0x00000000 -#define RCC_CFGR_PLLSRC_HSE 0x00010000 +#define RCC_CFGR_PLLMUL_MASK 0x003C0000 +#define RCC_CFGR_PLLMUL_2 0x00000000 +#define RCC_CFGR_PLLMUL_3 0x00040000 +#define RCC_CFGR_PLLMUL_4 0x00080000 +#define RCC_CFGR_PLLMUL_5 0x000C0000 +#define RCC_CFGR_PLLMUL_6 0x00100000 +#define RCC_CFGR_PLLMUL_7 0x00140000 +#define RCC_CFGR_PLLMUL_8 0x00180000 +#define RCC_CFGR_PLLMUL_9 0x001C0000 +#define RCC_CFGR_PLLMUL_10 0x00200000 +#define RCC_CFGR_PLLMUL_11 0x00200000 +#define RCC_CFGR_PLLMUL_12 0x00280000 +#define RCC_CFGR_PLLMUL_13 0x002C0000 +#define RCC_CFGR_PLLMUL_14 0x00300000 +#define RCC_CFGR_PLLMUL_15 0x00340000 +#define RCC_CFGR_PLLMUL_16 0x00380000 + +#define RCC_CFGR_USBPRE_MASK 0x00400000 +#define RCC_CFGR_USBPRE_DIV1_5 0x00000000 +#define RCC_CFGR_USBPRE_DIV1 0x00400000 + + +#define RCC_CFGR_MCO_MASK 0x07000000 +#define RCC_CFGR_MCO_NONE 0x00000000 +#define RCC_CFGR_MCO_SYSCLK 0x04000000 +#define RCC_CFGR_MCO_HSI 0x05000000 +#define RCC_CFGR_MCO_HSE 0x06000000 +#define RCC_CFGR_MCO_PLL_HALF 0x07000000 -#define RCC_CFGR_SW_MASK 0x00000003 -#define RCC_CFGR_SW_HSI 0x00000000 -#define RCC_CFGR_SW_HSE 0x00000001 -#define RCC_CFGR_SW_PLL 0x00000002 +#define HSE_STARTUP_TIMEOUT 0x500 +void InitFlashAcr(); +void SetSystemClock72MHz(); +void InitSystemClock() { -#define HSE_STARTUP_TIMEOUT 0x500 + InitFlashAcr(); + // 启动HSI + RCC->CR |= RCC_CR_HSION; -typedef struct -{ - volatile uint32_t ACR; - volatile uint32_t KEYR; - volatile uint32_t OPTKEYR; - volatile uint32_t SR; - volatile uint32_t CR; - volatile uint32_t AR; - volatile uint32_t RESERVED; - volatile uint32_t OBR; - volatile uint32_t WRPR; -} FLASH_t; + // SW： System Close Switch 重置为 HSI + RCC->CFGR &= ~RCC_CFGR_SW_MASK; + RCC->CFGR |= RCC_CFGR_SW_HSI; -#define FLASH_R_BASE (AHBPERIPH_BASE + 0x2000) -#define FLASH ((FLASH_t *) FLASH_R_BASE) -#define FLASH_ACR_LATENCY_2 ((uint8_t)0x02) -#define FLASH_ACR_PRFTBE ((uint8_t)0x10) -#define FLASH_ACR_LATENCY ((uint8_t)0x03) + // HPRE: AHB预分频设置为不分频，即SYSCLK->HCLK不被分频 + RCC->CFGR &= ~RCC_CFGR_HPRE_MASK; + RCC->CFGR |= RCC_CFGR_HPRE_DIV1; + + + // PPRE1: APB1预分频设置为不分频，即HCLK->PCLK1不被分频 + // 此处软件必需保证频率不能超过36MHz + RCC->CFGR &= ~RCC_CFGR_PPRE1_MASK; + RCC->CFGR |= RCC_CFGR_PPRE1_DIV2; + + // PPRE2: APB2预分频系数设置为不分频，即HCLK->PCLK2不被分频 + RCC->CFGR &= ~RCC_CFGR_PPRE2_MASK; + RCC->CFGR |= RCC_CFGR_PPRE2_DIV1; + + + // ADCPRE: ADC预分频系统设置为2分频,即PCLK2/2->ADCCLK + RCC->CFGR &= ~RCC_CFGR_ADCPRE_MASK; + RCC->CFGR |= RCC_CFGR_ADCPRE_DIV2; + + // MCO: Mironcontroller Clock Output 禁止时钟输出 + RCC->CFGR &= ~RCC_CFGR_MCO_MASK; + RCC->CFGR |= RCC_CFGR_MCO_NONE; + + // 关闭HSE + RCC->CR &= ~RCC_CR_HSEON; + + // 关闭CSS + RCC->CR &= ~RCC_CR_CSSON; + + // 关闭PLL + RCC->CR &= ~RCC_CR_PLLON; + + // External High Speed Clock Ready Flag + // 外部调整时钟没有旁路 + // 只有在HSE关闭的情况下，才能写入该位。 + RCC->CR &= ~RCC_CR_HSEBYP; + + // 后续三项设置需要在PLL关闭的情况下进行才有效 + // PLL Src 设置为 HSI经2分频后输入 + RCC->CFGR &= ~RCC_CFGR_PLLSRC_MASK; + RCC->CFGR |= RCC_CFGR_PLLSRC_HSI; + + // PLLXTYPE 设置为HSE不分频输入 + RCC->CFGR &= ~RCC_CFGR_PLLXTYPE_MASK; + RCC->CFGR |= RCC_CFGR_PLLXTYPE_HSE; + + // PLLMUL 倍频系数设置为 2 + RCC->CFGR &= ~RCC_CFGR_PLLMUL_MASK; + RCC->CFGR |= RCC_CFGR_PLLMUL_2; + + // USBPRE: USB预分频系数设置为1.5 + RCC->CFGR &= ~RCC_CFGR_USBPRE_MASK; + RCC->CFGR |= RCC_CFGR_USBPRE_DIV1_5; + + + SetSystemClock72MHz(); +} -void SetSystemClock72MHz() { +void SetSystemClock72MHz() { RCC->CR |= RCC_CR_HSEON; volatile uint32_t StartupCnt = 0; @@ -118,30 +183,25 @@ void SetSystemClock72MHz() { StartupCnt++; } while(Status == 0 && StartupCnt < HSE_STARTUP_TIMEOUT); + // 启动HSE失败 + if(Status == 0) { + return; + } // APB1 PRE - RCC->CFGR &= ~RCC_CFGR_PPRE1_DIV_MASK; + RCC->CFGR &= ~RCC_CFGR_PPRE1_MASK; RCC->CFGR |= RCC_CFGR_PPRE1_DIV2; // APB2 PRE - RCC->CFGR &= ~RCC_CFGR_PPRE2_DIV_MASK; + RCC->CFGR &= ~RCC_CFGR_PPRE2_MASK; RCC->CFGR |= RCC_CFGR_PPRE2_DIV1; - FLASH->ACR |= FLASH_ACR_PRFTBE; - FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY); - FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_2; - // 以下设置需要关闭PLL RCC->CR &= ~RCC_CR_PLLON; - // PLLMUL - RCC->CFGR &= ~RCC_CFGR_PLLMULL_MASK; - RCC->CFGR |= RCC_CFGR_PLLMULL_6; // OneNet Mini板上是接的12MHz晶振，所以倍数为6就能得到72MHz - - - // XTYPE: select HSE + // PLLXTYPE: select HSE RCC->CFGR &= ~RCC_CFGR_PLLXTYPE_MASK; RCC->CFGR |= RCC_CFGR_PLLXTYPE_HSE; @@ -149,70 +209,48 @@ void SetSystemClock72MHz() { RCC->CFGR &= ~RCC_CFGR_PLLSRC_MASK; RCC->CFGR |= RCC_CFGR_PLLSRC_HSE; + // PLLMUL + RCC->CFGR &= ~RCC_CFGR_PLLMUL_MASK; + RCC->CFGR |= RCC_CFGR_PLLMUL_6; // OneNet Mini板上是接的12MHz晶振，所以倍数为6就能得到72MHz + // SW: System Clock Switch RCC->CFGR &= ~RCC_CFGR_SW_MASK; RCC->CFGR |= RCC_CFGR_SW_PLL; - RCC->CR |= RCC_CR_PLLON; while(RCC->CR & RCC_CR_PLLON == 0) { } } -void InitSystemClock() { - SetSystemClock72MHz(); - return; - // 启动HSI - RCC->CR |= RCC_CR_HSION; - - // WAIT HSI - - // SW： System Close Switch 重置为 HSI - RCC->CFGR &= ~(0xF << 0); - - - // HPRE: AHB预分频设置为不分频，即SYSCLK->HCLK不被分频 - RCC->CFGR &= ~(0xF << 4); - - - // PPRE1: APB1预分频设置为不分频，即HCLK->PCLK1不被分频 - // 此处软件必需保证频率不能超过36MHz - RCC->CFGR &= ~(0x7 << 8); - - // PPRE2: APB2预分频系数设置为不分频，即HCLK->PCLK2不被分频 - RCC->CFGR &= ~(0x7 << 11); - // ADCPRE: ADC预分频系统设置为2分频,即PCLK2/2->ADCCLK - RCC->CFGR &= ~(0x3 << 14); - - // MCO: Mironcontroller Clock Output 禁止时钟输出 - RCC->CFGR &= ~(0x7 << 24); - - // 关闭HSE - RCC->CR &= ~RCC_CR_HSEON; - - // 关闭CSS - RCC->CR &= ~RCC_CR_CSSON; +void __RCCEnableAPB2(uint32_t en) { + RCC->APB2ENR |= en; +} - // 关闭PLL - RCC->CR &= ~RCC_CR_PLLON; - // External High Speed Clock Ready Flag - // 外部调整时钟没有旁路 - // 只有在外部4-16MHz振荡器关闭的情况下，才能写入该位。 - RCC->CR &= ~RCC_CR_HSEBYP; - // 后续三项设置需要在PLL关闭的情况下进行才有效 - // PLL Src 设置为 HSI经2分频后输入 - RCC->CFGR &= ~(0x1 << 16); +typedef struct +{ + volatile uint32_t ACR; + volatile uint32_t KEYR; + volatile uint32_t OPTKEYR; + volatile uint32_t SR; + volatile uint32_t CR; + volatile uint32_t AR; + volatile uint32_t RESERVED; + volatile uint32_t OBR; + volatile uint32_t WRPR; +} FLASH_t; - // PLLXTYPE 设置为HSE不分频输入 - RCC->CFGR &= ~(0x1 << 17); - //RCC->CFGR |= 0x1 << 17; - // PLLMUL 倍频系数设置为 2 - RCC->CFGR &= ~(0xF << 18); +#define FLASH_R_BASE (AHBPERIPH_BASE + 0x2000) +#define FLASH ((FLASH_t *) FLASH_R_BASE) +#define FLASH_ACR_LATENCY_2 ((uint8_t)0x02) +#define FLASH_ACR_PRFTBE ((uint8_t)0x10) +#define FLASH_ACR_LATENCY ((uint8_t)0x03) - // USBPRE: USB预分频系数设置为1.5 - RCC->CFGR &= (~0x1) << 22; +void InitFlashAcr() { + FLASH->ACR |= FLASH_ACR_PRFTBE; + FLASH->ACR &= (uint32_t)((uint32_t)~FLASH_ACR_LATENCY); + FLASH->ACR |= (uint32_t)FLASH_ACR_LATENCY_2; } diff --git a/learn/stm32/F103/src/stm32f103.h b/learn/stm32/F103/src/stm32f103.h index 5ddcb91..86ee573 100644 --- a/learn/stm32/F103/src/stm32f103.h +++ b/learn/stm32/F103/src/stm32f103.h @@ -24,8 +24,7 @@ #define GPIOD_BASE (APB2PERIPH_BASE+0x1400) #define GPIOE_BASE (APB2PERIPH_BASE+0x1800) -#define RCC_BASE (AHBPERIPH_BASE+0x1000) - +#define RCC_BASE (AHBPERIPH_BASE+0x1000) #endif /* STM32F103_H_ */ diff --git a/learn/stm32/F103/src/systick.c b/learn/stm32/F103/src/systick.c new file mode 100644 index 0000000..646efc6 --- /dev/null +++ b/learn/stm32/F103/src/systick.c @@ -0,0 +1,46 @@ +/* + * systick.c + * + * Created on: May 26, 2019 + * Author: ace + */ + + +#include "systick.h" + +#define SYSTICK_CTRL_COUNTFLAG_POS 16 +#define SYSTICK_CTRL_COUNTFLAG_MASK (1 << SYSTICK_CTRL_COUNTFLAG_POS) +#define SYSTICK_CTRL_COUNTFLAG_ENABLE (1 << SYSTICK_CTRL_COUNTFLAG_POS) + +#define SYSTICK_CTRL_CLKSOURCE_POS 2 +#define SYSTICK_CTRL_CLKSOURCE_MASK (1 << SYSTICK_CTRL_CLKSOURCE_POS) +#define SYSTICK_CTRL_CLKSOURCE_FCLK (1 << SYSTICK_CTRL_CLKSOURCE_POS) + +#define SYSTICK_CTRL_TICKINT_POS 1 +#define SYSTICK_CTRL_TICKINT_MASK (1 << SYSTICK_CTRL_TICKINT_POS) +#define SYSTICK_CTRL_TICKINT_ENABLE (1 << SYSTICK_CTRL_TICKINT_POS) + +#define SYSTICK_CTRL_ENABLE_POS 0 +#define SYSTICK_CTRL_ENABLE_MASK (1 << SYSTICK_CTRL_ENABLE_POS) +#define SYSTICK_CTRL_ENABLE (1 << SYSTICK_CTRL_ENABLE_POS) + +void Delay() { + SysTick->CTRL &= ~SYSTICK_CTRL_ENABLE_MASK; + SysTick->CTRL &= ~SYSTICK_CTRL_TICKINT_MASK; + SysTick->CTRL &= ~SYSTICK_CTRL_CLKSOURCE_MASK; + + + SysTick->LOAD = 9000*1000; // 1000ms + SysTick->VAL = 0; + + + SysTick->CTRL |= SYSTICK_CTRL_ENABLE; + + uint32_t t = 0; + do { + t = SysTick->CTRL; + } while(((t & SYSTICK_CTRL_ENABLE) != 0) && ((t & SYSTICK_CTRL_COUNTFLAG_ENABLE) == 0)); + + SysTick->VAL = 0; + SysTick->CTRL &= ~SYSTICK_CTRL_ENABLE_MASK; +} diff --git a/learn/stm32/F103/src/systick.h b/learn/stm32/F103/src/systick.h new file mode 100644 index 0000000..ac32069 --- /dev/null +++ b/learn/stm32/F103/src/systick.h @@ -0,0 +1,25 @@ +/* + * systick.h + * + * Created on: May 26, 2019 + * Author: ace + */ + +#ifndef SYSTICK_H_ +#define SYSTICK_H_ + + +#include "stm32f103.h" + +typedef struct { + volatile uint32_t CTRL; + volatile uint32_t LOAD; + volatile uint32_t VAL; + volatile uint32_t CALIB; +} SysTick_t; + +#define SysTick ((SysTick_t*) 0xE000E010) + + +void Delay(); +#endif /* SYSTICK_H_ */ diff --git a/tools/mcu/rdserial.go b/tools/mcu/rdserial.go new file mode 100644 index 0000000..612aa5e --- /dev/null +++ b/tools/mcu/rdserial.go @@ -0,0 +1,47 @@ +/* + * ------------------------------------------------------------------------ + * File Name: rdserial.go + * Author: Zhao Yanbai + * 2019-04-26 18:09:49 星期五 CST + * Description: none + * ------------------------------------------------------------------------ + */ + +package main + +import ( + "flag" + "fmt" + "github.com/tarm/serial" + "log" +) + +func main() { + var port string + var baud int + flag.StringVar(&port, "p", "/dev/cu.SLAB_USBtoUART", "serial port") + flag.IntVar(&baud, "b", 115200, "baud rate default 115200") + flag.Parse() + + log.Printf("port: %s\n", port) + + c := &serial.Config{Name: port, Baud: baud} + s, err := serial.OpenPort(c) + if err != nil { + log.Fatal(err) + } + + n, err := s.Write([]byte("test")) + if err != nil { + log.Fatal(err) + } + + for { + buf := make([]byte, 4096) + n, err = s.Read(buf) + if err != nil { + log.Fatal(err) + } + fmt.Printf("%s", string(buf[:n])) + } +}