piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

2 files removed

Browse Source
This commit is contained in:
bsongis
2014-03-04 15:33:26 +01:00
parent ae54f4908a
commit b7e079a0d9
14 changed files with 70 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/bootloader/Makefile
+4 -3
View File
@@ -112,6 +112,8 @@ UADEFS =
ifeq ($(PCB), TARANIS)
SRC = system_stm32f2xx.c \
../src/targets/taranis/i2c.c \
../src/targets/taranis/delays.c \
../src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_rcc.c \
../src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c \
../src/targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_spi.c \
@@ -128,17 +130,16 @@ SRC = system_stm32f2xx.c \
../src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c \
../src/targets/taranis/STM32_USB-Host-Device_Lib_V2.1.0/Libraries/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c \
../src/targets/taranis/usbd_desc.c \
../src/targets/taranis/aspi.c \
../src/targets/taranis/usb_bsp.c
CPPSRC = ../src/targets/taranis/aspi.cpp \
lcd_driver.cpp \
CPPSRC = lcd_driver.cpp \
driversboot.cpp \
logicioboot.cpp \
ff.cpp \
x9ddiskio.cpp \
../src/targets/taranis/usbd_usr.cpp \
usbd_storage_msd.cpp \
i2c_ee.cpp \
lcdboot.cpp \
power.cpp \
boot.cpp
radio/bootloader/boot.cpp
+1 -1
View File
@@ -61,7 +61,7 @@
#ifdef PCBTARANIS
#include "stm32f2xx.h"
#include "stm32f2xx_flash.h"
#include "i2c_ee.h"
#include "../src/targets/taranis/i2c.h"
#include "hal.h"
#include "timers.h"
radio/bootloader/include/aspi.h
-37
View File
@@ -1,37 +0,0 @@
/**
******************************************************************************
* @file Project/spi/spi.h
* @author X9D Application Team
* @Hardware version V0.2
* @date 11-July-2012
* @brief spi.c' Header file.
* *
******************************************************************************
*/
#ifndef _ASPI_H_
#define _ASPI_H_
#include "stm32f2xx.h"
#define LCD_NCS_HIGH() (GPIO_LCD->BSRRL = PIN_LCD_NCS)
#define LCD_NCS_LOW() (GPIO_LCD->BSRRH = PIN_LCD_NCS)
#define LCD_A0_HIGH() (GPIO_LCD->BSRRL = PIN_LCD_A0)
#define LCD_A0_LOW() (GPIO_LCD->BSRRH = PIN_LCD_A0)
#define LCD_RST_HIGH() (GPIO_LCD->BSRRL = PIN_LCD_RST)
#define LCD_RST_LOW() (GPIO_LCD->BSRRH = PIN_LCD_RST)
#define LCD_CLK_HIGH() (GPIO_LCD->BSRRL = PIN_LCD_CLK)
#define LCD_CLK_LOW() (GPIO_LCD->BSRRH = PIN_LCD_CLK)
#define LCD_MOSI_HIGH() (GPIO_LCD->BSRRL = PIN_LCD_MOSI)
#define LCD_MOSI_LOW() (GPIO_LCD->BSRRH = PIN_LCD_MOSI)
void AspiCmd(u8 Command_Byte);
void AspiData(u8 Para_data);
//u16 spiRegAccess(u8 addrByte, u8 writeValue);
#endif
radio/bootloader/include/i2c_ee.h
-52
View File
@@ -1,52 +0,0 @@
/**
******************************************************************************
* @file Project/ee_drivers/i2c_ee.h
* @author X9D Application Team
* @version V 0.2
* @date 12-JLY-2012
* @brief Header for i2c_ee.c module
******************************************************************************
* @copy
*
* THE PRESENT FIRMWARE WHICH IS FOR GUIDANCE ONLY AIMS AT PROVIDING CUSTOMERS
* WITH CODING INFORMATION REGARDING THEIR PRODUCTS IN ORDER FOR THEM TO SAVE
* TIME. AS A RESULT, STMICROELECTRONICS SHALL NOT BE HELD LIABLE FOR ANY
* DIRECT, INDIRECT OR CONSEQUENTIAL DAMAGES WITH RESPECT TO ANY CLAIMS ARISING
* FROM THE CONTENT OF SUCH FIRMWARE AND/OR THE USE MADE BY CUSTOMERS OF THE
* CODING INFORMATION CONTAINED HEREIN IN CONNECTION WITH THEIR PRODUCTS.
*
* <h2><center>&copy; COPYRIGHT 2009 STMicroelectronics</center></h2>
*/
/* Define to prevent recursive inclusion ------------------------------------ */
#ifndef __I2C_EE_H
#define __I2C_EE_H
#define EE_CMD_WRITE (0)
#define EE_CMD_READ (1)
//#define I2C_delay() //do { delayUsec(5); } while(0)
#define SCL_H do{I2C_EE_GPIO->BSRRL = I2C_EE_SCL;}while(0)
#define SCL_L do{I2C_EE_GPIO->BSRRH = I2C_EE_SCL;}while(0)
#define SDA_H do{I2C_EE_GPIO->BSRRL = I2C_EE_SDA;}while(0)
#define SDA_L do{I2C_EE_GPIO->BSRRH = I2C_EE_SDA;}while(0)
#define SCL_read (I2C_EE_GPIO->IDR & I2C_EE_SCL)
#define SDA_read (I2C_EE_GPIO->IDR & I2C_EE_SDA)
#define WP_H do{I2C_EE_WP_GPIO->BSRRL = I2C_EE_WP;}while(0)
#define WP_L do{I2C_EE_WP_GPIO->BSRRH = I2C_EE_WP;}while(0)
/* Exported functions ------------------------------------------------------- */
void I2C_EE_Init(void);
void I2C_EE_ByteWrite(uint8_t* pBuffer, uint16_t WriteAddr);
void I2C_EE_PageWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint8_t NumByteToWrite);
void I2C_EE_BufferWrite(uint8_t* pBuffer, uint16_t WriteAddr, uint16_t NumByteToWrite);
void I2C_EE_BufferRead(uint8_t* pBuffer, uint16_t ReadAddr, uint16_t NumByteToRead);
void I2C_EE_WaitEepromStandbyState(void);
void I2C_set_volume( uint8_t volume ) ;
uint8_t I2C_read_volume( void ) ;
#endif /* __I2C_EE_H */
/******************* (C) COPYRIGHT 2009 STMicroelectronics *****END OF FILE****/
radio/bootloader/lcd_driver.cpp
+2 -2
View File
@@ -15,7 +15,7 @@
#include "stm32f2xx_gpio.h"
#include "stm32f2xx_rcc.h"
#include "hal.h"
#include "aspi.h"
#include "../src/targets/taranis/aspi.h"
#include "timers.h"
#include "lcd.h"
@@ -268,7 +268,7 @@ static void LCD_Init()
AspiCmd(0xF7); //ending row address of RAM program window.
AspiCmd(0x9F);
AspiCmd(0xAF); //dc2=1,IC into exit SLEEP MODE, dc3=1 gray=ON ¿ª»Ò½× ,dc4=1 Green Enhanc mode disabled ÂÌÉ«Ôöǿģʽ¹Ø
AspiCmd(0xAF); //dc2=1,IC into exit SLEEP MODE, dc3=1 gray=ON ���ҽ� ,dc4=1 Green Enhanc mode disabled ��ɫ��ǿģʽ��
}
radio/bootloader/usbd_storage_msd.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
#include <string.h>
//#include <stdlib.h>
#include "drivers.h"
#include "i2c_ee.h"
#include "../src/targets/taranis/i2c.h"
#include "diskio.h"
//#include "board_taranis.h"