Revision 0:f428b670026a, committed 2019-10-26

Comitter:

Mgiris

Date:

Sat Oct 26 03:57:39 2019 +0000

Commit message:

Torreta

Changed in this revision

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/PinNames.h	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,201 @@
+/* mbed Microcontroller Library
+ *******************************************************************************
+ * Copyright (c) 2014, STMicroelectronics
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ * 3. Neither the name of STMicroelectronics nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *******************************************************************************
+ 
+ */
+#ifndef MBED_PINNAMES_H
+#define MBED_PINNAMES_H
+
+#include "cmsis.h"
+#include "PinNamesTypes.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+//UART to AMB8826
+#define TXD1      PA_9
+#define RXD1      PA_10
+#define CTS1      PA_11
+int baudRate = 115200;
+
+//UART to Silicon Labs CP210x
+#define TXD2      PA_2
+#define RXD2      PA_3
+
+//UART to FTDI
+#define TXD3      PB_10
+#define RXD3      PB_11
+
+//I2C
+#define I2C1_SCL  PB_6
+#define I2C1_SDA  PB_7
+
+#define I2C2_SCL  PB_10
+#define I2C2_SDA  PB_11
+
+//SPI
+#define SPI1_MOSI PA_7
+#define SPI1_MISO PA_6
+#define SPI1_SCLK PA_5
+#define SPI1_NSS1 PA_4
+#define SDsel     PA_4
+
+#define SPI2_MOSI PB_15
+#define SPI2_MISO PB_14
+#define SPI2_SCLK PB_13
+#define SPI2_NSS2 PB_12
+
+//CAN
+#define CAN1_RX   PA_11
+#define CAN1_TX   PA_12
+
+//USB   CDC
+#define USB_POS   PA_12
+#define USB_NEG   PA_11
+
+//ADC
+#define Uin       PA_1
+#define Ubatt     PA_0
+
+typedef enum {
+    // Not connected
+    NC = (int)0xFFFFFFFF,
+
+    // Ports
+    PA_0  = 0x00,
+    PA_1  = 0x01,
+    PA_2  = 0x02,
+    PA_3  = 0x03,
+    PA_4  = 0x04,
+    PA_5  = 0x05,
+    PA_6  = 0x06,
+    PA_7  = 0x07,
+    PA_8  = 0x08,
+    PA_9  = 0x09,
+    PA_10 = 0x0A,
+    PA_11 = 0x0B,
+    PA_12 = 0x0C,
+    PA_13 = NC,
+    PA_14 = NC,
+    PA_15 = 0x0F,
+
+    PB_0  = 0x10,
+    PB_1  = 0x11,
+    PB_2  = NC,
+    PB_3  = 0x13,
+    PB_4  = 0x14,
+    PB_5  = 0x15,
+    PB_6  = 0x16,
+    PB_7  = 0x17,
+    PB_8  = 0x18,
+    PB_9  = 0x19,
+    PB_10 = 0x1A,
+    PB_11 = 0x1B,
+    PB_12 = 0x1C,
+    PB_13 = 0x1D,
+    PB_14 = 0x1E,
+    PB_15 = 0x1F,
+
+    PC_0  = NC,
+    PC_1  = NC,
+    PC_2  = NC,
+    PC_3  = NC,
+    PC_4  = NC,
+    PC_5  = NC,
+    PC_6  = NC,
+    PC_7  = NC,
+    PC_8  = NC,
+    PC_9  = NC,
+    PC_10 = NC,
+    PC_11 = NC,
+    PC_12 = NC,
+    PC_13 = 0x2D,
+    PC_14 = 0x2E,
+    PC_15 = 0x2F,
+
+    PD_2  = NC,
+
+    // ADC internal channels
+    ADC_TEMP = 0xF0,
+    ADC_VREF = 0xF1,
+
+    // Arduino connector namings
+    A0          = PA_0,
+    A1          = PA_1,
+    A2          = PA_4,
+    A3          = PB_0,
+    A4          = NC,
+    A5          = NC,
+    D0          = PA_3,
+    D1          = PA_2,
+    D2          = PA_10,
+    D3          = PB_3,
+    D4          = PB_5,
+    D5          = PB_4,
+    D6          = PB_10,
+    D7          = PA_8,
+    D8          = PA_9,
+    D9          = NC,
+    D10         = PB_6,
+    D11         = PA_7,
+    D12         = PA_6,
+    D13         = PA_5,
+    D14         = PB_9,
+    D15         = PB_8,
+
+    // Generic signals namings
+    Red_Led     = NC,
+    Green_Led   = PC_13,
+    Blue_Led    = NC,
+    LED1        = PC_13,
+    LED2        = NC,
+    LED3        = NC,
+    LED4        = NC,
+    USER_BUTTON = NC,    
+    SERIAL_TX   = PA_2,
+    SERIAL_RX   = PA_3,
+    USBTX       = PA_12,
+    USBRX       = PA_11,
+    CANRX       = PB_8,    
+    CANTX       = PB_9,
+    I2C_SCL     = PB_6,
+    I2C_SDA     = PB_7,
+    SPI_MOSI    = PA_7,
+    SPI_MISO    = PA_6,
+    SPI_SCK     = PA_5,
+    SPI_CS      = PA_4,
+    TRACE_SWO   = PB_3,
+    SWO         = PB_3
+} PinName;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SysClockConf.cpp	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,56 @@
+/*
+  ******************************************************************************
+  * @file    SysClockConf.c
+  * @version 
+  * @date    05-July-2016
+  * @brief   System Clock configuration for STM32F103C8T6
+  *****************************************************************************
+  *
+  * All rights reserved.
+
+ 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 <http://www.gnu.org/licenses/>.
+  */
+
+#include "SysClockConf.h"
+#include "mbed.h"
+
+void HSE_SystemClock_Config(void) {
+    RCC_OscInitTypeDef        RCC_OscInitStruct;
+    RCC_ClkInitTypeDef        RCC_ClkInitStruct;
+    RCC_PeriphCLKInitTypeDef  PeriphClkInit;
+
+    RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+    RCC_OscInitStruct.HSEState = RCC_HSE_ON;
+    RCC_OscInitStruct.HSEPredivValue = RCC_HSE_PREDIV_DIV1;
+    RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
+    RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;
+    RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9;
+    HAL_RCC_OscConfig(&RCC_OscInitStruct);
+    RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2;
+    RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
+    RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
+    RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2;
+    RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1;
+    HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2);
+    PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC|RCC_PERIPHCLK_USB;
+    PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6;
+    PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5;
+    HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit);
+}
+
+void confSysClock(void) {
+    HAL_RCC_DeInit();
+    HSE_SystemClock_Config();
+    SystemCoreClockUpdate();
+}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/SysClockConf.h	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,2 @@
+#pragma once
+void confSysClock(void);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/main.cpp	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,297 @@
+/* #############################################################################
+**    Archivo        : main.c
+**    Proyecto       : STM32-F103C8_Torreta
+**    Procesador     : STM32F103C8T6
+**    Plataforma     : Blue Pill
+**    Herramienta    : Mbed Compiler
+**    Version        : Driver 01.01
+**    Compilador     : GNU C Compiler
+**    Fecha/Hora     : 14-07-2015, 11:48, # CodeGen: 0
+**    Descripción    :
+**         Este proyecto hace...
+**         This module contains user's application code.
+**   Componentes     : GPIO, Timer, etc .
+**   Configuraciones : Includes, Stacks y Drivers externos
+**   Autores         :
+**         ATEAM Development Group:
+**          - Antulio Morgado Valle
+**
+**   Versión        : Beta
+**   Revisión       : A
+**   Release        : 0
+**   Bugs & Fixes   :
+**   Date           : 20/10/2019
+**                    Added support for Led_RGB
+**                    22/09/2018 
+**                    Added LCD Menu, Beta version (with bugs)
+**
+** ###########################################################################*/
+/*
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+:  Includes
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+*/#include "stm32f103c8t6.h"
+#include "mbed.h"
+#include "Serial.h"
+#include "stdio.h"
+#define DO 523.25, //definimos las frecuencias de las notas
+#define        DoS 554.37
+#define        RE 587.33
+#define        RES 622.25
+#define        MI 659.26
+#define        FA 698.46
+#define        FAS 739.99
+#define        SOL 783.99
+#define        SOLS 830.61
+#define        LA 880
+#define        LAS 932.33
+#define        SI 987.77
+#define        RE2 1174.66
+#define        FAS2 1479.98
+#define        PAU 30000
+/*
+:...............................................................................
+:  Definiciones
+:...............................................................................
+*/#define on              0               // Estado para boton presionado
+#define off             1               // Estado para boton sin presionar
+#define hold            2               // Estado para boton mantenido
+#define release         3               // Estado para boton liberado
+#define FALSE           0               // Estado FALSO
+#define TRUE            1               // Estado VERDADERO
+#define Ticker_Rate     1000            
+            // Periodo de interrupción (us)
+/*
++-------------------------------------------------------------------------------
+|  Configuración de Puertos 
++-------------------------------------------------------------------------------
+*/
+DigitalOut   verde  (LED1);    // NC       (Green_Led)
+BusOut       Torreta(PB_4,PB_3,PA_15,PA_12,PA_11,PA_10,PA_9,PA_8); // 
+DigitalOut   Led_Monitor (PB_1);         // Led monitor de la Tarjeta STM32F103C8
+Ticker       Barrido;    
+PwmOut       Buzzer(PB_11);
+Serial       terminal (PA_2, PA_3);               // PB1_TIM3_CH4N
+/*
++-------------------------------------------------------------------------------
+|  Variables Globales de Usuario 
++-------------------------------------------------------------------------------
+*/
+uint8_t Secuencias[]={
+        //0x03, 0x03, 0xC0, 0xC0, 0x03, 0x03, 0xC0, 0xC0, //   8
+        0x32, 0x12, 0x15, 0xF1, 0x58, 0x33, 0x32, 0x12,
+        0x15, 0xE6, 0x21, 0x81, 0x72, 0xF1, 0xC3, 0xAA,
+        0x15, 0xE6, 0x21, 0x81, 0x72, 0xF1, 0xC3, 0xAA,
+        0x32, 0x12, 0x15, 0xF1, 0x58, 0x33, 0x32, 0x12,
+        0x12, 0x32, 0x33, 0x58, 0xF1, 0x15, 0x12, 0x32,
+        0xAA, 0xC3, 0xF1, 0x72, 0x81, 0x21, 0xE6, 0x15,
+};
+uint16_t No_Secuencias=48;     // Número de secuencias a desplegar
+uint16_t i=0;                   // Indice para las secuencias
+uint16_t delayA=250;             // Tiempo de retardo entre secuencias (en ms)
+uint16_t contadorA=0;            // Contador de mili segundos
+int cont=0;
+
+/* END Global Variables */           
+/*
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+|  Definición de Funciones Prototipo y Rutinas de los Vectores de Interrupción
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+*/
+void caratula ();
+void Menu ();
+void N (void);
+void Barrido_OnInterrupt(void); 
+
+//______________________________________________________________________________  
+int tones[] = {SI, RE2,  SI,  RE2,   PAU,  SI,   LA,   SI,   SI,    SI,   PAU,  RE2,  SI,    SI, PAU,
+               RE2, PAU, RE2,  RE2,  PAU,  SI,   RE2,  SI,   RE2,   PAU,  SI,   LA,   SI,    SI, 
+               SI, PAU,  RE2,  SI,   SI,   PAU,  RE2,  PAU,  RE2,   RE2,  PAU,  RE2,  PAU,   SI,
+               RE2, PAU, SI,   RE2,  PAU,  SI,   RE2,  PAU,  SI,   PAU,   RE2,  SI,   LA,    SI, 
+               PAU, RE2, PAU,   SI,  RE2,  PAU,  SI,   RE2,  PAU,  SI,    RE2,  PAU,  SI,   PAU, 
+               RE2, SI,   LA,   SI,  PAU,  FAS2, PAU,  RE2,  FAS2, PAU,   RE2,  FAS2, PAU, 
+               RE2 ,FAS2, PAU, RE2,  FAS2, PAU,  RE2,  LA,   SOLS, SI,   PAU,   FAS2, PAU,
+               RE2, FAS2, PAU, RE2,  FAS2, PAU,  RE2,  FAS2, PAU,  RE2,  FAS2,  PAU, //64+13
+               RE2, LA,    SI, SI,};//113 tonos
+int tones_num = 113;
+int d=1000, e=500, m=250, c=125; //definimos los tiempos de doble, entera, media y cuarta
+int duracionNota[] = {m, m, m, m, e, c, m, m, c, m, e, m, m, m, e, m, m, m, m, d, m, m, m, m, e, c, m, m, c, m, e, m, m, m, e, m, m, m, m, d,
+m, m, m, m, m, m, m, m, m, m, m, m, c, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+m, m, m, m, m, m, m, m, m, m, m, m, c, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m, m,
+};
+
+
+void Play_tunes(PwmOut name, int notes, int tones);
+
+
+/*
+#===============================================================================
+|
+|               P R O G R A M A     P R I N C I P A L
+|
+#=============================================================================== 
+*/
+int main()          
+{       // Inicialización de variables locales, puertos e interrupciones van aquí !!!
+confSysClock();     // Inicialización del Sistema, 
+Barrido.attach_us(&Barrido_OnInterrupt, Ticker_Rate);   // Periodo de la Interrupción por Timer = 1ms (Tcker_Rate=1000)
+
+    //while (true)                // El Lazo del Programa principal está aquí !!!
+    N ();
+    caratula ();
+    Menu ();
+}
+/* END main */
+
+/*
+................................................................................
+:  Rutinas de los Vectores de Interrupción
+................................................................................
+*/
+// Esta es la función Play_tunes que mandamos a llamar dandole algunos
+// valores anteriormente
+void N()
+    {
+        terminal.baud(115200); 
+    }
+void caratula ()
+    { 
+        terminal.printf("Instituto Politecnico Nacional\n");
+        terminal.printf("Escuela Superior de Ingenieria Mecanica y Electrica\n");
+        terminal.printf("Analisis Numerico\n");
+        terminal.printf("Moya Garcia Iris\n");
+    }
+void Menu ()
+    {
+        int opcion=0;
+        do 
+        {
+            terminal.printf("\tBievenido\n");
+            terminal.printf ("Este programa tiene secuencias de: leds y de notas\n");
+            terminal.printf("Elija la opcion deseada\n");
+            terminal.printf("Seleccione 1: Si solo quiere secuencia de leds\n");
+            terminal.printf("Seleccione 2: Si solo quiere secuencia de tonos\n");
+            terminal.printf("Seleccione 3: Si solo quiere secuencia de leds\n");
+            terminal.printf("Seleccione 4: Si quiere salir\n");
+            scanf("%d", &opcion);
+            if (opcion== 0)
+            {
+                Barrido.attach_us(&Barrido_OnInterrupt, Ticker_Rate);
+            }
+            if (opcion== 2)
+            {
+            for(int x=0; x<40; x++)
+              {
+              int i;
+              for (i=0; i<100; i=+5) { 
+              Buzzer.period(1.0/969.0);
+              Buzzer = float(i)/50.0;
+              wait(.5);
+              Buzzer.period(1.0/800.0);
+              wait(.5);
+              }
+              for (i=25; i>=0; i=i-2) {
+              Buzzer.period(1.0/969.0);
+              Buzzer = float(i)/50.0;
+              wait(.5);
+              Buzzer.period(1.0/800.0);
+              wait(.5);
+              }
+              Buzzer = 0.0;
+              }
+            }
+        if (opcion== 3)
+        {
+             {
+              Barrido.attach_us(&Barrido_OnInterrupt, Ticker_Rate);
+              for(int x=0; x<40; x++)
+              {
+              int i;
+              for (i=0; i<26; i=i+2) {
+              Buzzer.period(1.0/969.0);
+              Buzzer = float(i)/50.0;
+              wait(.5);
+              Buzzer.period(1.0/800.0);
+              wait(.5);
+              }
+              for (i=25; i>=0; i=i-2) {
+              Buzzer.period(1.0/969.0);
+              Buzzer = float(i)/50.0;
+              wait(.5);
+              Buzzer.period(1.0/800.0);
+              wait(.5);
+              }
+              Buzzer = 0.0;
+              }
+              }
+        }
+        if ((opcion!=0) || (opcion!= 1)||(opcion!= 2)||(opcion!= 3))
+       terminal.printf("Opcion invalida");
+        }
+       while (opcion== 3); 
+    }
+    void Barrido_OnInterrupt()
+{
+    /* Rutina de Atención a la Interrupción */
+    
+    contadorA++;                     // Incremeta el contador de mili segundos
+    if (contadorA == delayA)          // Contador es igual al retardo programado?
+    {
+    Torreta=tones[cont];          // Escribe la secuencia
+    cont++;                            // Incrementa el índice
+    if (cont >= No_Secuencias) cont=0;    // Es la última secuencia?
+    contadorA =0;                    // Reinicia contador de retardo
+    Led_Monitor = !Led_Monitor;     // Parpadeo del Led Monitor
+    }
+}
+/*
+________________________________________________________________________________
+|
+|  Funciones Prototipo
+|_______________________________________________________________________________
+*/
+                    // Las Funciones Prototipo van aquí !
+//void confSysClock(void);    // Configure system clock (72MHz HSE clock, 48MHz USB clock)
+
+/* END functions */    
+                
+/* END program */
+
+/*+-----------------------------------------------------------------------------       
+*+ La documentación va aquí!:
++--------------------------------------------------------------------------------
+|                               EJERCICIO
+|
+| 1.-   Modificar este programa para: 
+|       a) Agregar más secuencias (mínimo 32).
+|       b) Realizar el barrido del arreglo de atrás hacia adelante y repetir
+| 2.-   Modificar el programa para incluir secuencias de sonidos utiliando el 
+|       módulo PWM (Sirena).
+|       
++--------------------------------------------------------------------------------
+|
+|                               EXAMEN
+|
+| 1.-   Modificar el programa para que despliegue un rango de secuencias  
+|       determinado.
+| 2.-   Modificar el programa para incluir un menú de selección de secuencias.
+|       a) Para la Torreta
+|       b) Para la Sirena
+|       c) Combinados
+| 3.-   Volver a realizar éste programa utilizando tambien con apuntadores.
+|
+|       Mucha Suerte!                       
+|
+*+----------------------------------------------------------------------------*
+*+
+*+   Powered by
+*+
+*+          T H E     A N T U L I U ' S   T E A M   R&D  Unltd 
+*+
+*+  Research, Development, Systems, Equipment, Support & Spare Parts.
+*+  (C) Copyright 1989-2019, All Rights Reserved            
+*+
+*+  Welcome to The Beaners Proyect Community!                   
+*+----------------------------------------------------------------------------*/
+
+/* END Mbed */   
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mbed.bld	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,1 @@
+https://os.mbed.com/users/mbed_official/code/mbed/builds/65be27845400
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/stm32f103c8t6.h	Sat Oct 26 03:57:39 2019 +0000
@@ -0,0 +1,4 @@
+#pragma once
+#include "PinNames.h"
+#include "SysClockConf.h"
+