aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added datasheets, updated touchsupport.

Browse Source
This commit is contained in:
id101010
2015-05-12 14:32:43 +02:00
parent 3b30f4e84c
commit aec62d4e02
6 changed files with 240820 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
discovery/src/ll_touch.c
View File

@@ -1,21 +1,29 @@
#include "ll_touch.h"
#include"ll_touch.h"
#include<stm32f4xx_spi.h>
#include<stm32f4xx_rcc.h>
void ll_touch_read(const u16 RegisterStartAddress, const u8 NumberOfRegisters, u16 *DataBuffer, const u16 OffsetInBuffer)
#define CLEAR_CS GPIO_ResetBits(GPIOB,GPIO_Pin_9)
#define SET_CS GPIO_SetBits(GPIOB,GPIO_Pin_9)
/*
static void touch_read(const uint16_t RegisterStartAddress, const uint8_t NumberOfRegisters, uint16_t *DataBuffer, const uint16_t OffsetInBuffer)
{
u16 ControlValue;
u8 i,j, RegisterIndex;
u16 InputValue;
uint16_t ControlValue;
uint8_t i,j, RegisterIndex;
uint16_t InputValue;
ControlValue = 0xE400 | (RegisterStartAddress & 0x03FF); // Create the 16-bit header
ControlValue = 0xE400 | (RegisterStartAddress & 0x03FF); // Create the 16-bit header
for (i=0;i<100;i++); // delay
for (i=0;i<100;i++); // delay
//Write out the control word
GPIO_ResetBits(GPIOA, GPIO_Pin_4); // CS low
CLEAR_CS;
SPI_I2S_SendData(SPI1, ControlValue);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY) != RESET);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET);
InputValue = SPI_I2S_ReceiveData(SPI1); // Read dummy
InputValue = SPI_I2S_ReceiveData(SPI1); // Read dummy
//Copy each register in the buffer contiguously.
//Read data in.
@@ -23,25 +31,25 @@ void ll_touch_read(const u16 RegisterStartAddress, const u8 NumberOfRegisters, u
SPI_I2S_SendData(SPI1, 0xFFFF);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY) != RESET);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET);
InputValue = SPI_I2S_ReceiveData(SPI1); // read data
*(DataBuffer+OffsetInBuffer+RegisterIndex)=(u16)InputValue;
InputValue = SPI_I2S_ReceiveData(SPI1); // read data
*(DataBuffer+OffsetInBuffer+RegisterIndex)=(uint16_t)InputValue;
}
GPIO_SetBits(GPIOA, GPIO_Pin_4); // CS high
for (j=0;j<5;j++); // delay
SET_CS;
for (j=0;j<5;j++); // delay
}
void ll_touch_send_cmd(const u16 RegisterAddress, const u8 NumberOfRegisters, u16 *DataBuffer, const u8 OffsetInBuffer)
static void touch_send_cmd(const uint16_t RegisterAddress, const uint8_t NumberOfRegisters, uint16_t *DataBuffer, const uint8_t OffsetInBuffer)
{
u16 ControlValue;
u16 ValueToWrite;
u16 RegisterIndex;
u8 j;
uint16_t ControlValue;
uint16_t ValueToWrite;
uint16_t RegisterIndex;
uint8_t j;
ControlValue = 0xE000 | (RegisterAddress & 0x03FF); //Create the 16-bit header
ControlValue = 0xE000 | (RegisterAddress & 0x03FF); //Create the 16-bit header
//Write out the control word
GPIO_ResetBits(GPIOA, GPIO_Pin_4); // CS low
CLEAR_CS;
SPI_I2S_SendData(SPI1, ControlValue);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY) != RESET);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET);
@@ -54,48 +62,82 @@ void ll_touch_send_cmd(const u16 RegisterAddress, const u8 NumberOfRegisters, u1
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET);
}
GPIO_SetBits(GPIOA, GPIO_Pin_4); // CS high
for (j=0;j<5;j++); // delay
SET_CS;
for (j=0;j<5;j++); // delay
}
*/
static uint8_t touch_send(uint8_t dat)
{
SPI_I2S_SendData(SPI2, dat);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_BSY) != RESET);
while(SPI_I2S_GetFlagStatus(SPI2, SPI_I2S_FLAG_RXNE) == RESET);
return SPI_I2S_ReceiveData(SPI2);
}
bool ll_touch_init()
{
//We have a ADS7843 Touch controller
//Datasheet: http://www.ti.com/lit/ds/symlink/ads7843.pdf
return false; //TODO: remove
// init structures
SPI_InitTypeDef SPI_SPI1_InitStructure;
GPIO_InitTypeDef GPIOSPI1_InitStructure;
SPI_InitTypeDef SPI_SPI2_InitStructure;
GPIO_InitTypeDef GPIO_SPI2_InitStructure;
// enable gpio clock TODO: Check if not done already
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
//RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE);
// enable spi clock TODO: Check if this is the correct one
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
//RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
GPIOSPI1_InitStructure.GPIO_Pin = GPIO_Pin_5 | GPIO_Pin_6 | GPIO_Pin_7; // 5 = SPI1_SCK, 6 = SPI1_MISO, 7 = SPI1_MOSI
GPIOSPI1_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP;
GPIOSPI1_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOA, &GPIOSPI1_InitStructure);
GPIO_SPI2_InitStructure.GPIO_Pin = GPIO_Pin_10 | GPIO_Pin_14 | GPIO_Pin_15; // 10 = SPI2_SCK, 14 = SPI2_MISO, 15 = SPI2_MOSI
GPIO_SPI2_InitStructure.GPIO_OType = GPIO_OType_OD;
GPIO_SPI2_InitStructure.GPIO_Mode = GPIO_Mode_AF;
GPIO_SPI2_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOB, &GPIO_SPI2_InitStructure);
GPIOSPI1_InitStructure.GPIO_Pin = GPIO_Pin_4; // 4 = SPI1_CS
GPIOSPI1_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
GPIOSPI1_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOA, &GPIOSPI1_InitStructure);
GPIO_SPI2_InitStructure.GPIO_Pin = GPIO_Pin_9; // 9 = SPI2_CS
GPIO_SPI2_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_SPI2_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_SPI2_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_Init(GPIOB, &GPIO_SPI2_InitStructure);
// clear spi initialisation
SPI_I2S_DeInit(SPI1);
SPI_I2S_DeInit(SPI2);
// fill spi init structure
SPI_SPI1_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex;
SPI_SPI1_InitStructure.SPI_Mode = SPI_Mode_Master;
SPI_SPI1_InitStructure.SPI_DataSize = SPI_DataSize_16b;
SPI_SPI1_InitStructure.SPI_CPOL = SPI_CPOL_High;
SPI_SPI1_InitStructure.SPI_CPHA = SPI_CPHA_2Edge;
SPI_SPI1_InitStructure.SPI_NSS = SPI_NSS_Soft;
SPI_SPI1_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_4;
SPI_SPI1_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
SPI_SPI1_InitStructure.SPI_CRCPolynomial = 7;
SPI_SPI2_InitStructure.SPI_Direction = SPI_Direction_2Lines_FullDuplex;
SPI_SPI2_InitStructure.SPI_Mode = SPI_Mode_Master;
SPI_SPI2_InitStructure.SPI_DataSize = SPI_DataSize_8b;
SPI_SPI2_InitStructure.SPI_CPOL = SPI_CPOL_Low;
SPI_SPI2_InitStructure.SPI_CPHA = SPI_CPHA_1Edge;
SPI_SPI2_InitStructure.SPI_NSS = SPI_NSS_Soft;
SPI_SPI2_InitStructure.SPI_BaudRatePrescaler = SPI_BaudRatePrescaler_256;
SPI_SPI2_InitStructure.SPI_FirstBit = SPI_FirstBit_MSB;
//SPI_SPI2_InitStructure.SPI_CRCPolynomial = 7;
// init spi
SPI_Init(SPI1, &SPI_SPI1_InitStructure);
SPI_Cmd(SPI1, ENABLE);
SPI_Init(SPI2, &SPI_SPI2_InitStructure);
SPI_Cmd(SPI2, ENABLE);
//test
CLEAR_CS;
touch_send(0x90);
for(long i=0; i<1000; i++);
uint16_t buf = ((uint16_t) touch_send(0x00))<<5;
buf|= touch_send(0x00) >> 3;
SET_CS;
return true;
}