From 580d25a84baaa160b0afdc096e9aa1e8ca1c2d2b Mon Sep 17 00:00:00 2001 From: Stephen Caudle Date: Mon, 31 Oct 2011 00:16:37 -0400 Subject: Move STM32 example projects in family specific folders --- .../stm32f1/other/adc_temperature_sensor/Makefile | 23 --- .../stm32f1/other/adc_temperature_sensor/README | 10 -- .../stm32f1/other/adc_temperature_sensor/adc.c | 155 --------------------- .../stm32f1/other/adc_temperature_sensor/adc.ld | 31 ----- 4 files changed, 219 deletions(-) delete mode 100644 examples/stm32f1/other/adc_temperature_sensor/Makefile delete mode 100644 examples/stm32f1/other/adc_temperature_sensor/README delete mode 100644 examples/stm32f1/other/adc_temperature_sensor/adc.c delete mode 100644 examples/stm32f1/other/adc_temperature_sensor/adc.ld (limited to 'examples/stm32f1/other/adc_temperature_sensor') diff --git a/examples/stm32f1/other/adc_temperature_sensor/Makefile b/examples/stm32f1/other/adc_temperature_sensor/Makefile deleted file mode 100644 index f3f65c4..0000000 --- a/examples/stm32f1/other/adc_temperature_sensor/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -## -## This file is part of the libopencm3 project. -## -## Copyright (C) 2009 Uwe Hermann -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## - -BINARY = adc - -include ../../Makefile.include - diff --git a/examples/stm32f1/other/adc_temperature_sensor/README b/examples/stm32f1/other/adc_temperature_sensor/README deleted file mode 100644 index aa00ef0..0000000 --- a/examples/stm32f1/other/adc_temperature_sensor/README +++ /dev/null @@ -1,10 +0,0 @@ ------------------------------------------------------------------------------- -README ------------------------------------------------------------------------------- - -This example program sends some characters on USART1. -Afterwards it read out the internal temperature sensor of the STM32 and -sends the value read out from the ADC to the USART1. - -The terminal settings for the receiving device/PC are 115200 8n1. - diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.c b/examples/stm32f1/other/adc_temperature_sensor/adc.c deleted file mode 100644 index a87909c..0000000 --- a/examples/stm32f1/other/adc_temperature_sensor/adc.c +++ /dev/null @@ -1,155 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Thomas Otto - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include -#include -#include -#include -#include - -void usart_setup(void) -{ - /* Enable clocks for GPIO port A (for GPIO_USART1_TX) and USART1. */ - rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); - rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_USART1EN); - - /* Setup GPIO pin GPIO_USART1_TX/GPIO9 on GPIO port A for transmit. */ - gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_50_MHZ, - GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_USART1_TX); - - /* Setup UART parameters. */ - usart_set_baudrate(USART1, 115200, rcc_ppre2_frequency); - usart_set_databits(USART1, 8); - usart_set_stopbits(USART1, USART_STOPBITS_1); - usart_set_mode(USART1, USART_MODE_TX_RX); - usart_set_parity(USART1, USART_PARITY_NONE); - usart_set_flow_control(USART1, USART_FLOWCONTROL_NONE); - - /* Finally enable the USART. */ - usart_enable(USART1); -} - -void gpio_setup(void) -{ - /* Enable GPIOB clock. */ - rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPBEN); - - /* Set GPIO6/7 (in GPIO port B) to 'output push-pull' for the LEDs. */ - gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ, - GPIO_CNF_OUTPUT_PUSHPULL, GPIO6); - gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_2_MHZ, - GPIO_CNF_OUTPUT_PUSHPULL, GPIO7); -} - -void adc_setup(void) -{ - int i; - - rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_ADC1EN); - - /* Make shure it doesn't run during config. */ - adc_off(ADC1); - - /* We configure everything for one single conversion. */ - adc_disable_scan_mode(ADC1); - adc_set_single_conversion_mode(ADC1); - adc_enable_discontinous_mode_regular(ADC1); - adc_disable_external_trigger_regular(ADC1); - adc_set_right_aligned(ADC1); - /* We want to read the temperature sensor, so we have to enable it. */ - adc_enable_temperature_sensor(ADC1); - adc_set_conversion_time_on_all_channels(ADC1, ADC_SMPR_SMP_28DOT5CYC); - - adc_on(ADC1); - - /* Wait for ADC starting up. */ - for (i = 0; i < 800000; i++) /* Wait a bit. */ - __asm__("nop"); - - adc_reset_calibration(ADC1); - adc_calibration(ADC1); -} - -void my_usart_print_int(u32 usart, int value) -{ - s8 i; - u8 nr_digits = 0; - char buffer[25]; - - if (value < 0) { - usart_send(usart, '-'); - value = value * -1; - } - - while (value > 0) { - buffer[nr_digits++] = "0123456789"[value % 10]; - value /= 10; - } - - for (i = nr_digits; i >= 0; i--) - usart_send(usart, buffer[i]); -} - -int main(void) -{ - u8 channel_array[16]; - u16 temperature; - - rcc_clock_setup_in_hse_16mhz_out_72mhz(); - gpio_setup(); - usart_setup(); - adc_setup(); - - gpio_clear(GPIOB, GPIO7); /* LED1 on */ - gpio_set(GPIOB, GPIO6); /* LED2 off */ - - /* Send a message on USART1. */ - usart_send(USART1, 's'); - usart_send(USART1, 't'); - usart_send(USART1, 'm'); - usart_send(USART1, '\r'); - usart_send(USART1, '\n'); - - /* Select the channel we want to convert. 16=temperature_sensor. */ - channel_array[0] = 16; - adc_set_regular_sequence(ADC1, 1, channel_array); - - /* - * If the ADC_CR2_ON bit is already set -> setting it another time - * starts the conversion. - */ - adc_on(ADC1); - - /* Wait for end of conversion. */ - while (!(ADC_SR(ADC1) & ADC_SR_EOC)); - - temperature = ADC_DR(ADC1); - - /* - * That's actually not the real temperature - you have to compute it - * as described in the datasheet. - */ - my_usart_print_int(USART1, temperature); - - gpio_clear(GPIOB, GPIO6); /* LED2 on */ - - while(1); /* Halt. */ - - return 0; -} diff --git a/examples/stm32f1/other/adc_temperature_sensor/adc.ld b/examples/stm32f1/other/adc_temperature_sensor/adc.ld deleted file mode 100644 index 4f609a8..0000000 --- a/examples/stm32f1/other/adc_temperature_sensor/adc.ld +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is part of the libopencm3 project. - * - * Copyright (C) 2010 Thomas Otto - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* Linker script for an STM32F103RBT6 board (128K flash, 20K RAM). */ - -/* Define memory regions. */ -MEMORY -{ - rom (rx) : ORIGIN = 0x08000000, LENGTH = 128K - ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K -} - -/* Include the common ld script. */ -INCLUDE libopencm3_stm32f1.ld - -- cgit v1.2.3