Changes to Software part

This commit is contained in:
Andreas Mieke 2018-04-02 15:20:43 +02:00
parent d11382ed9f
commit d109bae8d7
15 changed files with 101 additions and 128 deletions

View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<package schemaVersion="1.4" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="PACK.xsd">
<vendor>HTBL Hollabrunn</vendor>
<vendor>HTL Hollabrunn</vendor>
<name>STD-Pack</name>
<description>HTL Hollabrunn library and include pack</description>
<url></url>
@ -8,35 +8,40 @@
<releases>
<release version="1.0.0" date="2017-07-16">
Initial version
Initial version -- Mieke
</release>
<release version="2.0.0" date="2017-07-20">
Major version push -- REJ
</release>
<release version="2.1.0" date="2018-04-02">
Removing Start Up code as it is no longer needed, due to code which exists within the CMSIS packs -- Mieke
</release>
</releases>
<keywords>
<keyword>HTBL Hollabrunn</keyword>
<keyword>HTL Hollabrunn</keyword>
<keyword>STD Library</keyword>
<keyword>Serbus Library</keyword>
</keywords>
<components>
<component Cclass="HTBL Hollabrunn" Cgroup="Libraries" Csub="STDLib" Cversion="1.0.0">
<description>Standard library for the HTBL</description>
<component Cclass="HTL Hollabrunn" Cgroup="Libraries" Csub="STDLib" Cversion="2.0.0">
<description>Standard library for the HTL</description>
<files>
<file category="header" name="Header/armv10_std.h"/>
<file category="library" name="Library/ARMV10_STD.lib"/>
</files>
</component>
<component Cclass="HTBL Hollabrunn" Cgroup="Libraries" Csub="SerbusLib" Cversion="1.0.0" condition="STDLib">
<description>Serial bus library for the HTBL</description>
<component Cclass="HTL Hollabrunn" Cgroup="Libraries" Csub="SerbusLib" Cversion="1.0.0" condition="STDLib">
<description>Serial bus library for the HTL</description>
<files>
<file category="header" name="Header/armv10_serbus.h"/>
<file category="library" name="Library/armv10_serbus.lib"/>
</files>
</component>
<component Cclass="HTBL Hollabrunn" Cgroup="Assembler" Csub="Includes" Cversion="1.0.0">
<description>Assembler includes for the HTBL</description>
<component Cclass="HTL Hollabrunn" Cgroup="Assembler" Csub="Includes" Cversion="2.0.0">
<description>Assembler includes for the HTL</description>
<files>
<file category="header" name="Header/STD_STM32_F103RB_ASM.INC"/>
<file category="header" name="Header/STM32_F103RB_MEM_MAP.INC"/>
</files>
</component>
@ -45,7 +50,7 @@
<conditions>
<condition id="STDLib">
<description>Standard library</description>
<require Cclass="HTBL Hollabrunn" Cgroup="Libraries" Csub="STDLib" />
<require Cclass="HTL Hollabrunn" Cgroup="Libraries" Csub="STDLib" />
</condition>
</conditions>
</package>

View file

@ -1,30 +0,0 @@
;******************************************************************************
;* (C) Copyright HTL - HOLLABRUNN 2009-2010 All rights reserved. AUSTRIA *
;* *
;* File Name: std32_f103rb_std.inc *
;* Autor: Josef Reisinger *
;* Version: V1.00 *
;* Date: 25/10/2010 *
;* Description: Standard Library für ARM Corttex M3 *
;******************************************************************************
;* History: V1.00 creation *
;* *
;******************************************************************************
EXTERN init_leds_switches
EXTERN set_leds
EXTERN get_actual_switches
EXTERN wait_ms
EXTERN wait_10us
EXTERN uart_init
EXTERN uart_put_char
EXTERN uart_get_char
EXTERN uart_put_string
EXTERN uart_clear
EXTERN uart_put_hex
EXTERN nib2asc
EXTERN hex2bcd
EXTERN asc2nib
END

View file

@ -1,14 +1,20 @@
; File soll in Verzeichnis "C:\Keil\ARM\INC\ST\STM32F10x" kopiert werden (Installationspfad µVision)
;******************************************************************************
; * @file STM32_F103RB_MEM_MAP.IC
; * @author Josef Reisinger
; * @version V2.0
; * @date 22-November-2017
; * @brief CMSIS Cortex-M3 Device Peripheral Access Layer Include File.
; * This file contains the most important peripheral register's definitions
; and memory mapping for STM32F10x Performance line,
PERIPH_BB_BASE EQU 0x42000000
PERIPH_BASE EQU 0x40000000
PERIPH_BASE EQU 0x40000000
APB1PERIPH_BASE EQU PERIPH_BASE
APB2PERIPH_BASE EQU PERIPH_BASE + 0x10000
AHBPERIPH_BASE EQU PERIPH_BASE + 0x20000
GPIOA_BASE EQU APB2PERIPH_BASE + 0x0800
GPIOA_CRL EQU GPIOA_BASE
GPIOA_CRH EQU GPIOA_BASE+0x04
@ -48,6 +54,15 @@ USART1_CR2 EQU USART1_BASE+0x10
USART1_CR3 EQU USART1_BASE+0x14
USART1_GTPR EQU USART1_BASE+0x18
USART2_BASE EQU APB1PERIPH_BASE + 0x4400
USART2_SR EQU USART2_BASE
USART2_DR EQU USART2_BASE+0x04
USART2_BRR EQU USART2_BASE+0x08
USART2_CR1 EQU USART2_BASE+0x0C
USART2_CR2 EQU USART2_BASE+0x10
USART2_CR3 EQU USART2_BASE+0x14
USART2_GTPR EQU USART2_BASE+0x18
RCC_BASE EQU AHBPERIPH_BASE + 0x1000
RCC_CR EQU RCC_BASE

View file

@ -1,4 +1,4 @@
#!/bin/bash
cd Files
7z a "../HTBL Hollabrunn.STD-Pack.1.0.0.pack" * -tzip
7z a "../HTBL_Hollabrunn.STD-Pack.2.1.0.pack" * -tzip
cd ..