From: Michael Wiebusch <stratomaster@gmx.net>
Date: Fri, 13 Dec 2013 17:57:03 +0000 (+0100)
Subject: cleaned up a bit, added documentation on how to use the programmer
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=a701e40ce1aadf9276afd6b21e76be483755593a;p=mvd_firmware.git

cleaned up a bit, added documentation on how to use the programmer
---

diff --git a/README.txt b/README.txt
index ce92822..dbf896d 100644
--- a/README.txt
+++ b/README.txt
@@ -1 +1,2 @@
 Microncontroller firmware for Converter Board 2013
++ Programmer Software
diff --git a/STM32_toolchain/HowTo_ToolChain_STM32_Ubuntu_2013.pdf b/STM32_toolchain/HowTo_ToolChain_STM32_Ubuntu_2013.pdf
new file mode 100644
index 0000000..d0410fb
Binary files /dev/null and b/STM32_toolchain/HowTo_ToolChain_STM32_Ubuntu_2013.pdf differ
diff --git a/STM32_toolchain/README b/STM32_toolchain/README
new file mode 100644
index 0000000..56fa987
--- /dev/null
+++ b/STM32_toolchain/README
@@ -0,0 +1,11 @@
+relevant topics from HowTo_ToolChain_STM32_Ubuntu:
+
++ GCC Toolchain (Sourcery CodeBench Lite 2012.09 for ARM EABI)
+
++ Basic Projects (Makefile structure)
+
+we use a different programmer (not described in the HowTo):
+
+protocol: SWD
+programmer hardware: ST-Link/V2
+programmer software: st-flash
diff --git a/SWD_programmer/HOWTO b/SWD_programmer/HOWTO
new file mode 100644
index 0000000..3c72fad
--- /dev/null
+++ b/SWD_programmer/HOWTO
@@ -0,0 +1,89 @@
+#############################
+#          HOWTO            #
+#############################
+
+Hi,
+
+I suppose you want to flash the CBM MVD Converter Board v2013 firmware to the on board
+microcontroller while using the SWD protocol/interfac. Let me tell you how it is done:
+
+
+#############################
+#       Prerequisites       #
+#############################
+
+  + Converter Board 2013
+  + ST-Link/V2  (ST microcontroller programmer)
+  + Linux Computer
+  + Programmer software: "st-flash"
+  
+  
+#############################
+#   Software installation   #
+#############################
+
+on Ubuntu based systems:
+$ sudo apt-get install libusb-1.0-0-dev git
+
+other systems:
+  make sure you have libusb-1.0-0-dev installed,
+  or cross your fingers that the software will without it or compile anyway
+  (it did when I installed it on jspc57)
+  
+
+get the latest sources: 
+
+$ git clone https://github.com/texane/stlink stlink.git
+
+OR unzip the snapshot that I already downloaded for you:
+
+$ tar -jxvf stlink.git.tar.bz2
+
+enter the newly created directory:
+
+$ cd stlink.git
+
+execute some config/build scripts:
+
+$ ./autogen.sh
+$ ./configure
+$ ./make
+
+if all went well (the scripts don't break with an ERROR) then
+install the software:
+
+$ sudo make install
+
+
+#############################
+#   Electrical connection   #
+#############################
+
+On the ST-Link/V2 we have a small and a big pin header.
+We don't care about the small pin header.
+
+We want to use the SWD protocol. Therefore we need to connect four lines:
+
+  # pin on header  # line on target board
+  1                VCC (3.3V)
+  4                GND
+  7                SWD_IO
+  9                SWD_CLK
+
+... no the programmer will not work without connecting the target VCC, I already tried.
+
+Of course, you connect the ST-Link/V2 to a USB port of your computer.
+
+
+#############################
+#         Flashing          #
+#############################
+
+Now all you really need to do is finding the firmware image, say "main.bin" and call
+the programmer:
+
+$ st-flash write /path/to/main.bin 0x8000000
+
+And you are done,
+
+have a nice life!
\ No newline at end of file
diff --git a/SWD_programmer/stlink.git.tar.bz2 b/SWD_programmer/stlink.git.tar.bz2
new file mode 100644
index 0000000..4668640
Binary files /dev/null and b/SWD_programmer/stlink.git.tar.bz2 differ
diff --git a/china_devel_board/test001/stm32loader.py b/china_devel_board/test001/stm32loader.py
deleted file mode 100755
index 2347ccf..0000000
--- a/china_devel_board/test001/stm32loader.py
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/usr/bin/env python
-
-# -*- coding: utf-8 -*-
-# vim: sw=4:ts=4:si:et:enc=utf-8
-
-# Author: Ivan A-R <ivan@tuxotronic.org>
-# Project page: http://tuxotronic.org/wiki/projects/stm32loader
-#
-# This file is part of stm32loader.
-#
-# stm32loader 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, or (at your option) any later
-# version.
-#
-# stm32loader 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 stm32loader; see the file COPYING3.  If not see
-# <http://www.gnu.org/licenses/>.
-
-import sys, getopt
-import serial
-import time
-
-try:
-    from progressbar import *
-    usepbar = 1
-except:
-    usepbar = 0
-
-# Verbose level
-QUIET = 20
-
-def mdebug(level, message):
-    if(QUIET >= level):
-        print >> sys.stderr , message
-
-
-class CmdException(Exception):
-    pass
-
-class CommandInterface:
-    def open(self, aport='/dev/tty.usbserial-FTD3TMCH', abaudrate=115200) :
-        self.sp = serial.Serial(
-            port=aport,
-            baudrate=abaudrate,     # baudrate
-            bytesize=8,             # number of databits
-            parity=serial.PARITY_EVEN,
-            stopbits=1,
-            xonxoff=0,              # enable software flow control
-            rtscts=0,               # disable RTS/CTS flow control
-            timeout=5               # set a timeout value, None for waiting forever
-        )
-
-
-    def _wait_for_ask(self, info = ""):
-        # wait for ask
-        try:
-            ask = ord(self.sp.read())
-        except:
-            raise CmdException("Can't read port or timeout")
-        else:
-            if ask == 0x79:
-                # ACK
-                return 1
-            else:
-                if ask == 0x1F:
-                    # NACK
-                    raise CmdException("NACK "+info)
-                else:
-                    # Unknow responce
-                    raise CmdException("Unknow response. "+info+": "+hex(ask))
-
-
-    def reset(self):
-        self.sp.setDTR(0)
-        time.sleep(0.1)
-        self.sp.setDTR(1)
-        time.sleep(0.5)
-
-    def initChip(self):
-        # Set boot
-        self.sp.setRTS(0)
-        self.reset()
-
-        self.sp.write("\x7F")       # Syncro
-        return self._wait_for_ask("Syncro")
-
-    def releaseChip(self):
-        self.sp.setRTS(1)
-        self.reset()
-
-    def cmdGeneric(self, cmd):
-        self.sp.write(chr(cmd))
-        self.sp.write(chr(cmd ^ 0xFF)) # Control byte
-        return self._wait_for_ask(hex(cmd))
-
-    def cmdGet(self):
-        if self.cmdGeneric(0x00):
-            mdebug(10, "*** Get command");
-            len = ord(self.sp.read())
-            version = ord(self.sp.read())
-            mdebug(10, "    Bootloader version: "+hex(version))
-            dat = map(lambda c: hex(ord(c)), self.sp.read(len))
-            mdebug(10, "    Available commands: "+str(dat))
-            self._wait_for_ask("0x00 end")
-            return version
-        else:
-            raise CmdException("Get (0x00) failed")
-
-    def cmdGetVersion(self):
-        if self.cmdGeneric(0x01):
-            mdebug(10, "*** GetVersion command")
-            version = ord(self.sp.read())
-            self.sp.read(2)
-            self._wait_for_ask("0x01 end")
-            mdebug(10, "    Bootloader version: "+hex(version))
-            return version
-        else:
-            raise CmdException("GetVersion (0x01) failed")
-
-    def cmdGetID(self):
-        if self.cmdGeneric(0x02):
-            mdebug(10, "*** GetID command")
-            len = ord(self.sp.read())
-            id = self.sp.read(len+1)
-            self._wait_for_ask("0x02 end")
-            return id
-        else:
-            raise CmdException("GetID (0x02) failed")
-
-
-    def _encode_addr(self, addr):
-        byte3 = (addr >> 0) & 0xFF
-        byte2 = (addr >> 8) & 0xFF
-        byte1 = (addr >> 16) & 0xFF
-        byte0 = (addr >> 24) & 0xFF
-        crc = byte0 ^ byte1 ^ byte2 ^ byte3
-        return (chr(byte0) + chr(byte1) + chr(byte2) + chr(byte3) + chr(crc))
-
-
-    def cmdReadMemory(self, addr, lng):
-        assert(lng <= 256)
-        if self.cmdGeneric(0x11):
-            mdebug(10, "*** ReadMemory command")
-            self.sp.write(self._encode_addr(addr))
-            self._wait_for_ask("0x11 address failed")
-            N = (lng - 1) & 0xFF
-            crc = N ^ 0xFF
-            self.sp.write(chr(N) + chr(crc))
-            self._wait_for_ask("0x11 length failed")
-            return map(lambda c: ord(c), self.sp.read(lng))
-        else:
-            raise CmdException("ReadMemory (0x11) failed")
-
-
-    def cmdGo(self, addr):
-        if self.cmdGeneric(0x21):
-            mdebug(10, "*** Go command")
-            self.sp.write(self._encode_addr(addr))
-            self._wait_for_ask("0x21 go failed")
-        else:
-            raise CmdException("Go (0x21) failed")
-
-
-    def cmdWriteMemory(self, addr, data):
-        assert(len(data) <= 256)
-        if self.cmdGeneric(0x31):
-            mdebug(10, "*** Write memory command")
-            self.sp.write(self._encode_addr(addr))
-            self._wait_for_ask("0x31 address failed")
-            #map(lambda c: hex(ord(c)), data)
-            lng = (len(data)-1) & 0xFF
-            mdebug(10, "    %s bytes to write" % [lng+1]);
-            self.sp.write(chr(lng)) # len really
-            crc = 0xFF
-            for c in data:
-                crc = crc ^ c
-                self.sp.write(chr(c))
-            self.sp.write(chr(crc))
-            self._wait_for_ask("0x31 programming failed")
-            mdebug(10, "    Write memory done")
-        else:
-            raise CmdException("Write memory (0x31) failed")
-
-
-    def cmdEraseMemory(self, sectors = None):
-        if self.cmdGeneric(0x43):
-            mdebug(10, "*** Erase memory command")
-            if sectors is None:
-                # Global erase
-                self.sp.write(chr(0xFF))
-                self.sp.write(chr(0x00))
-            else:
-                # Sectors erase
-                self.sp.write(chr((len(sectors)-1) & 0xFF))
-                crc = 0xFF
-                for c in sectors:
-                    crc = crc ^ c
-                    self.sp.write(chr(c))
-                self.sp.write(chr(crc))
-            self._wait_for_ask("0x43 erasing failed")
-            mdebug(10, "    Erase memory done")
-        else:
-            raise CmdException("Erase memory (0x43) failed")
-
-    def cmdWriteProtect(self, sectors):
-        if self.cmdGeneric(0x63):
-            mdebug(10, "*** Write protect command")
-            self.sp.write(chr((len(sectors)-1) & 0xFF))
-            crc = 0xFF
-            for c in sectors:
-                crc = crc ^ c
-                self.sp.write(chr(c))
-            self.sp.write(chr(crc))
-            self._wait_for_ask("0x63 write protect failed")
-            mdebug(10, "    Write protect done")
-        else:
-            raise CmdException("Write Protect memory (0x63) failed")
-
-    def cmdWriteUnprotect(self):
-        if self.cmdGeneric(0x73):
-            mdebug(10, "*** Write Unprotect command")
-            self._wait_for_ask("0x73 write unprotect failed")
-            self._wait_for_ask("0x73 write unprotect 2 failed")
-            mdebug(10, "    Write Unprotect done")
-        else:
-            raise CmdException("Write Unprotect (0x73) failed")
-
-    def cmdReadoutProtect(self):
-        if self.cmdGeneric(0x82):
-            mdebug(10, "*** Readout protect command")
-            self._wait_for_ask("0x82 readout protect failed")
-            self._wait_for_ask("0x82 readout protect 2 failed")
-            mdebug(10, "    Read protect done")
-        else:
-            raise CmdException("Readout protect (0x82) failed")
-
-    def cmdReadoutUnprotect(self):
-        if self.cmdGeneric(0x92):
-            mdebug(10, "*** Readout Unprotect command")
-            self._wait_for_ask("0x92 readout unprotect failed")
-            self._wait_for_ask("0x92 readout unprotect 2 failed")
-            mdebug(10, "    Read Unprotect done")
-        else:
-            raise CmdException("Readout unprotect (0x92) failed")
-
-
-# Complex commands section
-
-    def readMemory(self, addr, lng):
-        data = []
-        if usepbar:
-            widgets = ['Reading: ', Percentage(),', ', ETA(), ' ', Bar()]
-            pbar = ProgressBar(widgets=widgets,maxval=lng, term_width=79).start()
-        
-        while lng > 256:
-            if usepbar:
-                pbar.update(pbar.maxval-lng)
-            else:
-                mdebug(5, "Read %(len)d bytes at 0x%(addr)X" % {'addr': addr, 'len': 256})
-            data = data + self.cmdReadMemory(addr, 256)
-            addr = addr + 256
-            lng = lng - 256
-        if usepbar:
-            pbar.update(pbar.maxval-lng)
-            pbar.finish()
-        else:
-            mdebug(5, "Read %(len)d bytes at 0x%(addr)X" % {'addr': addr, 'len': 256})
-        data = data + self.cmdReadMemory(addr, lng)
-        return data
-
-    def writeMemory(self, addr, data):
-        lng = len(data)
-        if usepbar:
-            widgets = ['Writing: ', Percentage(),' ', ETA(), ' ', Bar()]
-            pbar = ProgressBar(widgets=widgets, maxval=lng, term_width=79).start()
-        
-        offs = 0
-        while lng > 256:
-            if usepbar:
-                pbar.update(pbar.maxval-lng)
-            else:
-                mdebug(5, "Write %(len)d bytes at 0x%(addr)X" % {'addr': addr, 'len': 256})
-            self.cmdWriteMemory(addr, data[offs:offs+256])
-            offs = offs + 256
-            addr = addr + 256
-            lng = lng - 256
-        if usepbar:
-            pbar.update(pbar.maxval-lng)
-            pbar.finish()
-        else:
-            mdebug(5, "Write %(len)d bytes at 0x%(addr)X" % {'addr': addr, 'len': 256})
-        self.cmdWriteMemory(addr, data[offs:offs+lng] + ([0xFF] * (256-lng)) )
-
-
-
-
-	def __init__(self) :
-        pass
-
-
-def usage():
-    print """Usage: %s [-hqVewvr] [-l length] [-p port] [-b baud] [-a addr] [file.bin]
-    -h          This help
-    -q          Quiet
-    -V          Verbose
-    -e          Erase
-    -w          Write
-    -v          Verify
-    -r          Read
-    -l length   Length of read
-    -p port     Serial port (default: /dev/tty.usbserial-ftCYPMYJ)
-    -b baud     Baud speed (default: 115200)
-    -a addr     Target address
-
-    ./stm32loader.py -e -w -v example/main.bin
-
-    """ % sys.argv[0]
-
-
-if __name__ == "__main__":
-    
-    # Import Psyco if available
-    try:
-        import psyco
-        psyco.full()
-        print "Using Psyco..."
-    except ImportError:
-        pass
-
-    conf = {
-            'port': '/dev/tty.usbserial-FTD3TMCH',
-            'baud': 115200,
-            'address': 0x08000000,
-            'erase': 0,
-            'write': 0,
-            'verify': 0,
-            'read': 0,
-            'len': 1000,
-            'fname':'',
-        }
-
-# http://www.python.org/doc/2.5.2/lib/module-getopt.html
-
-    try:
-        opts, args = getopt.getopt(sys.argv[1:], "hqVewvrp:b:a:l:")
-    except getopt.GetoptError, err:
-        # print help information and exit:
-        print str(err) # will print something like "option -a not recognized"
-        usage()
-        sys.exit(2)
-
-    QUIET = 5
-
-    for o, a in opts:
-        if o == '-V':
-            QUIET = 10
-        elif o == '-q':
-            QUIET = 0
-        elif o == '-h':
-            usage()
-            sys.exit(0)
-        elif o == '-e':
-            conf['erase'] = 1
-        elif o == '-w':
-            conf['write'] = 1
-        elif o == '-v':
-            conf['verify'] = 1
-        elif o == '-r':
-            conf['read'] = 1
-        elif o == '-p':
-            conf['port'] = a
-        elif o == '-b':
-            conf['baud'] = eval(a)
-        elif o == '-a':
-            conf['address'] = eval(a)
-        elif o == '-l':
-            conf['len'] = eval(a)
-#        elif o == '-f':
-#            conf['fname'] = a
-        else:
-            assert False, "unhandled option"
-
-    cmd = CommandInterface()
-    cmd.open(conf['port'], conf['baud'])
-    mdebug(10, "Open port %(port)s, baud %(baud)d" % {'port':conf['port'], 'baud':conf['baud']})
-    try:
-        try:
-            cmd.initChip()
-        except:
-            print "Can't init. Ensure that BOOT0 is enabled and reset device"
-
-        bootversion = cmd.cmdGet()
-        mdebug(0, "Bootloader version %X" % bootversion)
-        mdebug(0, "Chip id `%s'" % str(map(lambda c: hex(ord(c)), cmd.cmdGetID())))
-#    cmd.cmdGetVersion()
-#    cmd.cmdGetID()
-#    cmd.cmdReadoutUnprotect()
-#    cmd.cmdWriteUnprotect()
-#    cmd.cmdWriteProtect([0, 1])
-
-        if (conf['write'] or conf['verify']):
-            #data = map(lambda c: ord(c), file(args[0]).read())
-            # line altered following comment in blog post 1 feb 2011
-            data = map(lambda c: ord(c), file(args[0], 'rb').read()) 
-        if conf['erase']:
-            cmd.cmdEraseMemory()
-
-        if conf['write']:
-            cmd.writeMemory(conf['address'], data)
-
-        if conf['verify']:
-            verify = cmd.readMemory(conf['address'], len(data))
-            if(data == verify):
-                print "Verification OK"
-            else:
-                print "Verification FAILED"
-                print str(len(data)) + ' vs ' + str(len(verify))
-                for i in xrange(0, len(data)):
-                    if data[i] != verify[i]:
-                        print hex(i) + ': ' + hex(data[i]) + ' vs ' + hex(verify[i])
-
-        if not conf['write'] and conf['read']:
-            rdata = cmd.readMemory(conf['address'], conf['len'])
-#            file(conf['fname'], 'wb').write(rdata)
-            file(args[0], 'wb').write(''.join(map(chr,rdata)))
-
-#    cmd.cmdGo(addr + 0x04)
-    finally:
-        cmd.releaseChip()
-
diff --git a/china_devel_board/test001/.cproject b/firmware/.cproject
similarity index 100%
rename from china_devel_board/test001/.cproject
rename to firmware/.cproject
diff --git a/china_devel_board/test001/.externalToolBuilders/make.launch b/firmware/.externalToolBuilders/make.launch
similarity index 100%
rename from china_devel_board/test001/.externalToolBuilders/make.launch
rename to firmware/.externalToolBuilders/make.launch
diff --git a/china_devel_board/test001/.externalToolBuilders/make_clean.launch b/firmware/.externalToolBuilders/make_clean.launch
similarity index 100%
rename from china_devel_board/test001/.externalToolBuilders/make_clean.launch
rename to firmware/.externalToolBuilders/make_clean.launch
diff --git a/china_devel_board/test001/.project b/firmware/.project
similarity index 100%
rename from china_devel_board/test001/.project
rename to firmware/.project
diff --git a/china_devel_board/test001/Makefile b/firmware/Makefile
similarity index 89%
rename from china_devel_board/test001/Makefile
rename to firmware/Makefile
index 5fc7e5f..779f88a 100644
--- a/china_devel_board/test001/Makefile
+++ b/firmware/Makefile
@@ -42,6 +42,6 @@ swd: all
 	
 remote_swd: all
 	scp main.hex root@jspc55:/local.1/mwiebusch/stm32/ && ssh root@jspc57 "vsprog -cstm32_hd -ms -oe -owf -I /d/jspc55.1/mwiebusch/stm32/main.hex"
-
-remote_reset: 
-	ssh root@jspc57 "vsprog -cstm32_hd -ms"
+	
+remote_program: all
+	scp main.bin root@jspc55:/local.1/mwiebusch/stm32/ && ssh root@jspc57 "st-flash write /d/jspc55.1/mwiebusch/stm32/main.bin 0x8000000"
diff --git a/china_devel_board/test001/Makefile.common b/firmware/Makefile.common
similarity index 100%
rename from china_devel_board/test001/Makefile.common
rename to firmware/Makefile.common
diff --git a/china_devel_board/test001/libs/Makefile b/firmware/libs/Makefile
similarity index 100%
rename from china_devel_board/test001/libs/Makefile
rename to firmware/libs/Makefile
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport/core_cm3.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/Release_Notes.html
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_cl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_hd_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_ld_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_md_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/TrueSTUDIO/startup_stm32f10x_xl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_cl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_hd_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_ld_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_xl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_cl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_hd_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_ld_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_md_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/gcc_ride7/startup_stm32f10x_xl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_cl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_hd_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_ld_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_md_vl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/iar/startup_stm32f10x_xl.s
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/stm32f10x.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/system_stm32f10x.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS debug support.htm b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS debug support.htm
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS debug support.htm
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS debug support.htm
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS_changes.htm b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS_changes.htm
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS_changes.htm
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CMSIS_changes.htm
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Documentation/CMSIS_Core.htm b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Documentation/CMSIS_Core.htm
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Documentation/CMSIS_Core.htm
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/Documentation/CMSIS_Core.htm
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/License.doc b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/License.doc
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/License.doc
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/License.doc
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/misc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_adc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_bkp.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_can.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_cec.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_crc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dac.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dbgmcu.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_dma.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_exti.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_flash.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_fsmc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_gpio.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_i2c.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_iwdg.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_pwr.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rcc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_rtc.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_sdio.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_spi.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_tim.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_usart.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc/stm32f10x_wwdg.h
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/misc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_adc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_bkp.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_can.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_cec.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_crc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dac.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dbgmcu.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_dma.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_exti.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_flash.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_fsmc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_gpio.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_i2c.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_iwdg.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_pwr.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rcc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_rtc.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_sdio.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_spi.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_tim.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_usart.c
diff --git a/china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c b/firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
similarity index 100%
rename from china_devel_board/test001/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
rename to firmware/libs/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/src/stm32f10x_wwdg.c
diff --git a/china_devel_board/test001/linker.ld b/firmware/linker.ld
similarity index 100%
rename from china_devel_board/test001/linker.ld
rename to firmware/linker.ld
diff --git a/china_devel_board/test001/src/Makefile b/firmware/src/Makefile
similarity index 100%
rename from china_devel_board/test001/src/Makefile
rename to firmware/src/Makefile
diff --git a/china_devel_board/test001/src/generatePinConstants/generate.sh b/firmware/src/generatePinConstants/generate.sh
similarity index 82%
rename from china_devel_board/test001/src/generatePinConstants/generate.sh
rename to firmware/src/generatePinConstants/generate.sh
index e9f6eaa..07023a1 100755
--- a/china_devel_board/test001/src/generatePinConstants/generate.sh
+++ b/firmware/src/generatePinConstants/generate.sh
@@ -83,4 +83,26 @@ for entry in $(cat pins.tmp); do
   c=$[ c + 1 ]
 done
 echo "};"
+#####
+
+echo
+echo
+
+##### print output inits
+c=0
+for entry in $(cat pins.tmp); do
+  echo "  CB_GPIO_Out_Init($entry);"
+  c=$[ c + 1 ]
+done
+#####
+
+echo
+echo
+
+##### print output inits
+c=0
+for entry in $(cat pins.tmp); do
+  echo "  CB_GPIO_Out_Lo($entry);"
+  c=$[ c + 1 ]
+done
 #####
\ No newline at end of file
diff --git a/china_devel_board/test001/src/generatePinConstants/pins.tmp b/firmware/src/generatePinConstants/pins.tmp
similarity index 100%
rename from china_devel_board/test001/src/generatePinConstants/pins.tmp
rename to firmware/src/generatePinConstants/pins.tmp
diff --git a/china_devel_board/test001/src/main.c b/firmware/src/main.c
similarity index 74%
rename from china_devel_board/test001/src/main.c
rename to firmware/src/main.c
index 8b3ab1c..75c144f 100644
--- a/china_devel_board/test001/src/main.c
+++ b/firmware/src/main.c
@@ -36,17 +36,20 @@ void init_SPI2(void);
 
 void spi_dma_shovel(void);
 
+void init_CB_GPIO_Outputs(void);
+
 
 // MAIN ---------------------------------------------------------------------
 int main(int argc, char *argv[]) {
 
 	SystemInit();
   disable_JTAG(); //disable JTAG to free GPIO ports
+  init_CB_GPIO_Outputs();
 
   
 // configure timer interval
-	SysTick_Config(16777215); // standard
-// 	SysTick_Config(7200000); // 10 Hz interrupt
+// 	SysTick_Config(16777215); // standard
+	SysTick_Config(7200000); // 10 Hz interrupt
 // 	SysTick_Config(720000); // 100 hz
 // 	SysTick_Config(72000); // 1000 hz
 
@@ -64,36 +67,13 @@ int main(int argc, char *argv[]) {
 
 //   STM_EVAL_COMInit(COM1, &USART_InitStructure);
 //   STM_EVAL_COMInit(COM2, &USART_InitStructure);
-  
-  
-  
-  // try the LED gpio stuff from the evaluation boards
-  
-//   STM_EVAL_LEDInit(LED1);
-//   STM_EVAL_LEDInit(LED2);
-//   STM_EVAL_LEDInit(LED3);
-//   STM_EVAL_LEDInit(LED4);
-//   STM_EVAL_LEDOn(LED1);
-//   STM_EVAL_LEDOn(LED2);
-//   STM_EVAL_LEDOn(LED3);
-//   STM_EVAL_LEDOn(LED4);
-  CB_GPIO_Out_Init(LED1);
-  CB_GPIO_Out_Init(LED2);
-  CB_GPIO_Out_Init(LED3);
-  CB_GPIO_Out_Init(LED4);
-  
-  CB_GPIO_Out_Hi(LED1);
-  CB_GPIO_Out_Hi(LED2);
-  CB_GPIO_Out_Lo(LED3);
-  CB_GPIO_Out_Hi(LED4);
-
 
-  USART_SendData(EVAL_COM1, (uint8_t) 'A');
-  USART_SendData(EVAL_COM1, (uint8_t) 'B');
-  USART_SendData(EVAL_COM1, (uint8_t) 'C');
+//   USART_SendData(EVAL_COM1, (uint8_t) 'A');
+//   USART_SendData(EVAL_COM1, (uint8_t) 'B');
+//   USART_SendData(EVAL_COM1, (uint8_t) 'C');
 //   USART_SendData(EVAL_COM2, (uint8_t) 'B');
   
-//   init_SPI2();
+  init_SPI2();
 
   SPIBuffer[0] = 0x1234;
   SPIBuffer[1] = 0x5678;
@@ -220,7 +200,6 @@ void init_SPI2(void) {
 
 void SysTick_Handler(void)
 {
-  static uint8_t character = 'A';
 //   comm_puts("SysTick_Handler");
 //   spi_writeTwoBytes(0x0F, 0xAB);
 //   STM_EVAL_LEDToggle(LED1);
@@ -231,23 +210,28 @@ void SysTick_Handler(void)
 
 //   CB_GPIO_Out_Toggle(LED1);
 //   CB_GPIO_Out_Toggle(LED2);
-//   CB_GPIO_Out_Toggle(LED3);
+  CB_GPIO_Out_Toggle(LED3);
 //   CB_GPIO_Out_Toggle(LED4);
-
-  return;
-  
-  uint8_t i;
-  for( i = 0; i<10; i++){
-    USART_SendData(EVAL_COM1, character);
-      /* Loop until the end of transmission */
-    while (USART_GetFlagStatus(EVAL_COM1, USART_FLAG_TC) == RESET)
-      {}
-    }
-  character++;
-  
-  if (character > 'Z') {
-      character = 'A';
-  }
+/*  
+  CB_GPIO_Out_Toggle(MUXADDR0);
+  CB_GPIO_Out_Toggle(MUXADDR1);
+  CB_GPIO_Out_Toggle(ZEROCALIB); */
+
+//   return;
+  
+//   static uint8_t character = 'A';
+//   uint8_t i;
+//   for( i = 0; i<10; i++){
+//     USART_SendData(EVAL_COM1, character);
+//       /* Loop until the end of transmission */
+//     while (USART_GetFlagStatus(EVAL_COM1, USART_FLAG_TC) == RESET)
+//       {}
+//     }
+//   character++;
+//   
+//   if (character > 'Z') {
+//       character = 'A';
+//   }
   
   static uint8_t spi_addr = 0;
   
@@ -272,7 +256,64 @@ void disable_JTAG(void) {
 
 }
 
+void init_CB_GPIO_Outputs(void) {
+  
+  CB_GPIO_Out_Init(LED1);
+  CB_GPIO_Out_Init(LED2);
+  CB_GPIO_Out_Init(LED3);
+  CB_GPIO_Out_Init(LED4);
+  CB_GPIO_Out_Init(JTAGEN0);
+  CB_GPIO_Out_Init(JTAGEN1);
+  CB_GPIO_Out_Init(SENSOREN0);
+  CB_GPIO_Out_Init(SENSOREN1);
+  CB_GPIO_Out_Init(DISD0);
+  CB_GPIO_Out_Init(DISA0);
+  CB_GPIO_Out_Init(DISD1);
+  CB_GPIO_Out_Init(DISA1);
+  CB_GPIO_Out_Init(ENAD0);
+  CB_GPIO_Out_Init(ENAA0);
+  CB_GPIO_Out_Init(ENAD1);
+  CB_GPIO_Out_Init(ENAA1);
+//   CB_GPIO_Out_Init(OVCD_C0); //input!
+//   CB_GPIO_Out_Init(OVCA_C0);
+//   CB_GPIO_Out_Init(OVCD_C1);
+//   CB_GPIO_Out_Init(OVCA_C1);
+  CB_GPIO_Out_Init(MUXADDR0);
+  CB_GPIO_Out_Init(MUXADDR1);
+  CB_GPIO_Out_Init(ZEROCALIB);
+  CB_GPIO_Out_Init(ADC_CONV0);
+  CB_GPIO_Out_Init(ADC_CONV1);
+  CB_GPIO_Out_Init(DAC_CS);
+
+
+  CB_GPIO_Out_Hi(LED1);
+  CB_GPIO_Out_Lo(LED2);
+  CB_GPIO_Out_Lo(LED3);
+  CB_GPIO_Out_Lo(LED4);
+  CB_GPIO_Out_Hi(JTAGEN0);
+  CB_GPIO_Out_Hi(JTAGEN1);
+  CB_GPIO_Out_Hi(SENSOREN0);
+  CB_GPIO_Out_Hi(SENSOREN1);
+  CB_GPIO_Out_Lo(DISD0);
+  CB_GPIO_Out_Lo(DISA0);
+  CB_GPIO_Out_Lo(DISD1);
+  CB_GPIO_Out_Lo(DISA1);
+  CB_GPIO_Out_Hi(ENAD0);
+  CB_GPIO_Out_Hi(ENAA0);
+  CB_GPIO_Out_Hi(ENAD1);
+  CB_GPIO_Out_Hi(ENAA1);
+//   CB_GPIO_Out_Lo(OVCD_C0); // input!
+//   CB_GPIO_Out_Lo(OVCA_C0);
+//   CB_GPIO_Out_Lo(OVCD_C1);
+//   CB_GPIO_Out_Lo(OVCA_C1);
+  CB_GPIO_Out_Lo(MUXADDR0);
+  CB_GPIO_Out_Lo(MUXADDR1);
+  CB_GPIO_Out_Lo(ZEROCALIB);
+  CB_GPIO_Out_Hi(ADC_CONV0); // spi nCS -> idle Hi
+  CB_GPIO_Out_Hi(ADC_CONV1); // spi nCS -> idle Hi
+  CB_GPIO_Out_Hi(DAC_CS);    // spi nCS -> idle Hi
 
+}
 
 
 
diff --git a/china_devel_board/test001/src/newlib_stubs.c b/firmware/src/newlib_stubs.c
similarity index 100%
rename from china_devel_board/test001/src/newlib_stubs.c
rename to firmware/src/newlib_stubs.c
diff --git a/china_devel_board/test001/src/periph_conf.c b/firmware/src/periph_conf.c
similarity index 100%
rename from china_devel_board/test001/src/periph_conf.c
rename to firmware/src/periph_conf.c
diff --git a/china_devel_board/test001/src/periph_conf.h b/firmware/src/periph_conf.h
similarity index 97%
rename from china_devel_board/test001/src/periph_conf.h
rename to firmware/src/periph_conf.h
index 196d574..783ffa4 100644
--- a/china_devel_board/test001/src/periph_conf.h
+++ b/firmware/src/periph_conf.h
@@ -78,11 +78,10 @@
 #define LED2_GPIO_PORT                   GPIOC
 #define LED2_GPIO_CLK                    RCC_APB2Periph_GPIOC  
 
-// not working
 #define LED3_PIN                         GPIO_Pin_7  
 #define LED3_GPIO_PORT                   GPIOC
 #define LED3_GPIO_CLK                    RCC_APB2Periph_GPIOC  
-// not working
+
 #define LED4_PIN                         GPIO_Pin_6
 #define LED4_GPIO_PORT                   GPIOC
 #define LED4_GPIO_CLK                    RCC_APB2Periph_GPIOC
@@ -126,11 +125,11 @@
 #define ENAD0_PIN                        GPIO_Pin_3
 #define ENAD0_GPIO_PORT                  GPIOC
 #define ENAD0_GPIO_CLK                   RCC_APB2Periph_GPIOC
-
+//not working
 #define ENAA0_PIN                        GPIO_Pin_5
 #define ENAA0_GPIO_PORT                  GPIOC
 #define ENAA0_GPIO_CLK                   RCC_APB2Periph_GPIOC
-
+// not working
 #define ENAD1_PIN                        GPIO_Pin_0
 #define ENAD1_GPIO_PORT                  GPIOC
 #define ENAD1_GPIO_CLK                   RCC_APB2Periph_GPIOC
diff --git a/china_devel_board/test001/src/platform_config.h b/firmware/src/platform_config.h
similarity index 100%
rename from china_devel_board/test001/src/platform_config.h
rename to firmware/src/platform_config.h
diff --git a/china_devel_board/test001/src/serial.c b/firmware/src/serial.c
similarity index 100%
rename from china_devel_board/test001/src/serial.c
rename to firmware/src/serial.c
diff --git a/china_devel_board/test001/src/serial.h b/firmware/src/serial.h
similarity index 100%
rename from china_devel_board/test001/src/serial.h
rename to firmware/src/serial.h
diff --git a/china_devel_board/test001/src/spi.c b/firmware/src/spi.c
similarity index 100%
rename from china_devel_board/test001/src/spi.c
rename to firmware/src/spi.c
diff --git a/china_devel_board/test001/src/spi.h b/firmware/src/spi.h
similarity index 100%
rename from china_devel_board/test001/src/spi.h
rename to firmware/src/spi.h
diff --git a/china_devel_board/test001/src/spi_conf.h b/firmware/src/spi_conf.h
similarity index 100%
rename from china_devel_board/test001/src/spi_conf.h
rename to firmware/src/spi_conf.h
diff --git a/china_devel_board/test001/src/startup.c b/firmware/src/startup.c
similarity index 100%
rename from china_devel_board/test001/src/startup.c
rename to firmware/src/startup.c
diff --git a/china_devel_board/test001/src/stm32_eval.h b/firmware/src/stm32_eval.h
similarity index 100%
rename from china_devel_board/test001/src/stm32_eval.h
rename to firmware/src/stm32_eval.h
diff --git a/china_devel_board/test001/src/stm32f10x_conf.h b/firmware/src/stm32f10x_conf.h
similarity index 100%
rename from china_devel_board/test001/src/stm32f10x_conf.h
rename to firmware/src/stm32f10x_conf.h
diff --git a/china_devel_board/test001/src/stm32f10x_it.c b/firmware/src/stm32f10x_it.c
similarity index 100%
rename from china_devel_board/test001/src/stm32f10x_it.c
rename to firmware/src/stm32f10x_it.c
diff --git a/china_devel_board/test001/src/stm32f10x_it.h b/firmware/src/stm32f10x_it.h
similarity index 100%
rename from china_devel_board/test001/src/stm32f10x_it.h
rename to firmware/src/stm32f10x_it.h
diff --git a/china_devel_board/stm32loader.py b/firmware/stm32loader.py
similarity index 100%
rename from china_devel_board/stm32loader.py
rename to firmware/stm32loader.py