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 --- .../stm32/f1/other/adc_temperature_sensor/Makefile | 23 ++ .../stm32/f1/other/adc_temperature_sensor/README | 10 + .../stm32/f1/other/adc_temperature_sensor/adc.c | 155 +++++++++++ .../stm32/f1/other/adc_temperature_sensor/adc.ld | 31 +++ examples/stm32/f1/other/dma_mem2mem/Makefile | 23 ++ examples/stm32/f1/other/dma_mem2mem/README | 11 + examples/stm32/f1/other/dma_mem2mem/dma.c | 133 ++++++++++ examples/stm32/f1/other/dma_mem2mem/dma.ld | 31 +++ examples/stm32/f1/other/dogm128/Makefile | 25 ++ examples/stm32/f1/other/dogm128/README | 7 + examples/stm32/f1/other/dogm128/dogm128.c | 291 +++++++++++++++++++++ examples/stm32/f1/other/dogm128/dogm128.h | 86 ++++++ examples/stm32/f1/other/dogm128/main.c | 110 ++++++++ examples/stm32/f1/other/dogm128/main.ld | 31 +++ examples/stm32/f1/other/i2c_stts75_sensor/Makefile | 25 ++ examples/stm32/f1/other/i2c_stts75_sensor/README | 13 + .../f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c | 146 +++++++++++ .../other/i2c_stts75_sensor/i2c_stts75_sensor.ld | 31 +++ examples/stm32/f1/other/i2c_stts75_sensor/stts75.c | 186 +++++++++++++ examples/stm32/f1/other/i2c_stts75_sensor/stts75.h | 39 +++ examples/stm32/f1/other/rtc/Makefile | 23 ++ examples/stm32/f1/other/rtc/README | 6 + examples/stm32/f1/other/rtc/rtc.c | 116 ++++++++ examples/stm32/f1/other/rtc/rtc.ld | 31 +++ examples/stm32/f1/other/systick/Makefile | 23 ++ examples/stm32/f1/other/systick/README | 7 + examples/stm32/f1/other/systick/systick.c | 75 ++++++ examples/stm32/f1/other/systick/systick.ld | 31 +++ examples/stm32/f1/other/timer_interrupt/Makefile | 23 ++ examples/stm32/f1/other/timer_interrupt/README | 7 + examples/stm32/f1/other/timer_interrupt/timer.c | 85 ++++++ examples/stm32/f1/other/timer_interrupt/timer.ld | 31 +++ examples/stm32/f1/other/usb_cdcacm/Makefile | 23 ++ examples/stm32/f1/other/usb_cdcacm/README | 7 + examples/stm32/f1/other/usb_cdcacm/cdcacm.c | 245 +++++++++++++++++ examples/stm32/f1/other/usb_cdcacm/cdcacm.ld | 29 ++ examples/stm32/f1/other/usb_dfu/Makefile | 23 ++ examples/stm32/f1/other/usb_dfu/README | 7 + examples/stm32/f1/other/usb_dfu/usbdfu.c | 270 +++++++++++++++++++ examples/stm32/f1/other/usb_dfu/usbdfu.ld | 29 ++ examples/stm32/f1/other/usb_hid/Makefile | 23 ++ examples/stm32/f1/other/usb_hid/README | 7 + examples/stm32/f1/other/usb_hid/usbhid.c | 272 +++++++++++++++++++ examples/stm32/f1/other/usb_hid/usbhid.ld | 29 ++ 44 files changed, 2829 insertions(+) create mode 100644 examples/stm32/f1/other/adc_temperature_sensor/Makefile create mode 100644 examples/stm32/f1/other/adc_temperature_sensor/README create mode 100644 examples/stm32/f1/other/adc_temperature_sensor/adc.c create mode 100644 examples/stm32/f1/other/adc_temperature_sensor/adc.ld create mode 100644 examples/stm32/f1/other/dma_mem2mem/Makefile create mode 100644 examples/stm32/f1/other/dma_mem2mem/README create mode 100644 examples/stm32/f1/other/dma_mem2mem/dma.c create mode 100644 examples/stm32/f1/other/dma_mem2mem/dma.ld create mode 100644 examples/stm32/f1/other/dogm128/Makefile create mode 100644 examples/stm32/f1/other/dogm128/README create mode 100644 examples/stm32/f1/other/dogm128/dogm128.c create mode 100644 examples/stm32/f1/other/dogm128/dogm128.h create mode 100644 examples/stm32/f1/other/dogm128/main.c create mode 100644 examples/stm32/f1/other/dogm128/main.ld create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/Makefile create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/README create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/stts75.c create mode 100644 examples/stm32/f1/other/i2c_stts75_sensor/stts75.h create mode 100644 examples/stm32/f1/other/rtc/Makefile create mode 100644 examples/stm32/f1/other/rtc/README create mode 100644 examples/stm32/f1/other/rtc/rtc.c create mode 100644 examples/stm32/f1/other/rtc/rtc.ld create mode 100644 examples/stm32/f1/other/systick/Makefile create mode 100644 examples/stm32/f1/other/systick/README create mode 100644 examples/stm32/f1/other/systick/systick.c create mode 100644 examples/stm32/f1/other/systick/systick.ld create mode 100644 examples/stm32/f1/other/timer_interrupt/Makefile create mode 100644 examples/stm32/f1/other/timer_interrupt/README create mode 100644 examples/stm32/f1/other/timer_interrupt/timer.c create mode 100644 examples/stm32/f1/other/timer_interrupt/timer.ld create mode 100644 examples/stm32/f1/other/usb_cdcacm/Makefile create mode 100644 examples/stm32/f1/other/usb_cdcacm/README create mode 100644 examples/stm32/f1/other/usb_cdcacm/cdcacm.c create mode 100644 examples/stm32/f1/other/usb_cdcacm/cdcacm.ld create mode 100644 examples/stm32/f1/other/usb_dfu/Makefile create mode 100644 examples/stm32/f1/other/usb_dfu/README create mode 100644 examples/stm32/f1/other/usb_dfu/usbdfu.c create mode 100644 examples/stm32/f1/other/usb_dfu/usbdfu.ld create mode 100644 examples/stm32/f1/other/usb_hid/Makefile create mode 100644 examples/stm32/f1/other/usb_hid/README create mode 100644 examples/stm32/f1/other/usb_hid/usbhid.c create mode 100644 examples/stm32/f1/other/usb_hid/usbhid.ld (limited to 'examples/stm32/f1/other') diff --git a/examples/stm32/f1/other/adc_temperature_sensor/Makefile b/examples/stm32/f1/other/adc_temperature_sensor/Makefile new file mode 100644 index 0000000..f3f65c4 --- /dev/null +++ b/examples/stm32/f1/other/adc_temperature_sensor/Makefile @@ -0,0 +1,23 @@ +## +## 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/stm32/f1/other/adc_temperature_sensor/README b/examples/stm32/f1/other/adc_temperature_sensor/README new file mode 100644 index 0000000..aa00ef0 --- /dev/null +++ b/examples/stm32/f1/other/adc_temperature_sensor/README @@ -0,0 +1,10 @@ +------------------------------------------------------------------------------ +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/stm32/f1/other/adc_temperature_sensor/adc.c b/examples/stm32/f1/other/adc_temperature_sensor/adc.c new file mode 100644 index 0000000..a87909c --- /dev/null +++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.c @@ -0,0 +1,155 @@ +/* + * 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/stm32/f1/other/adc_temperature_sensor/adc.ld b/examples/stm32/f1/other/adc_temperature_sensor/adc.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/adc_temperature_sensor/adc.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/dma_mem2mem/Makefile b/examples/stm32/f1/other/dma_mem2mem/Makefile new file mode 100644 index 0000000..c43650d --- /dev/null +++ b/examples/stm32/f1/other/dma_mem2mem/Makefile @@ -0,0 +1,23 @@ +## +## 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 = dma + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/dma_mem2mem/README b/examples/stm32/f1/other/dma_mem2mem/README new file mode 100644 index 0000000..2e61e5a --- /dev/null +++ b/examples/stm32/f1/other/dma_mem2mem/README @@ -0,0 +1,11 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This program demonstrates a little DMA MEM2MEM transfer. A string is send out +to USART1 and afterwards copied by DMA to another memory location. To check +if the transfer was successful we send the destination string also out to +USART1. + +The terminal settings for the receiving device/PC are 115200 8n1. + diff --git a/examples/stm32/f1/other/dma_mem2mem/dma.c b/examples/stm32/f1/other/dma_mem2mem/dma.c new file mode 100644 index 0000000..0389412 --- /dev/null +++ b/examples/stm32/f1/other/dma_mem2mem/dma.c @@ -0,0 +1,133 @@ +/* + * 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 my_usart_print_string(u32 usart, char * s) +{ + while (*s != 0) { + usart_send(usart, *s); + s++; + } +} + +int main(void) +{ + /* Exactly 20 bytes including '0' at the end. + We want to transfer 32bit * 5 so it should fit */ + char s1[20] = "Hello STM MEM2MEM\r\n"; + char s2[20]; + + rcc_clock_setup_in_hse_16mhz_out_72mhz(); + gpio_setup(); + usart_setup(); + + gpio_clear(GPIOB, GPIO7); /* LED1 on */ + gpio_set(GPIOB, GPIO6); /* LED2 off */ + + my_usart_print_string(USART1, "s1 "); + my_usart_print_string(USART1, s1); + + rcc_peripheral_enable_clock(&RCC_AHBENR, RCC_AHBENR_DMA1EN); + + /* MEM2MEM mode for channel 1. */ + dma_enable_mem2mem_mode(DMA1, DMA_CHANNEL1); + + /* Highest priority. */ + dma_set_priority(DMA1, DMA_CHANNEL1, DMA_CCR1_PL_VERY_HIGH); + + /* 32Bit wide transfer for source and destination. */ + dma_set_memory_size(DMA1, DMA_CHANNEL1, DMA_CCR1_MSIZE_32BIT); + dma_set_peripheral_size(DMA1, DMA_CHANNEL1, DMA_CCR1_PSIZE_32BIT); + + /* After each 32Bit we have to increase the addres because we use RAM. */ + dma_enable_memory_increment_mode(DMA1, DMA_CHANNEL1); + dma_enable_peripheral_increment_mode(DMA1, DMA_CHANNEL1); + + /* We define the source as peripheral. */ + dma_set_read_from_peripheral(DMA1, DMA_CHANNEL1); + + /* We want to transfer string s1. */ + dma_set_peripheral_address(DMA1, DMA_CHANNEL1, (u32) &s1); + + /* Destination should be string s2. */ + dma_set_memory_address(DMA1, DMA_CHANNEL1, (u32) &s2); + + /* Set number of DATA to transfer. + Remember that this means not necessary bytes but MSIZE or PSIZE + depending from your source device. */ + dma_set_number_of_data(DMA1, DMA_CHANNEL1, 5); + + /* Start DMA transfer. */ + dma_enable_channel(DMA1, DMA_CHANNEL1); + + /* TODO: write a function to get the interrupt flags. */ + while(!(DMA_ISR(DMA1) & 0x0000001)) + { + } + + dma_disable_channel(DMA1, DMA_CHANNEL1); + + /* String s1 should now already be transferred to s2. */ + my_usart_print_string(USART1, "s2 "); + my_usart_print_string(USART1, s2); + + gpio_clear(GPIOB, GPIO6); /* LED2 on */ + while(1); /* Halt. */ + + return 0; +} diff --git a/examples/stm32/f1/other/dma_mem2mem/dma.ld b/examples/stm32/f1/other/dma_mem2mem/dma.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/dma_mem2mem/dma.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/dogm128/Makefile b/examples/stm32/f1/other/dogm128/Makefile new file mode 100644 index 0000000..97a012e --- /dev/null +++ b/examples/stm32/f1/other/dogm128/Makefile @@ -0,0 +1,25 @@ +## +## 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 = main + +OBJS = dogm128.o + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/dogm128/README b/examples/stm32/f1/other/dogm128/README new file mode 100644 index 0000000..dbf82a0 --- /dev/null +++ b/examples/stm32/f1/other/dogm128/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example program writes some text on an DOGM128 LCD display connected +to SPI2. + diff --git a/examples/stm32/f1/other/dogm128/dogm128.c b/examples/stm32/f1/other/dogm128/dogm128.c new file mode 100644 index 0000000..c78a275 --- /dev/null +++ b/examples/stm32/f1/other/dogm128/dogm128.c @@ -0,0 +1,291 @@ +/* + * 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 "./dogm128.h" + +u8 dogm128_ram[1024]; +u8 dogm128_cursor_x; +u8 dogm128_cursor_y; + +void dogm128_send_command(u8 command) +{ + u32 counter; + + gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for commands */ + spi_send(DOGM128_SPI, command); + + for (counter = 0; counter<=500; counter++) /* wait */ + {} +} + +void dogm128_send_data(u8 data) +{ + u32 counter; + + gpio_set(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 high for data */ + spi_send(DOGM128_SPI, data); + + for (counter = 0; counter<=500; counter++) /* wait */ + {} +} + +void dogm128_init() +{ + u32 counter; + + /* reset the display */ + gpio_clear(DOGM128_RESET_PORT, DOGM128_RESET_PIN); /* reset low for dogm128 */ + for (counter = 0; counter<=60000; counter++) /* wait */ + {} + gpio_set(DOGM128_RESET_PORT, DOGM128_RESET_PIN); /* reset high for dogm128 */ + + for (counter = 0; counter<=60000; counter++) /* wait */ + {} + + gpio_clear(DOGM128_A0_PORT, DOGM128_A0_PIN); /* A0 low for init */ + + /* tell the display that we want to start */ + spi_set_nss_low(DOGM128_SPI); + + /* init sequence */ + dogm128_send_command(DOGM128_DISPLAY_START_ADDRESS_BASE + 0); + dogm128_send_command(DOGM128_ADC_REVERSE); + dogm128_send_command(DOGM128_COM_OUTPUT_SCAN_NORMAL); + dogm128_send_command(DOGM128_DISPLAY_NORMAL); + dogm128_send_command(DOGM128_BIAS_19); + dogm128_send_command(DOGM128_POWER_CONTROL_BASE + 0x07); + dogm128_send_command(DOGM128_BOOSTER_RATIO_SET); + dogm128_send_command(0x00); /* Booster x4 */ + dogm128_send_command(DOGM128_V0_OUTPUT_RESISTOR_BASE + 0x07); + dogm128_send_command(DOGM128_ELECTRONIC_VOLUME_MODE_SET); + dogm128_send_command(0x16); /* Contrast */ + dogm128_send_command(DOGM128_STATIC_INDICATOR_OFF); + dogm128_send_command(0x00); /* Flashing OFF */ + dogm128_send_command(DOGM128_DISPLAY_ON); + + /* end transfer */ + spi_set_nss_high(DOGM128_SPI); +} + +void dogm128_print_char(u8 data) +{ + u8 i; + u8 page; + u8 shift; + u8 xcoord; + u8 ycoord; + + xcoord = dogm128_cursor_x; + ycoord = dogm128_cursor_y; + + page = (63 - ycoord) / 8; /* the display consists of 8 lines a 8 dots each. */ + shift = (7 -((63 - ycoord) % 8)); /* vertical shift */ + + /* font is 8x5 so iterate each column of the character */ + for (i = 0; i <= 5; i++) { + /* right border reached? */ + if ((xcoord + i) > 127) + return; + dogm128_cursor_x++; + + /* 0xAA = end of character - no dots in this line */ + if (dogm128_font[data - 0x20][i] == 0xAA) { + dogm128_ram[(page * 128) + xcoord + i] &= ~(0xFF >> shift); /* clear area */ + if ((shift > 0) && (page > 0)) + dogm128_ram[((page - 1) * 128) + xcoord + i] &= ~(0xFF << (8 - shift)); /* clear area */ + return; + } + + /* lower part */ + dogm128_ram[(page * 128) + xcoord + i] &= ~(0xFF >> shift); /* clear area */ + dogm128_ram[(page * 128) + xcoord + i] = (dogm128_font[data - 0x20][i] >> shift); + /* higher part if needed */ + if ((shift > 0) && (page > 0)) { + dogm128_ram[((page - 1) * 128) + xcoord + i] &= ~(0xFF << (8 - shift)); /* clear area */ + dogm128_ram[((page - 1) * 128) + xcoord + i] = (dogm128_font[data - 0x20][i] << (8 - shift)); + } + } +} + +void dogm128_set_cursor(u8 xcoord, u8 ycoord) +{ + dogm128_cursor_x = xcoord; + dogm128_cursor_y = ycoord; +} + +void dogm128_print_string(char * s) +{ + while (*s != 0) { + dogm128_print_char(*s); + s++; + } +} + +void dogm128_set_dot(u8 xcoord, u8 ycoord) +{ + dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] |= (1 << ((63 - ycoord) % 8)); +} + +void dogm128_clear_dot(u8 xcoord, u8 ycoord) +{ + dogm128_ram[(((63 - ycoord) / 8) * 128) + xcoord] &= ~(1 << ((63 - ycoord) % 8)); +} + +void dogm128_update_display() +{ + u8 page; + u8 column; + + /* tell the display that we want to start */ + spi_set_nss_low(DOGM128_SPI); + + for (page = 0; page <= 7; page++) { + dogm128_send_command(0xB0 + page); /* set page */ + dogm128_send_command(0x10); /* set column upper address to 0 */ + dogm128_send_command(0x00); /* set column lower address to 0 */ + + for (column = 0; column <= 127; column++) { + dogm128_send_data(dogm128_ram[(page * 128) + column]); + } + } + + spi_set_nss_high(DOGM128_SPI); +} + +void dogm128_clear() +{ + u16 i; + + for (i = 0; i<=1023; i++) { + dogm128_ram[i] = 0; + } + dogm128_update_display(); +} + +/* This is a non-monospace font definition (upside down for better handling). + * 0xAA is the end of the character so its not space efficient in your memory, but on your display. + * We are starting with " " as the first printable character at 0x20, so we have to substract 0x20 later. + * Its the only defined to 127/0x7F so if you have german umlauts or other special characters from above + * you have to expand this definition a little bit. */ + +const u8 dogm128_font[96][6] = { + + /* 20 SPACE */ {0x00, 0x00, 0x00, 0xAA, 0xAA, 0xAA}, + /* 21 ! */ {0x5E, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 22 " */ {0x66, 0x00, 0x66, 0xAA, 0xAA, 0xAA}, + /* 23 # */ {0x28, 0x7C, 0x28, 0x7C, 0x28, 0xAA}, + /* 24 $ */ {0x24, 0x2A, 0x7F, 0x2A, 0x10, 0xAA}, + /* 25 % */ {0x62, 0x18, 0x46, 0xAA, 0xAA, 0xAA}, + /* 26 & */ {0x30, 0x4C, 0x5A, 0x24, 0x50, 0xAA}, + /* 27 ' */ {0x06, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 28 ( */ {0x3E, 0x41, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 29 ) */ {0x41, 0x3E, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 2A * */ {0x28, 0x10, 0x7C, 0x10, 0x28, 0xAA}, + /* 2B + */ {0x10, 0x38, 0x10, 0xAA, 0xAA, 0xAA}, + /* 2C , */ {0xC0, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 2D - */ {0x10, 0x10, 0x10, 0xAA, 0xAA, 0xAA}, + /* 2E . */ {0x40, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 2F / */ {0x60, 0x18, 0x06, 0xAA, 0xAA, 0xAA}, + + /* 30 0 */ {0x3C, 0x42, 0x42, 0x3C, 0xAA, 0xAA}, + /* 31 1 */ {0x44, 0x7E, 0x40, 0xAA, 0xAA, 0xAA}, + /* 32 2 */ {0x44, 0x62, 0x52, 0x4C, 0xAA, 0xAA}, + /* 33 3 */ {0x4A, 0x4A, 0x34, 0xAA, 0xAA, 0xAA}, + /* 34 4 */ {0x1E, 0x10, 0x78, 0x10, 0xAA, 0xAA}, + /* 35 5 */ {0x4E, 0x4A, 0x32, 0xAA, 0xAA, 0xAA}, + /* 36 6 */ {0x3C, 0x4A, 0x4A, 0x30, 0xAA, 0xAA}, + /* 37 7 */ {0x62, 0x12, 0x0E, 0xAA, 0xAA, 0xAA}, + /* 38 8 */ {0x34, 0x4A, 0x4A, 0x34, 0xAA, 0xAA}, + /* 39 9 */ {0x0C, 0x52, 0x52, 0x3C, 0xAA, 0xAA}, + /* 3A : */ {0x28, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 3B ; */ {0xC8, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 3C < */ {0x10, 0x28, 0x44, 0xAA, 0xAA, 0xAA}, + /* 3D = */ {0x28, 0x28, 0x28, 0xAA, 0xAA, 0xAA}, + /* 3E > */ {0x44, 0x28, 0x10, 0xAA, 0xAA, 0xAA}, + /* 3F ? */ {0x02, 0x52, 0x0C, 0xAA, 0xAA, 0xAA}, + + /* 40 @ */ {0x3C, 0x42, 0x12, 0x2A, 0x3C, 0xAA}, + /* 41 A */ {0x7C, 0x12, 0x12, 0x7C, 0xAA, 0xAA}, + /* 42 B */ {0x7E, 0x4A, 0x4A, 0x34, 0xAA, 0xAA}, + /* 43 C */ {0x3C, 0x42, 0x42, 0x24, 0xAA, 0xAA}, + /* 44 D */ {0x7E, 0x42, 0x42, 0x3C, 0xAA, 0xAA}, + /* 45 E */ {0x7E, 0x4A, 0x4A, 0xAA, 0xAA, 0xAA}, + /* 46 F */ {0x7E, 0x0A, 0x0A, 0xAA, 0xAA, 0xAA}, + /* 47 G */ {0x3C, 0x42, 0x52, 0x34, 0xAA, 0xAA}, + /* 48 H */ {0x7E, 0x08, 0x08, 0x7E, 0xAA, 0xAA}, + /* 49 I */ {0x42, 0x7E, 0x42, 0xAA, 0xAA, 0xAA}, + /* 4A J */ {0x42, 0x42, 0x3E, 0xAA, 0xAA, 0xAA}, + /* 4B K */ {0x7E, 0x08, 0x14, 0x62, 0xAA, 0xAA}, + /* 4C L */ {0x7E, 0x40, 0x40, 0xAA, 0xAA, 0xAA}, + /* 4D M */ {0x7E, 0x04, 0x08, 0x04, 0x7E, 0xAA}, + /* 4E N */ {0x7E, 0x04, 0x18, 0x20, 0x7E, 0xAA}, + /* 4F O */ {0x3C, 0x42, 0x42, 0x3C, 0xAA, 0xAA}, + + /* 50 P */ {0x7E, 0x12, 0x12, 0x0C, 0xAA, 0xAA}, + /* 51 Q */ {0x3C, 0x42, 0x42, 0xBC, 0xAA, 0xAA}, + /* 52 R */ {0x7E, 0x12, 0x12, 0x6C, 0xAA, 0xAA}, + /* 53 S */ {0x44, 0x4A, 0x4A, 0x30, 0xAA, 0xAA}, + /* 54 T */ {0x02, 0x7E, 0x02, 0xAA, 0xAA, 0xAA}, + /* 55 U */ {0x3E, 0x40, 0x40, 0x3E, 0xAA, 0xAA}, + /* 56 V */ {0x06, 0x18, 0x60, 0x18, 0x06, 0xAA}, + /* 57 W */ {0x3E, 0x40, 0x3E, 0x40, 0x3E, 0xAA}, + /* 58 X */ {0x42, 0x24, 0x18, 0x24, 0x42, 0xAA}, + /* 59 Y */ {0x9E, 0xA0, 0xA0, 0x7E, 0xAA, 0xAA}, + /* 5A Z */ {0x62, 0x52, 0x4A, 0x46, 0xAA, 0xAA}, + /* 5B [ */ {0x7E, 0x42, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 5C \ */ {0x06, 0x18, 0x60, 0xAA, 0xAA, 0xAA}, + /* 5D ] */ {0x42, 0x7E, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 5E ^ */ {0x04, 0x02, 0x04, 0xAA, 0xAA, 0xAA}, + /* 5F _ */ {0x40, 0x40, 0x40, 0xAA, 0xAA, 0xAA}, + + /* 60 ` */ {0x02, 0x04, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 61 a */ {0x20, 0x54, 0x54, 0x78, 0xAA, 0xAA}, + /* 62 b */ {0x7E, 0x44, 0x44, 0x38, 0xAA, 0xAA}, + /* 63 c */ {0x38, 0x44, 0x44, 0x28, 0xAA, 0xAA}, + /* 64 d */ {0x38, 0x44, 0x44, 0x7E, 0xAA, 0xAA}, + /* 65 e */ {0x38, 0x54, 0x54, 0x58, 0xAA, 0xAA}, + /* 66 f */ {0x7C, 0x0A, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 67 g */ {0x98, 0xA4, 0xA4, 0x7C, 0xAA, 0xAA}, + /* 68 h */ {0x7E, 0x04, 0x04, 0x78, 0xAA, 0xAA}, + /* 69 i */ {0x7A, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 6A j */ {0x40, 0x3A, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 6B k */ {0x7E, 0x10, 0x28, 0x44, 0xAA, 0xAA}, + /* 6C l */ {0x7E, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 6D m */ {0x7C, 0x04, 0x78, 0x04, 0x78, 0xAA}, + /* 6E n */ {0x7C, 0x04, 0x04, 0x78, 0xAA, 0xAA}, + /* 6F o */ {0x38, 0x44, 0x44, 0x38, 0xAA, 0xAA}, + + /* 70 p */ {0xFC, 0x24, 0x24, 0x18, 0xAA, 0xAA}, + /* 71 q */ {0x18, 0x24, 0x24, 0xFC, 0xAA, 0xAA}, + /* 72 r */ {0x78, 0x04, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 73 s */ {0x48, 0x54, 0x54, 0x20, 0xAA, 0xAA}, + /* 74 t */ {0x04, 0x3E, 0x44, 0xAA, 0xAA, 0xAA}, + /* 75 u */ {0x3C, 0x40, 0x40, 0x3C, 0xAA, 0xAA}, + /* 76 v */ {0x0C, 0x30, 0x40, 0x30, 0x0C, 0xAA}, + /* 77 w */ {0x3C, 0x40, 0x3C, 0x40, 0x3C, 0xAA}, + /* 78 x */ {0x44, 0x28, 0x10, 0x28, 0x44, 0xAA}, + /* 79 y */ {0x1C, 0xA0, 0xA0, 0x7C, 0xAA, 0xAA}, + /* 7A z */ {0x64, 0x54, 0x4C, 0xAA, 0xAA, 0xAA}, + /* 7B { */ {0x08, 0x36, 0x41, 0xAA, 0xAA, 0xAA}, + /* 7C | */ {0x7E, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA}, + /* 7D } */ {0x41, 0x36, 0x08, 0xAA, 0xAA, 0xAA}, + /* 7E ~ */ {0x20, 0x10, 0x20, 0x10, 0xAA, 0xAA}, + /* 7F DEL */ {0xAA, 0xAA, 0xAA, 0xAA, 0xAA, 0xAA} +}; + diff --git a/examples/stm32/f1/other/dogm128/dogm128.h b/examples/stm32/f1/other/dogm128/dogm128.h new file mode 100644 index 0000000..de43225 --- /dev/null +++ b/examples/stm32/f1/other/dogm128/dogm128.h @@ -0,0 +1,86 @@ +/* + * 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 . + */ + +#ifndef DOGM128_H +#define DOGM128_H + +#include +#include +#include + +/* PB10 GPIO - ~RESET + * PB12 SPI2_NSS - ~CS1 + * PB13 SPI2_SCK - SCL + * PB14 SPI2_MISO - A0 + * PB15 SPI2_MOSI - SI */ + +#define DOGM128_SPI SPI2 +#define DOGM128_RESET_PIN GPIO10 +#define DOGM128_RESET_PORT GPIOB +#define DOGM128_A0_PIN GPIO14 +#define DOGM128_A0_PORT GPIOB + +/* DOGM128 display commands */ +#define DOGM128_PAGE_BASE 0xB0 +#define DOGM128_PAGE0 0xB0 +#define DOGM128_PAGE1 0xB1 +#define DOGM128_PAGE2 0xB2 +#define DOGM128_PAGE3 0xB3 +#define DOGM128_PAGE4 0xB4 +#define DOGM128_PAGE5 0xB5 +#define DOGM128_PAGE6 0xB6 +#define DOGM128_PAGE7 0xB7 +#define DOGM128_DISPLAY_ON 0xAF +#define DOGM128_DISPLAY_OFF 0xAE +#define DOGM128_DISPLAY_START_ADDRESS_BASE 0x40 +#define DOGM128_ADC_NORMAL 0xA0 +#define DOGM128_ADC_REVERSE 0xA1 +#define DOGM128_DISPLAY_NORMAL 0xA6 +#define DOGM128_DISPLAY_REVERSE 0xA7 +#define DOGM128_ALL_POINTS_ON 0xA5 +#define DOGM128_ALL_POINTS_OFF 0xA4 +#define DOGM128_BIAS_19 0xA2 +#define DOGM128_BIAS_17 0xA3 +#define DOGM128_INTERNAL_RESET 0xE2 +#define DOGM128_COM_OUTPUT_SCAN_NORMAL 0xC0 +#define DOGM128_COM_OUTPUT_SCAN_REVERSE 0xC8 +#define DOGM128_POWER_CONTROL_BASE 0x28 +#define DOGM128_V0_OUTPUT_RESISTOR_BASE 0x20 +#define DOGM128_ELECTRONIC_VOLUME_MODE_SET 0x81 +#define DOGM128_STATIC_INDICATOR_OFF 0xAC +#define DOGM128_STATIC_INDICATOR_ON 0xAD +#define DOGM128_BOOSTER_RATIO_SET 0xF8 + +extern const u8 dogm128_font[96][6]; +extern u8 dogm128_ram[1024]; +extern u8 dogm128_cursor_x; +extern u8 dogm128_cursor_y; + +void dogm128_send_command(u8 command); +void dogm128_set_cursor(u8 xcoord, u8 ycoord); +void dogm128_print_char(u8 data); +void dogm128_print_string(char * s); +void dogm128_set_dot(u8 xcoord, u8 ycoord); +void dogm128_clear_dot(u8 xcoord, u8 ycoord); +void dogm128_send_data(u8 data); +void dogm128_init(); +void dogm128_update_display(); +void dogm128_clear(); + +#endif diff --git a/examples/stm32/f1/other/dogm128/main.c b/examples/stm32/f1/other/dogm128/main.c new file mode 100644 index 0000000..508971e --- /dev/null +++ b/examples/stm32/f1/other/dogm128/main.c @@ -0,0 +1,110 @@ +/* + * 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 +#include +#include +#include "./dogm128.h" + +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); + + /* A0 of DOGM128 */ + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO14); + /*reset of DOGM128 */ + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO10); + + /* DOGM128/SPI2 clock and MOSI and NSS(CS1) */ + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO12); + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO13); + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO15); +} + +void spi_setup() +{ + /* the DOGM128 display is connected to SPI2, so initialise it correctly */ + + rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN); + + spi_set_unidirectional_mode(DOGM128_SPI); /* we want to send only */ + spi_disable_crc(DOGM128_SPI); /* no CRC for this slave */ + spi_set_dff_8bit(DOGM128_SPI); /* 8-bit dataword-length */ + spi_set_full_duplex_mode(DOGM128_SPI); /* not receive-only */ + spi_enable_software_slave_management(DOGM128_SPI); /* we want to handle the CS signal in software */ + spi_set_nss_high(DOGM128_SPI); + spi_set_baudrate_prescaler(DOGM128_SPI, SPI_CR1_BR_FPCLK_DIV_256); /* PCLOCK/256 as clock */ + spi_set_master_mode(DOGM128_SPI); /* we want to control everything and generate the clock -> master */ + spi_set_clock_polarity_1(DOGM128_SPI); /* sck idle state high */ + spi_set_clock_phase_1(DOGM128_SPI); /* bit is taken on the second (rising edge) of sck */ + spi_enable_ss_output(DOGM128_SPI); + spi_enable(DOGM128_SPI); +} + +int main(void) +{ + rcc_clock_setup_in_hse_16mhz_out_72mhz(); + gpio_setup(); + spi_setup(); + + gpio_clear(GPIOB, GPIO7); /* LED1 on */ + gpio_set(GPIOB, GPIO6); /* LED2 off */ + + dogm128_init(); + dogm128_clear(); + + dogm128_set_cursor(0, 56); + dogm128_print_string("ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + dogm128_set_cursor(0, 48); + dogm128_print_string("abcdefghijklmnopqrstuvwxyz"); + dogm128_set_cursor(0, 40); + dogm128_print_string(" !#$%&'()*+,-./0123456789"); + dogm128_set_cursor(0, 32); + dogm128_print_string(":;<=>?@[\\]^_`{|}~"); + + dogm128_set_dot(10, 10); + dogm128_set_dot(20, 10); + dogm128_set_dot(30, 10); + dogm128_set_dot(40, 10); + dogm128_set_dot(50, 10); + + dogm128_update_display(); + + gpio_set(GPIOB, GPIO7); /* LED1 off */ + while(1); /* Halt. */ + + return 0; +} + diff --git a/examples/stm32/f1/other/dogm128/main.ld b/examples/stm32/f1/other/dogm128/main.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/dogm128/main.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/Makefile b/examples/stm32/f1/other/i2c_stts75_sensor/Makefile new file mode 100644 index 0000000..d0f6ddf --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/Makefile @@ -0,0 +1,25 @@ +## +## 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 = i2c_stts75_sensor + +OBJS = stts75.o + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/README b/examples/stm32/f1/other/i2c_stts75_sensor/README new file mode 100644 index 0000000..91e3ff6 --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/README @@ -0,0 +1,13 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example program sends some characters on USART1. +Afterwards it connects to an STTS75 sensor (ST LM75 compatible) +at adress A0/1/2=0 and sets reverse polarity, 26 degree Tos and Thyst. + +It reads out the temperature and submits the temperature over USART1 in +binary format (ASCII 0/1). + +The terminal settings for the receiving device/PC are 115200 8n1. + diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c new file mode 100644 index 0000000..d8f2404 --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.c @@ -0,0 +1,146 @@ +/* + * 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 +#include "stts75.h" + +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 i2c_setup(void) +{ + /* Enable clocks for I2C2 and AFIO. */ + rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_I2C2EN); + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN); + + /* Set alternate functions for the SCL and SDA pins of I2C2. */ + gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_50_MHZ, + GPIO_CNF_OUTPUT_ALTFN_OPENDRAIN, + GPIO_I2C2_SCL | GPIO_I2C2_SDA); + + /* Disable the I2C before changing any configuration. */ + i2c_peripheral_disable(I2C2); + + /* APB1 is running at 36MHz. */ + i2c_set_clock_frequency(I2C2, I2C_CR2_FREQ_36MHZ); + + /* 400KHz - I2C Fast Mode */ + i2c_set_fast_mode(I2C2); + + /* + * fclock for I2C is 36MHz APB2 -> cycle time 28ns, low time at 400KHz + * incl trise -> Thigh= 1600ns; CCR= tlow/tcycle= 0x1C,9; + * datasheet suggests 0x1e. + */ + i2c_set_ccr(I2C2, 0x1e); + + /* + * fclock for I2C is 36MHz -> cycle time 28ns, rise time for + * 400KHz => 300ns and 100KHz => 1000ns; 300ns/28ns = 10; + * incremented by 1 -> 11. + */ + i2c_set_trise(I2C2, 0x0b); + + /* + * This is our slave address - needed only if we want to receive from + * other masters. + */ + i2c_set_own_7bit_slave_address(I2C2, 0x32); + + /* If everything is configured -> enable the peripheral. */ + i2c_peripheral_enable(I2C2); +} + +int main(void) +{ + int i = 0; + u16 temperature; + + rcc_clock_setup_in_hse_16mhz_out_72mhz(); + gpio_setup(); + usart_setup(); + i2c_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'); + + stts75_write_config(I2C2, STTS75_SENSOR0); + stts75_write_temp_os(I2C2, STTS75_SENSOR0, 0x1a00); /* 26 degrees */ + stts75_write_temp_hyst(I2C2, STTS75_SENSOR0, 0x1a00); + temperature = stts75_read_temperature(I2C2, STTS75_SENSOR0); + + /* Send the temperature as binary over USART1. */ + for (i = 15; i >= 0 ; i--) { + if (temperature & (1 << i)) + usart_send(USART1, '1'); + else + usart_send(USART1, '0'); + } + + usart_send(USART1, '\r'); + usart_send(USART1, '\n'); + + gpio_clear(GPIOB, GPIO6); /* LED2 on */ + + while(1); /* Halt. */ + + return 0; +} diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/i2c_stts75_sensor.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/stts75.c b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.c new file mode 100644 index 0000000..f28019c --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.c @@ -0,0 +1,186 @@ +/* + * 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 "stts75.h" + +void stts75_write_config(u32 i2c, u8 sensor) +{ + u32 reg32; + + /* Send START condition. */ + i2c_send_start(i2c); + + /* Waiting for START is send and switched to master mode. */ + while (!((I2C_SR1(i2c) & I2C_SR1_SB) + & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY)))); + + /* Send destination address. */ + i2c_send_7bit_address(i2c, sensor, I2C_WRITE); + + /* Waiting for address is transferred. */ + while (!(I2C_SR1(i2c) & I2C_SR1_ADDR)); + + /* Cleaning ADDR condition sequence. */ + reg32 = I2C_SR2(i2c); + + /* Sending the data. */ + i2c_send_data(i2c, 0x1); /* stts75 config register */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); /* Await ByteTransferedFlag. */ + i2c_send_data(i2c, 0x4); /* pol reverse - LED glows if temp is below Tos/Thyst */ + while (!(I2C_SR1(i2c) & (I2C_SR1_BTF | I2C_SR1_TxE))); + + /* Send STOP condition. */ + i2c_send_stop(i2c); +} + +void stts75_write_temp_os(u32 i2c, u8 sensor, u16 temp_os) +{ + u32 reg32; + + /* Send START condition. */ + i2c_send_start(i2c); + + /* Waiting for START is send and switched to master mode. */ + while (!((I2C_SR1(i2c) & I2C_SR1_SB) + & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY)))); + + /* Send destination address. */ + i2c_send_7bit_address(i2c, sensor, I2C_WRITE); + + /* Waiting for address is transferred. */ + while (!(I2C_SR1(i2c) & I2C_SR1_ADDR)); + + /* Cleaning ADDR condition sequence. */ + reg32 = I2C_SR2(i2c); + + /* Sending the data. */ + i2c_send_data(i2c, 0x3); /* OvertemperatureShutdown register */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); + i2c_send_data(i2c, (u8)(temp_os >> 8)); /* MSB */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); + i2c_send_data(i2c, (u8)(temp_os & 0xff00)); /* LSB */ + while (!(I2C_SR1(i2c) & (I2C_SR1_BTF | I2C_SR1_TxE))); /* After the last byte we have to wait for TxE too. */ + + /* Send STOP condition. */ + i2c_send_stop(i2c); +} + +void stts75_write_temp_hyst(u32 i2c, u8 sensor, u16 temp_hyst) +{ + u32 reg32; + + /* Send START condition. */ + i2c_send_start(i2c); + + /* Waiting for START is send and therefore switched to master mode. */ + while (!((I2C_SR1(i2c) & I2C_SR1_SB) + & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY)))); + + /* Say to what address we want to talk to. */ + i2c_send_7bit_address(i2c, sensor, I2C_WRITE); + + /* Waiting for address is transferred. */ + while (!(I2C_SR1(i2c) & I2C_SR1_ADDR)); + + /* Cleaning ADDR condition sequence. */ + reg32 = I2C_SR2(i2c); + + /* Sending the data. */ + i2c_send_data(i2c, 0x2); /* TemperatureHysteresis register */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); + i2c_send_data(i2c, (u8)(temp_hyst >> 8)); /* MSB */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); + i2c_send_data(i2c, (u8)(temp_hyst & 0xff00)); /* LSB */ + while (!(I2C_SR1(i2c) & (I2C_SR1_BTF | I2C_SR1_TxE))); /* After the last byte we have to wait for TxE too. */ + + /* Send STOP condition. */ + i2c_send_stop(i2c); +} + +u16 stts75_read_temperature(u32 i2c, u8 sensor) +{ + u32 reg32; + u16 temperature; + + /* Send START condition. */ + i2c_send_start(i2c); + + /* Waiting for START is send and switched to master mode. */ + while (!((I2C_SR1(i2c) & I2C_SR1_SB) + & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY)))); + + /* Say to what address we want to talk to. */ + /* Yes, WRITE is correct - for selecting register in STTS75. */ + i2c_send_7bit_address(i2c, sensor, I2C_WRITE); + + /* Waiting for address is transferred. */ + while (!(I2C_SR1(i2c) & I2C_SR1_ADDR)); + + /* Cleaning ADDR condition sequence. */ + reg32 = I2C_SR2(i2c); + + i2c_send_data(i2c, 0x0); /* temperature register */ + while (!(I2C_SR1(i2c) & (I2C_SR1_BTF|I2C_SR1_TxE))); + + /* + * Now we transferred that we want to ACCESS the temperature register. + * Now we send another START condition (repeated START) and then + * transfer the destination but with flag READ. + */ + + /* Send START condition. */ + i2c_send_start(i2c); + + /* Waiting for START is send and switched to master mode. */ + while (!((I2C_SR1(i2c) & I2C_SR1_SB) + & (I2C_SR2(i2c) & (I2C_SR2_MSL | I2C_SR2_BUSY)))); + + /* Say to what address we want to talk to. */ + i2c_send_7bit_address(i2c, sensor, I2C_READ); + + /* 2-byte receive is a special case. See datasheet POS bit. */ + I2C_CR1(i2c) |= (I2C_CR1_POS | I2C_CR1_ACK); + + /* Waiting for address is transferred. */ + while (!(I2C_SR1(i2c) & I2C_SR1_ADDR)); + + /* Cleaning ADDR condition sequence. */ + reg32 = I2C_SR2(i2c); + + /* Cleaning I2C_SR1_ACK. */ + I2C_CR1(i2c) &= ~ I2C_CR1_ACK; + + /* Now the slave should begin to send us the first byte. Await BTF. */ + while (!(I2C_SR1(i2c) & I2C_SR1_BTF)); + temperature = (u16)(I2C_DR(i2c) << 8); /* MSB */ + + /* + * Yes they mean it: we have to generate the STOP condition before + * saving the 1st byte. + */ + I2C_CR1(i2c) |= I2C_CR1_STOP; + + temperature |= I2C_DR(i2c); /* LSB */ + + /* Original state. */ + I2C_CR1(i2c) &= ~I2C_CR1_POS; + + return temperature; +} diff --git a/examples/stm32/f1/other/i2c_stts75_sensor/stts75.h b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.h new file mode 100644 index 0000000..57f6190 --- /dev/null +++ b/examples/stm32/f1/other/i2c_stts75_sensor/stts75.h @@ -0,0 +1,39 @@ +/* + * 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 . + */ + +#ifndef STTS75_H +#define STTS75_H + +#include + +#define STTS75_SENSOR0 0x48 +#define STTS75_SENSOR1 0x49 +#define STTS75_SENSOR2 0x4a +#define STTS75_SENSOR3 0x4b +#define STTS75_SENSOR4 0x4c +#define STTS75_SENSOR5 0x4d +#define STTS75_SENSOR6 0x4e +#define STTS75_SENSOR7 0x4f + +void stts75_write_config(u32 i2c, u8 sensor); +void stts75_write_temp_os(u32 i2c, u8 sensor, u16 temp_os); +void stts75_write_temp_hyst(u32 i2c, u8 sensor, u16 temp_hyst); +u16 stts75_read_temperature(u32 i2c, u8 sensor); + +#endif diff --git a/examples/stm32/f1/other/rtc/Makefile b/examples/stm32/f1/other/rtc/Makefile new file mode 100644 index 0000000..1efa7ac --- /dev/null +++ b/examples/stm32/f1/other/rtc/Makefile @@ -0,0 +1,23 @@ +## +## 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 = rtc + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/rtc/README b/examples/stm32/f1/other/rtc/README new file mode 100644 index 0000000..f1e3975 --- /dev/null +++ b/examples/stm32/f1/other/rtc/README @@ -0,0 +1,6 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This is a small RTC example project. + diff --git a/examples/stm32/f1/other/rtc/rtc.c b/examples/stm32/f1/other/rtc/rtc.c new file mode 100644 index 0000000..28ae24c --- /dev/null +++ b/examples/stm32/f1/other/rtc/rtc.c @@ -0,0 +1,116 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Lord James + * + * 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 +#include + +void clock_setup(void) +{ + rcc_clock_setup_in_hse_8mhz_out_72mhz(); + + /* Enable GPIOC clock. */ + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); + + /* 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); +} + +void usart_setup(void) +{ + /* 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, 38400, rcc_ppre2_frequency); + usart_set_databits(USART1, 8); + usart_set_stopbits(USART1, USART_STOPBITS_1); + usart_set_mode(USART1, USART_MODE_TX); + 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) +{ + /* Set GPIO12 (in GPIO port C) to 'output push-pull'. */ + gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO12); +} + +void nvic_setup(void) +{ + /* Without this the RTC interrupt routine will never be called. */ + nvic_enable_irq(NVIC_RTC_IRQ); + nvic_set_priority(NVIC_RTC_IRQ, 1); +} + +void rtc_isr(void) +{ + volatile u32 j = 0, c = 0; + + /* The interrupt flag isn't cleared by hardware, we have to do it. */ + rtc_clear_flag(RTC_SEC); + + /* Visual output. */ + gpio_toggle(GPIOC, GPIO12); + + c = rtc_get_counter_val(); + + /* Display the current counter value in binary via USART1. */ + for (j = 0; j < 32; j++) { + if ((c & (0x80000000 >> j)) != 0) { + usart_send(USART1, '1'); + } else { + usart_send(USART1, '0'); + } + } + usart_send(USART1, '\n'); +} + +int main(void) +{ + clock_setup(); + gpio_setup(); + usart_setup(); + + /* + * If the RTC is pre-configured just allow access, don't reconfigure. + * Otherwise enable it with the LSE as clock source and 0x7fff as + * prescale value. + */ + rtc_auto_awake(LSE, 0x7fff); + + /* Setup the RTC interrupt. */ + nvic_setup(); + + /* Enable the RTC interrupt to occur off the SEC flag. */ + rtc_interrupt_enable(RTC_SEC); + + while(1); + + return 0; +} diff --git a/examples/stm32/f1/other/rtc/rtc.ld b/examples/stm32/f1/other/rtc/rtc.ld new file mode 100644 index 0000000..3409b98 --- /dev/null +++ b/examples/stm32/f1/other/rtc/rtc.ld @@ -0,0 +1,31 @@ +/* + * 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 . + */ + +/* Linker script for Olimex STM32-H103 (STM32F103RBT6, 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 + diff --git a/examples/stm32/f1/other/systick/Makefile b/examples/stm32/f1/other/systick/Makefile new file mode 100644 index 0000000..91b5cb5 --- /dev/null +++ b/examples/stm32/f1/other/systick/Makefile @@ -0,0 +1,23 @@ +## +## 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 = systick + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/systick/README b/examples/stm32/f1/other/systick/README new file mode 100644 index 0000000..affb4b8 --- /dev/null +++ b/examples/stm32/f1/other/systick/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example program blinks a LED on PortB Pin 6. 1 second on / 1 second off. +Blinking is done via the systick timer interrupt. + diff --git a/examples/stm32/f1/other/systick/systick.c b/examples/stm32/f1/other/systick/systick.c new file mode 100644 index 0000000..173ff2a --- /dev/null +++ b/examples/stm32/f1/other/systick/systick.c @@ -0,0 +1,75 @@ +/* + * 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 + +u32 temp32; + +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 sys_tick_handler() +{ + temp32++; + + /* we call this handler every 1ms so 1000ms = 1s on/off */ + if (temp32 == 1000) { + gpio_toggle(GPIOB, GPIO6); /* LED2 on/off */ + temp32 = 0; + } +} + +int main(void) +{ + rcc_clock_setup_in_hse_16mhz_out_72mhz(); + gpio_setup(); + + gpio_clear(GPIOB, GPIO7); /* LED1 on */ + gpio_set(GPIOB, GPIO6); /* LED2 off */ + + temp32 = 0; + + /* 72MHz / 8 => 9000000 counts per second */ + systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); + + /* 9000000/9000 = 1000 overflows per second - every 1ms one interrupt */ + systick_set_reload(9000); + + systick_interrupt_enable(); + + /* start counting */ + systick_counter_enable(); + + while(1); /* Halt. */ + + return 0; +} diff --git a/examples/stm32/f1/other/systick/systick.ld b/examples/stm32/f1/other/systick/systick.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/systick/systick.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/timer_interrupt/Makefile b/examples/stm32/f1/other/timer_interrupt/Makefile new file mode 100644 index 0000000..86aced4 --- /dev/null +++ b/examples/stm32/f1/other/timer_interrupt/Makefile @@ -0,0 +1,23 @@ +## +## 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 = timer + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/timer_interrupt/README b/examples/stm32/f1/other/timer_interrupt/README new file mode 100644 index 0000000..e6a22c4 --- /dev/null +++ b/examples/stm32/f1/other/timer_interrupt/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example program blinks a LED on PortB Pin 6. 1 second on / 1 second off. +Blinking is made only with the timer interrupt of the TIM2 timer. + diff --git a/examples/stm32/f1/other/timer_interrupt/timer.c b/examples/stm32/f1/other/timer_interrupt/timer.c new file mode 100644 index 0000000..422df88 --- /dev/null +++ b/examples/stm32/f1/other/timer_interrupt/timer.c @@ -0,0 +1,85 @@ +/* + * 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 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 nvic_setup() +{ + /* without this the timer interrupt routine will never be called */ + nvic_enable_irq(NVIC_TIM2_IRQ); + nvic_set_priority(NVIC_TIM2_IRQ, 1); +} + +void tim2_isr() +{ + /* LED2 on/off */ + gpio_toggle(GPIOB, GPIO6); + + /* clear interrrupt flag */ + TIM_SR(TIM2) &= ~TIM_SR_UIF; +} + +int main(void) +{ + rcc_clock_setup_in_hse_16mhz_out_72mhz(); + gpio_setup(); + nvic_setup(); + + gpio_clear(GPIOB, GPIO7); /* LED1 on */ + gpio_set(GPIOB, GPIO6); /* LED2 off */ + + rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_TIM2EN); + + /* the goal is to let the LED2 glow for a second and then be off for a second */ + + /* Set timer start value */ + TIM_CNT(TIM2) = 1; + + /* Set timer prescaler. 72MHz/1440 => 50000 counts per second */ + TIM_PSC(TIM2) = 1440; + + /* End timer value. If this value is reached an interrupt is generated */ + TIM_ARR(TIM2) = 50000; + + /* Update interrupt enable */ + TIM_DIER(TIM2) |= TIM_DIER_UIE; + + /* Start timer */ + TIM_CR1(TIM2) |= TIM_CR1_CEN; + + while(1); /* Halt. */ + + return 0; +} diff --git a/examples/stm32/f1/other/timer_interrupt/timer.ld b/examples/stm32/f1/other/timer_interrupt/timer.ld new file mode 100644 index 0000000..4f609a8 --- /dev/null +++ b/examples/stm32/f1/other/timer_interrupt/timer.ld @@ -0,0 +1,31 @@ +/* + * 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 + diff --git a/examples/stm32/f1/other/usb_cdcacm/Makefile b/examples/stm32/f1/other/usb_cdcacm/Makefile new file mode 100644 index 0000000..38179e3 --- /dev/null +++ b/examples/stm32/f1/other/usb_cdcacm/Makefile @@ -0,0 +1,23 @@ +## +## 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 = cdcacm + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/usb_cdcacm/README b/examples/stm32/f1/other/usb_cdcacm/README new file mode 100644 index 0000000..2f1ee4b --- /dev/null +++ b/examples/stm32/f1/other/usb_cdcacm/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example implements a USB CDC-ACM device (aka Virtual Serial Port) +to demonstrate the use of the USB device stack. + diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.c b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c new file mode 100644 index 0000000..d26b898 --- /dev/null +++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.c @@ -0,0 +1,245 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Gareth McMullin + * + * 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 + +static const struct usb_device_descriptor dev = { + .bLength = USB_DT_DEVICE_SIZE, + .bDescriptorType = USB_DT_DEVICE, + .bcdUSB = 0x0200, + .bDeviceClass = USB_CLASS_CDC, + .bDeviceSubClass = 0, + .bDeviceProtocol = 0, + .bMaxPacketSize0 = 64, + .idVendor = 0x0483, + .idProduct = 0x5740, + .bcdDevice = 0x0200, + .iManufacturer = 1, + .iProduct = 2, + .iSerialNumber = 3, + .bNumConfigurations = 1, +}; + +/* This notification endpoint isn't implemented. According to CDC spec its + * optional, but its absence causes a NULL pointer dereference in Linux cdc_acm + * driver. */ +static const struct usb_endpoint_descriptor comm_endp[] = {{ + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, + .bEndpointAddress = 0x83, + .bmAttributes = USB_ENDPOINT_ATTR_INTERRUPT, + .wMaxPacketSize = 16, + .bInterval = 255, +}}; + +static const struct usb_endpoint_descriptor data_endp[] = {{ + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, + .bEndpointAddress = 0x01, + .bmAttributes = USB_ENDPOINT_ATTR_BULK, + .wMaxPacketSize = 64, + .bInterval = 1, +}, { + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, + .bEndpointAddress = 0x82, + .bmAttributes = USB_ENDPOINT_ATTR_BULK, + .wMaxPacketSize = 64, + .bInterval = 1, +}}; + +static const struct { + struct usb_cdc_header_descriptor header; + struct usb_cdc_call_management_descriptor call_mgmt; + struct usb_cdc_acm_descriptor acm; + struct usb_cdc_union_descriptor cdc_union; +} __attribute__((packed)) cdcacm_functional_descriptors = { + .header = { + .bFunctionLength = sizeof(struct usb_cdc_header_descriptor), + .bDescriptorType = CS_INTERFACE, + .bDescriptorSubtype = USB_CDC_TYPE_HEADER, + .bcdCDC = 0x0110, + }, + .call_mgmt = { + .bFunctionLength = + sizeof(struct usb_cdc_call_management_descriptor), + .bDescriptorType = CS_INTERFACE, + .bDescriptorSubtype = USB_CDC_TYPE_CALL_MANAGEMENT, + .bmCapabilities = 0, + .bDataInterface = 1, + }, + .acm = { + .bFunctionLength = sizeof(struct usb_cdc_acm_descriptor), + .bDescriptorType = CS_INTERFACE, + .bDescriptorSubtype = USB_CDC_TYPE_ACM, + .bmCapabilities = 0, + }, + .cdc_union = { + .bFunctionLength = sizeof(struct usb_cdc_union_descriptor), + .bDescriptorType = CS_INTERFACE, + .bDescriptorSubtype = USB_CDC_TYPE_UNION, + .bControlInterface = 0, + .bSubordinateInterface0 = 1, + } +}; + +static const struct usb_interface_descriptor comm_iface[] = {{ + .bLength = USB_DT_INTERFACE_SIZE, + .bDescriptorType = USB_DT_INTERFACE, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 1, + .bInterfaceClass = USB_CLASS_CDC, + .bInterfaceSubClass = USB_CDC_SUBCLASS_ACM, + .bInterfaceProtocol = USB_CDC_PROTOCOL_AT, + .iInterface = 0, + + .endpoint = comm_endp, + + .extra = &cdcacm_functional_descriptors, + .extralen = sizeof(cdcacm_functional_descriptors) +}}; + +static const struct usb_interface_descriptor data_iface[] = {{ + .bLength = USB_DT_INTERFACE_SIZE, + .bDescriptorType = USB_DT_INTERFACE, + .bInterfaceNumber = 1, + .bAlternateSetting = 0, + .bNumEndpoints = 2, + .bInterfaceClass = USB_CLASS_DATA, + .bInterfaceSubClass = 0, + .bInterfaceProtocol = 0, + .iInterface = 0, + + .endpoint = data_endp, +}}; + +static const struct usb_interface ifaces[] = {{ + .num_altsetting = 1, + .altsetting = comm_iface, +}, { + .num_altsetting = 1, + .altsetting = data_iface, +}}; + +static const struct usb_config_descriptor config = { + .bLength = USB_DT_CONFIGURATION_SIZE, + .bDescriptorType = USB_DT_CONFIGURATION, + .wTotalLength = 0, + .bNumInterfaces = 2, + .bConfigurationValue = 1, + .iConfiguration = 0, + .bmAttributes = 0x80, + .bMaxPower = 0x32, + + .interface = ifaces, +}; + +static const char *usb_strings[] = { + "x", + "Black Sphere Technologies", + "CDC-ACM Demo", + "DEMO" +}; + +static int cdcacm_control_request(struct usb_setup_data *req, u8 **buf, + u16 *len, void (**complete)(struct usb_setup_data *req)) +{ + (void)complete; + (void)buf; + + switch(req->bRequest) { + case USB_CDC_REQ_SET_CONTROL_LINE_STATE: { + /* This Linux cdc_acm driver requires this to be implemented + * even though it's optional in the CDC spec, and we don't + * advertise it in the ACM functional descriptor. */ + char buf[10]; + struct usb_cdc_notification *notif = (void*)buf; + + /* We echo signals back to host as notification */ + notif->bmRequestType = 0xA1; + notif->bNotification = USB_CDC_NOTIFY_SERIAL_STATE; + notif->wValue = 0; + notif->wIndex = 0; + notif->wLength = 2; + buf[8] = req->wValue & 3; + buf[9] = 0; + //usbd_ep_write_packet(0x83, buf, 10); + return 1; + } + case USB_CDC_REQ_SET_LINE_CODING: + if(*len < sizeof(struct usb_cdc_line_coding)) + return 0; + + return 1; + } + return 0; +} + +static void cdcacm_data_rx_cb(u8 ep) +{ + (void)ep; + + char buf[64]; + int len = usbd_ep_read_packet(0x01, buf, 64); + if(len) { + usbd_ep_write_packet(0x82, buf, len); + buf[len] = 0; + } +} + +static void cdcacm_set_config(u16 wValue) +{ + (void)wValue; + + usbd_ep_setup(0x01, USB_ENDPOINT_ATTR_BULK, 64, cdcacm_data_rx_cb); + usbd_ep_setup(0x82, USB_ENDPOINT_ATTR_BULK, 64, NULL); + usbd_ep_setup(0x83, USB_ENDPOINT_ATTR_INTERRUPT, 16, NULL); + + usbd_register_control_callback( + USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, + USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, + cdcacm_control_request); +} + +int main(void) +{ + rcc_clock_setup_in_hsi_out_48mhz(); + + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN); + + AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; + + gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); + + usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings); + usbd_register_set_config_callback(cdcacm_set_config); + + gpio_set(GPIOA, GPIO15); + gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO15); + + while (1) + usbd_poll(); +} diff --git a/examples/stm32/f1/other/usb_cdcacm/cdcacm.ld b/examples/stm32/f1/other/usb_cdcacm/cdcacm.ld new file mode 100644 index 0000000..3cd6316 --- /dev/null +++ b/examples/stm32/f1/other/usb_cdcacm/cdcacm.ld @@ -0,0 +1,29 @@ +/* + * 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 . + */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x08000000, LENGTH = 64K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K +} + +/* Include the common ld script. */ +INCLUDE libopencm3_stm32f1.ld + diff --git a/examples/stm32/f1/other/usb_dfu/Makefile b/examples/stm32/f1/other/usb_dfu/Makefile new file mode 100644 index 0000000..48e2d6b --- /dev/null +++ b/examples/stm32/f1/other/usb_dfu/Makefile @@ -0,0 +1,23 @@ +## +## 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 = usbdfu + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/usb_dfu/README b/examples/stm32/f1/other/usb_dfu/README new file mode 100644 index 0000000..9c0169a --- /dev/null +++ b/examples/stm32/f1/other/usb_dfu/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example implements a USB Device Firmware Upgrade (DFU) bootloader +to demonstrate the use of the USB device stack. + diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.c b/examples/stm32/f1/other/usb_dfu/usbdfu.c new file mode 100644 index 0000000..02d919f --- /dev/null +++ b/examples/stm32/f1/other/usb_dfu/usbdfu.c @@ -0,0 +1,270 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Gareth McMullin + * + * 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 +#include +#include + +#define APP_ADDRESS 0x08002000 + +/* Commands sent with wBlockNum == 0 as per ST implementation. */ +#define CMD_SETADDR 0x21 +#define CMD_ERASE 0x41 + +/* We need a special large control buffer for this device: */ +u8 usbd_control_buffer[1024]; + +static enum dfu_state usbdfu_state = STATE_DFU_IDLE; + +static struct { + u8 buf[sizeof(usbd_control_buffer)]; + u16 len; + u32 addr; + u16 blocknum; +} prog; + +const struct usb_device_descriptor dev = { + .bLength = USB_DT_DEVICE_SIZE, + .bDescriptorType = USB_DT_DEVICE, + .bcdUSB = 0x0200, + .bDeviceClass = 0, + .bDeviceSubClass = 0, + .bDeviceProtocol = 0, + .bMaxPacketSize0 = 64, + .idVendor = 0x0483, + .idProduct = 0xDF11, + .bcdDevice = 0x0200, + .iManufacturer = 1, + .iProduct = 2, + .iSerialNumber = 3, + .bNumConfigurations = 1, +}; + +const struct usb_dfu_descriptor dfu_function = { + .bLength = sizeof(struct usb_dfu_descriptor), + .bDescriptorType = DFU_FUNCTIONAL, + .bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH, + .wDetachTimeout = 255, + .wTransferSize = 1024, + .bcdDFUVersion = 0x011A, +}; + +const struct usb_interface_descriptor iface = { + .bLength = USB_DT_INTERFACE_SIZE, + .bDescriptorType = USB_DT_INTERFACE, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xFE, /* Device Firmware Upgrade */ + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 2, + + /* The ST Microelectronics DfuSe application needs this string. + * The format isn't documented... */ + .iInterface = 4, + + .extra = &dfu_function, + .extralen = sizeof(dfu_function), +}; + +const struct usb_interface ifaces[] = {{ + .num_altsetting = 1, + .altsetting = &iface, +}}; + +const struct usb_config_descriptor config = { + .bLength = USB_DT_CONFIGURATION_SIZE, + .bDescriptorType = USB_DT_CONFIGURATION, + .wTotalLength = 0, + .bNumInterfaces = 1, + .bConfigurationValue = 1, + .iConfiguration = 0, + .bmAttributes = 0xC0, + .bMaxPower = 0x32, + + .interface = ifaces, +}; + +static const char *usb_strings[] = { + "x", + "Black Sphere Technologies", + "DFU Demo", + "DEMO", + /* This string is used by ST Microelectronics' DfuSe utility */ + "@Internal Flash /0x08000000/8*001Ka,56*001Kg" +}; + +static u8 usbdfu_getstatus(u32 *bwPollTimeout) +{ + switch(usbdfu_state) { + case STATE_DFU_DNLOAD_SYNC: + usbdfu_state = STATE_DFU_DNBUSY; + *bwPollTimeout = 100; + return DFU_STATUS_OK; + + case STATE_DFU_MANIFEST_SYNC: + /* Device will reset when read is complete */ + usbdfu_state = STATE_DFU_MANIFEST; + return DFU_STATUS_OK; + + default: + return DFU_STATUS_OK; + } +} + +static void usbdfu_getstatus_complete(struct usb_setup_data *req) +{ + int i; + (void)req; + + switch(usbdfu_state) { + case STATE_DFU_DNBUSY: + + flash_unlock(); + if(prog.blocknum == 0) { + switch(prog.buf[0]) { + case CMD_ERASE: + flash_erase_page(*(u32*)(prog.buf+1)); + case CMD_SETADDR: + prog.addr = *(u32*)(prog.buf+1); + } + } else { + u32 baseaddr = prog.addr + + ((prog.blocknum - 2) * + dfu_function.wTransferSize); + for(i = 0; i < prog.len; i += 2) + flash_program_half_word(baseaddr + i, + *(u16*)(prog.buf+i)); + } + flash_lock(); + + /* We jump straight to dfuDNLOAD-IDLE, + * skipping dfuDNLOAD-SYNC + */ + usbdfu_state = STATE_DFU_DNLOAD_IDLE; + return; + + case STATE_DFU_MANIFEST: + /* USB device must detach, we just reset... */ + scb_reset_system(); + return; /* Will never return */ + default: + return; + } +} + +static int usbdfu_control_request(struct usb_setup_data *req, u8 **buf, + u16 *len, void (**complete)(struct usb_setup_data *req)) +{ + + if((req->bmRequestType & 0x7F) != 0x21) + return 0; /* Only accept class request */ + + switch(req->bRequest) { + case DFU_DNLOAD: + if((len == NULL) || (*len == 0)) { + usbdfu_state = STATE_DFU_MANIFEST_SYNC; + return 1; + } else { + /* Copy download data for use on GET_STATUS */ + prog.blocknum = req->wValue; + prog.len = *len; + memcpy(prog.buf, *buf, *len); + usbdfu_state = STATE_DFU_DNLOAD_SYNC; + return 1; + } + case DFU_CLRSTATUS: + /* Clear error and return to dfuIDLE */ + if(usbdfu_state == STATE_DFU_ERROR) + usbdfu_state = STATE_DFU_IDLE; + return 1; + case DFU_ABORT: + /* Abort returns to dfuIDLE state */ + usbdfu_state = STATE_DFU_IDLE; + return 1; + case DFU_UPLOAD: + /* Upload not supported for now */ + return 0; + case DFU_GETSTATUS: { + u32 bwPollTimeout = 0; /* 24-bit integer in DFU class spec */ + + (*buf)[0] = usbdfu_getstatus(&bwPollTimeout); + (*buf)[1] = bwPollTimeout & 0xFF; + (*buf)[2] = (bwPollTimeout >> 8) & 0xFF; + (*buf)[3] = (bwPollTimeout >> 16) & 0xFF; + (*buf)[4] = usbdfu_state; + (*buf)[5] = 0; /* iString not used here */ + *len = 6; + + *complete = usbdfu_getstatus_complete; + + return 1; + } + case DFU_GETSTATE: + /* Return state with no state transision */ + *buf[0] = usbdfu_state; + *len = 1; + return 1; + } + + return 0; +} + +int main(void) +{ + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); + if(!gpio_get(GPIOA, GPIO10)) { + /* Boot the application if it's valid */ + if((*(volatile u32*)APP_ADDRESS & 0x2FFE0000) == 0x20000000) { + /* Set vector table base address */ + SCB_VTOR = APP_ADDRESS & 0xFFFF; + /* Initialise master stack pointer */ + asm volatile ("msr msp, %0"::"g" + (*(volatile u32*)APP_ADDRESS)); + /* Jump to application */ + (*(void(**)())(APP_ADDRESS + 4))(); + } + } + + rcc_clock_setup_in_hsi_out_48mhz(); + + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN); + + AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; + gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); + + usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings); + usbd_set_control_buffer_size(sizeof(usbd_control_buffer)); + usbd_register_control_callback( + USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, + USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, + usbdfu_control_request); + + gpio_set(GPIOA, GPIO15); + gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO15); + + while (1) + usbd_poll(); +} diff --git a/examples/stm32/f1/other/usb_dfu/usbdfu.ld b/examples/stm32/f1/other/usb_dfu/usbdfu.ld new file mode 100644 index 0000000..6a01797 --- /dev/null +++ b/examples/stm32/f1/other/usb_dfu/usbdfu.ld @@ -0,0 +1,29 @@ +/* + * 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 . + */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x08000000, LENGTH = 8K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 4K +} + +/* Include the common ld script. */ +INCLUDE libopencm3_stm32f1.ld + diff --git a/examples/stm32/f1/other/usb_hid/Makefile b/examples/stm32/f1/other/usb_hid/Makefile new file mode 100644 index 0000000..d831e9e --- /dev/null +++ b/examples/stm32/f1/other/usb_hid/Makefile @@ -0,0 +1,23 @@ +## +## 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 = usbhid + +include ../../Makefile.include + diff --git a/examples/stm32/f1/other/usb_hid/README b/examples/stm32/f1/other/usb_hid/README new file mode 100644 index 0000000..92645c9 --- /dev/null +++ b/examples/stm32/f1/other/usb_hid/README @@ -0,0 +1,7 @@ +------------------------------------------------------------------------------ +README +------------------------------------------------------------------------------ + +This example implements a USB Human Interface Device (HID) +to demonstrate the use of the USB device stack. + diff --git a/examples/stm32/f1/other/usb_hid/usbhid.c b/examples/stm32/f1/other/usb_hid/usbhid.c new file mode 100644 index 0000000..7c0186e --- /dev/null +++ b/examples/stm32/f1/other/usb_hid/usbhid.c @@ -0,0 +1,272 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2010 Gareth McMullin + * + * 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 +#include + +/* Define this to include the DFU APP interface. */ +#define INCLUDE_DFU_INTERFACE + +#ifdef INCLUDE_DFU_INTERFACE +#include +#include +#endif + +const struct usb_device_descriptor dev = { + .bLength = USB_DT_DEVICE_SIZE, + .bDescriptorType = USB_DT_DEVICE, + .bcdUSB = 0x0200, + .bDeviceClass = 0, + .bDeviceSubClass = 0, + .bDeviceProtocol = 0, + .bMaxPacketSize0 = 64, + .idVendor = 0x0483, + .idProduct = 0x5710, + .bcdDevice = 0x0200, + .iManufacturer = 1, + .iProduct = 2, + .iSerialNumber = 3, + .bNumConfigurations = 1, +}; + +/* I have no idea what this means. I haven't read the HID spec. */ +static const u8 hid_report_descriptor[] = { + 0x05, 0x01, 0x09, 0x02, 0xA1, 0x01, 0x09, 0x01, + 0xA1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x03, + 0x15, 0x00, 0x25, 0x01, 0x95, 0x03, 0x75, 0x01, + 0x81, 0x02, 0x95, 0x01, 0x75, 0x05, 0x81, 0x01, + 0x05, 0x01, 0x09, 0x30, 0x09, 0x31, 0x09, 0x38, + 0x15, 0x81, 0x25, 0x7F, 0x75, 0x08, 0x95, 0x03, + 0x81, 0x06, 0xC0, 0x09, 0x3c, 0x05, 0xff, 0x09, + 0x01, 0x15, 0x00, 0x25, 0x01, 0x75, 0x01, 0x95, + 0x02, 0xb1, 0x22, 0x75, 0x06, 0x95, 0x01, 0xb1, + 0x01, 0xc0 +}; + +static const struct { + struct usb_hid_descriptor hid_descriptor; + struct { + u8 bReportDescriptorType; + u16 wDescriptorLength; + } __attribute__((packed)) hid_report; +} __attribute__((packed)) hid_function = { + .hid_descriptor = { + .bLength = sizeof(hid_function), + .bDescriptorType = USB_DT_HID, + .bcdHID = 0x0100, + .bCountryCode = 0, + .bNumDescriptors = 1, + }, + .hid_report = { + .bReportDescriptorType = USB_DT_REPORT, + .wDescriptorLength = sizeof(hid_report_descriptor), + } +}; + +const struct usb_endpoint_descriptor hid_endpoint = { + .bLength = USB_DT_ENDPOINT_SIZE, + .bDescriptorType = USB_DT_ENDPOINT, + .bEndpointAddress = 0x81, + .bmAttributes = USB_ENDPOINT_ATTR_INTERRUPT, + .wMaxPacketSize = 4, + .bInterval = 0x20, +}; + +const struct usb_interface_descriptor hid_iface = { + .bLength = USB_DT_INTERFACE_SIZE, + .bDescriptorType = USB_DT_INTERFACE, + .bInterfaceNumber = 0, + .bAlternateSetting = 0, + .bNumEndpoints = 1, + .bInterfaceClass = USB_CLASS_HID, + .bInterfaceSubClass = 1, /* boot */ + .bInterfaceProtocol = 2, /* mouse */ + .iInterface = 0, + + .endpoint = &hid_endpoint, + + .extra = &hid_function, + .extralen = sizeof(hid_function), +}; + +#ifdef INCLUDE_DFU_INTERFACE +const struct usb_dfu_descriptor dfu_function = { + .bLength = sizeof(struct usb_dfu_descriptor), + .bDescriptorType = DFU_FUNCTIONAL, + .bmAttributes = USB_DFU_CAN_DOWNLOAD | USB_DFU_WILL_DETACH, + .wDetachTimeout = 255, + .wTransferSize = 1024, + .bcdDFUVersion = 0x011A, +}; + +const struct usb_interface_descriptor dfu_iface = { + .bLength = USB_DT_INTERFACE_SIZE, + .bDescriptorType = USB_DT_INTERFACE, + .bInterfaceNumber = 1, + .bAlternateSetting = 0, + .bNumEndpoints = 0, + .bInterfaceClass = 0xFE, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 1, + .iInterface = 0, + + .extra = &dfu_function, + .extralen = sizeof(dfu_function), +}; +#endif + +const struct usb_interface ifaces[] = {{ + .num_altsetting = 1, + .altsetting = &hid_iface, +#ifdef INCLUDE_DFU_INTERFACE +}, { + .num_altsetting = 1, + .altsetting = &dfu_iface, +#endif +}}; + +const struct usb_config_descriptor config = { + .bLength = USB_DT_CONFIGURATION_SIZE, + .bDescriptorType = USB_DT_CONFIGURATION, + .wTotalLength = 0, +#ifdef INCLUDE_DFU_INTERFACE + .bNumInterfaces = 2, +#else + .bNumInterfaces = 1, +#endif + .bConfigurationValue = 1, + .iConfiguration = 0, + .bmAttributes = 0xC0, + .bMaxPower = 0x32, + + .interface = ifaces, +}; + +static const char *usb_strings[] = { + "x", + "Black Sphere Technologies", + "HID Demo", + "DEMO", +}; + +static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len, + void (**complete)(struct usb_setup_data *req)) +{ + (void)complete; + + if((req->bmRequestType != 0x81) || + (req->bRequest != USB_REQ_GET_DESCRIPTOR) || + (req->wValue != 0x2200)) + return 0; + + /* Handle the HID report descriptor */ + *buf = (u8*)hid_report_descriptor; + *len = sizeof(hid_report_descriptor); + + return 1; +} + +#ifdef INCLUDE_DFU_INTERFACE +static void dfu_detach_complete(struct usb_setup_data *req) +{ + (void)req; + + gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); + gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO10); + gpio_set(GPIOA, GPIO10); + scb_reset_core(); +} + +static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len, + void (**complete)(struct usb_setup_data *req)) +{ + (void)buf; + (void)len; + + if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH)) + return 0; /* Only accept class request */ + + *complete = dfu_detach_complete; + + return 1; +} +#endif + +static void hid_set_config(u16 wValue) +{ + (void)wValue; + + usbd_ep_setup(0x81, USB_ENDPOINT_ATTR_INTERRUPT, 4, NULL); + + usbd_register_control_callback( + USB_REQ_TYPE_STANDARD | USB_REQ_TYPE_INTERFACE, + USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, + hid_control_request); +#ifdef INCLUDE_DFU_INTERFACE + usbd_register_control_callback( + USB_REQ_TYPE_CLASS | USB_REQ_TYPE_INTERFACE, + USB_REQ_TYPE_TYPE | USB_REQ_TYPE_RECIPIENT, + dfu_control_request); +#endif + + systick_set_clocksource(STK_CTRL_CLKSOURCE_AHB_DIV8); + systick_set_reload(100000); + systick_interrupt_enable(); + systick_counter_enable(); +} + +int main(void) +{ + rcc_clock_setup_in_hsi_out_48mhz(); + + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); + rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_AFIOEN); + + AFIO_MAPR |= AFIO_MAPR_SWJ_CFG_JTAG_OFF_SW_ON; + gpio_set_mode(GPIOA, GPIO_MODE_INPUT, 0, GPIO15); + + usbd_init(&stm32f103_usb_driver, &dev, &config, usb_strings); + usbd_register_set_config_callback(hid_set_config); + + gpio_set(GPIOA, GPIO15); + gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ, + GPIO_CNF_OUTPUT_PUSHPULL, GPIO15); + + while (1) + usbd_poll(); +} + +void sys_tick_handler(void) +{ + static int x = 0; + static int dir = 1; + u8 buf[4] = {0, 0, 0, 0}; + + buf[1] = dir; + x += dir; + if(x > 30) dir = -dir; + if(x < -30) dir = -dir; + + usbd_ep_write_packet(0x81, buf, 4); +} diff --git a/examples/stm32/f1/other/usb_hid/usbhid.ld b/examples/stm32/f1/other/usb_hid/usbhid.ld new file mode 100644 index 0000000..3cd6316 --- /dev/null +++ b/examples/stm32/f1/other/usb_hid/usbhid.ld @@ -0,0 +1,29 @@ +/* + * 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 . + */ + +/* Define memory regions. */ +MEMORY +{ + rom (rx) : ORIGIN = 0x08000000, LENGTH = 64K + ram (rwx) : ORIGIN = 0x20000000, LENGTH = 20K +} + +/* Include the common ld script. */ +INCLUDE libopencm3_stm32f1.ld + -- cgit v1.2.3