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

Merge remote-tracking branch 'origin/dev_aaron' into emulator

Browse Source
This commit is contained in:
t-moe
2015-06-01 22:16:00 +02:00
parent 06227dadad caa7b5c50f
commit 3b95affd93
8 changed files with 277 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/app/app.c
View File

@@ -14,7 +14,6 @@ void app_init() {
gui_screen_navigate(get_screen_main());
}
//app event loop
void app_process() {

4
common/app/screen_guitest.c
View File

@@ -104,14 +104,14 @@ static void enter(void* screen) {
n_updown.max=11;
n_updown.min =-5;
n_updown.callback=n_updown_cb;
gui_numupdown_add(&n_updown);
//gui_numupdown_add(&n_updown);
}
static void leave(void* screen) {
gui_button_remove(&b_back);
gui_checkbox_remove(&c_cbox);
gui_numupdown_remove(&n_updown);
//gui_numupdown_remove(&n_updown);
touch_unregister_area(&a_area);
}

2
common/app/screen_main.c
View File

@@ -77,7 +77,7 @@ static void enter(void* screen) {
b_ref_tracking.txtcolor=WHITE;
b_ref_tracking.bgcolor=HEX(0xFF2151);
b_ref_tracking.font=0;
b_ref_tracking.text="Reference Tracking";
b_ref_tracking.text="Ref Tracking";
b_ref_tracking.callback=b_ref_tracking_cb;
gui_button_add(&b_ref_tracking);

4
common/app/screen_pixytest.c
View File

@@ -264,7 +264,7 @@ static void enter(void* screen) {
n_led_powerlimit.max=40;
n_led_powerlimit.min =0;
n_led_powerlimit.callback=n_led_powerlimit_cb;
gui_numupdown_add(&n_led_powerlimit);
//gui_numupdown_add(&n_led_powerlimit);
@@ -283,7 +283,7 @@ static void leave(void* screen) {
gui_button_remove(&b_led_red);
gui_button_remove(&b_led_green);
gui_button_remove(&b_led_blue);
gui_numupdown_remove(&n_led_powerlimit);
//gui_numupdown_remove(&n_led_powerlimit);
}

4
discovery/.gitignore vendored
View File

@@ -4,3 +4,7 @@ obj/
libs/*/obj
libs/*/*.a
libs/*/*.o
*~
*.swp
*.swo

2
discovery/src/ll_tft.c
View File

@@ -101,7 +101,7 @@ void ll_tft_draw_char(uint16_t x, uint16_t y, uint16_t color, uint16_t bgcolo
#define TFT_SSD1289_REG_46 0x46 // Y-end register
// Timeouts
#define TFT_INIT_TIMEOUT 1 // 1ms timeout
#define TFT_INIT_TIMEOUT 10 // 1ms timeout
/*
* ---------------------- init functions ----------------------------------------------------------

305
discovery/src/ll_touch.c
View File

@@ -1,74 +1,90 @@
#include"ll_touch.h"
#include"screen.h"
#include"screen_calibrate.h"
#include<stm32f4xx_spi.h>
#include<stm32f4xx_rcc.h>
#include<stm32f4xx_exti.h>
#include<stm32f4xx_syscfg.h>
#include<tft.h>
#include<touch.h>
#include<stdio.h>
#include<stdlib.h>
/* Defines ---------------------------------------------------------- */
#define CLEAR_CS GPIO_ResetBits(GPIOB,GPIO_Pin_9)
#define SET_CS GPIO_SetBits(GPIOB,GPIO_Pin_9)
#define PENIRQ !GPIO_ReadInputDataBit(GPIOC, GPIO_Pin_1)
#define REQ_X_COORD 0x90 // Request x coordinate
#define REQ_Y_COORD 0xD0 // Request y coordinate
#define REQ_1_DATAB 0x00 // Request one databyte
#define DWIDTH 320
#define DHEIGHT 240
#define CCENTER 20
#define x1 0x0231
#define dx 0x0C08
#define y1 0x0287
#define dy 0x0B56
#define NSAMPLE 16
/* Globals ----------------------------------------------------------- */
volatile bool pen_state = false; // PenDown = True; PenUp = False;
volatile bool tim_flag = false;
volatile uint16_t x_samples[NSAMPLE-1];
volatile uint16_t y_samples[NSAMPLE-1];
volatile int i;
/*
static void touch_read(const uint16_t RegisterStartAddress, const uint8_t NumberOfRegisters, uint16_t *DataBuffer, const uint16_t OffsetInBuffer)
/* Prototypes -------------------------------------------------------- */
bool ll_touch_init();
static void init_exti();
static void init_timer();
static uint8_t touch_send(uint8_t dat);
static uint16_t avg_vals(volatile uint16_t samples[], uint16_t len);
static uint16_t touch_get_y_coord();
static uint16_t touch_get_y_coord();
void touch_test(uint16_t x, uint16_t y);
/* Functions --------------------------------------------------------- */
static uint16_t avg_vals(volatile uint16_t samples[], uint16_t len)
{
uint16_t ControlValue;
uint8_t i,j, RegisterIndex;
uint16_t InputValue;
uint16_t j = 0;
uint32_t tmp = 0;
ControlValue = 0xE400 | (RegisterStartAddress & 0x03FF); // Create the 16-bit header
for (i=0;i<100;i++); // delay
//Write out the control word
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
//Copy each register in the buffer contiguously.
//Read data in.
for (RegisterIndex=0; RegisterIndex<NumberOfRegisters; RegisterIndex++){
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)=(uint16_t)InputValue;
for(j = 0; j < len; j++){
tmp += samples[j];
}
SET_CS;
for (j=0;j<5;j++); // delay
return (uint16_t)(tmp/len);
}
static void touch_send_cmd(const uint16_t RegisterAddress, const uint8_t NumberOfRegisters, uint16_t *DataBuffer, const uint8_t OffsetInBuffer)
static uint16_t touch_get_x_coord()
{
uint16_t ControlValue;
uint16_t ValueToWrite;
uint16_t RegisterIndex;
uint8_t j;
uint16_t buf_x = 0;
CLEAR_CS; // clear chipselect
touch_send(REQ_X_COORD); // request x coordinate
ControlValue = 0xE000 | (RegisterAddress & 0x03FF); //Create the 16-bit header
buf_x = ((uint16_t) touch_send(REQ_1_DATAB)) << 5;
buf_x |= touch_send(REQ_1_DATAB) >> 3;
//Write out the control word
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);
SET_CS; // set chipselect
//And then the data
for (RegisterIndex=0; RegisterIndex<NumberOfRegisters; RegisterIndex++){
ValueToWrite= *(DataBuffer+RegisterIndex+OffsetInBuffer);
SPI_I2S_SendData(SPI1, ValueToWrite);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_BSY) != RESET);
while(SPI_I2S_GetFlagStatus(SPI1, SPI_I2S_FLAG_RXNE) == RESET);
return buf_x;
}
SET_CS;
for (j=0;j<5;j++); // delay
static uint16_t touch_get_y_coord()
{
uint16_t buf_y = 0;
CLEAR_CS; // clear chipselect
touch_send(REQ_Y_COORD); // request y coordinate
buf_y = ((uint16_t) touch_send(REQ_1_DATAB)) << 5;
buf_y |= touch_send(REQ_1_DATAB) >> 3;
SET_CS; // set chipselect
return buf_y;
}
*/
static uint8_t touch_send(uint8_t dat)
{
SPI_I2S_SendData(SPI2, dat);
@@ -77,68 +93,199 @@ static uint8_t touch_send(uint8_t dat)
return SPI_I2S_ReceiveData(SPI2);
}
void touch_test(uint16_t x, uint16_t y)
{
char xs[10];
char ys[10];
tft_clear(BLACK);
itoa(x, xs, 10);
itoa(y, ys, 10);
tft_print_line(10, 10, WHITE, TRANSPARENT, 0, (const char*)xs);
tft_print_line(10, 30, WHITE, TRANSPARENT, 0, (const char*)ys);
}
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
/* init structures */
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);
// enable spi clock TODO: Check if this is the correct one
//RCC_APB2PeriphClockCmd(RCC_APB2Periph_SPI1, ENABLE);
RCC_APB2PeriphClockCmd(RCC_AHB1Periph_GPIOB, ENABLE); // enable clock on gpiob
RCC_APB1PeriphClockCmd(RCC_APB1Periph_SPI2, ENABLE); // ebable spi clock
/* fill gpio init struct and init gpio */
GPIO_StructInit(&GPIO_SPI2_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_OType = GPIO_OType_PP;
GPIO_SPI2_InitStructure.GPIO_Mode = GPIO_Mode_AF;
GPIO_SPI2_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_SPI2_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_Init(GPIOB, &GPIO_SPI2_InitStructure);
SET_CS; // set chip select
/* fill gpio init struct and init gpio */
GPIO_StructInit(&GPIO_SPI2_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(SPI2);
/* init alternate functions on GPIOB */
GPIO_PinAFConfig(GPIOB, GPIO_PinSource10, GPIO_AF_SPI2);
GPIO_PinAFConfig(GPIOB, GPIO_PinSource14, GPIO_AF_SPI2);
GPIO_PinAFConfig(GPIOB, GPIO_PinSource15, GPIO_AF_SPI2);
// fill spi init structure
SPI_I2S_DeInit(SPI2); // Clear spi initialisation
/* fill spi init structure */
SPI_StructInit(&SPI_SPI2_InitStructure);
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_NSS = SPI_NSS_Soft | SPI_NSSInternalSoft_Set;
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(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;
SPI_Init(SPI2, &SPI_SPI2_InitStructure); // init spi
SPI_Cmd(SPI2, ENABLE); // enable spi
init_exti(); // init external interrupt for penirq
init_timer(); // init the timer 6 for sampling x and y coordinates
return true;
}
static void init_exti()
{
// PENIRQ -> EXTI1 (PC1)
// Blue Button -> EXTI0 (PA0)
/* init structures */
GPIO_InitTypeDef gpio;
EXTI_InitTypeDef exti;
NVIC_InitTypeDef nvic;
RCC_APB2PeriphClockCmd(RCC_APB2Periph_SYSCFG, ENABLE); // enable SYSCFG clock
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOC, ENABLE); // enable GPIOC clock
RCC_AHB1PeriphClockCmd(RCC_AHB1Periph_GPIOA, ENABLE); // enable GPIOA clock
/* Set GPIOC1 as input */
gpio.GPIO_Mode = GPIO_Mode_IN;
gpio.GPIO_OType = GPIO_OType_PP;
gpio.GPIO_Pin = GPIO_Pin_1;
gpio.GPIO_PuPd = GPIO_PuPd_UP;
gpio.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_Init(GPIOC, &gpio);
SYSCFG_EXTILineConfig(EXTI_PortSourceGPIOC, EXTI_PinSource1); // Bind Exti_line1 to PC1
/* Set GPIOA0 as input */
gpio.GPIO_Mode = GPIO_Mode_IN;
gpio.GPIO_OType = GPIO_OType_OD;
gpio.GPIO_Pin = GPIO_Pin_0;
gpio.GPIO_PuPd = GPIO_PuPd_NOPULL;
gpio.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_Init(GPIOA, &gpio);
SYSCFG_EXTILineConfig(EXTI_PortSourceGPIOA, EXTI_PinSource0); // Bind Exti_line1 to PC1
/* EXTI on PC1 */
EXTI_StructInit(&exti);
exti.EXTI_Line = EXTI_Line1;
exti.EXTI_Mode = EXTI_Mode_Interrupt;
exti.EXTI_Trigger = EXTI_Trigger_Falling; // Trigger on falling edge (PENIRQ)
exti.EXTI_LineCmd = ENABLE;
EXTI_Init(&exti);
/* EXTI on PA0 */
EXTI_StructInit(&exti);
exti.EXTI_Line = EXTI_Line0;
exti.EXTI_Mode = EXTI_Mode_Interrupt;
exti.EXTI_Trigger = EXTI_Trigger_Falling; // Trigger on calibration (Blue button)
exti.EXTI_LineCmd = ENABLE;
EXTI_Init(&exti);
/* Add IRQ vector to NVIC */
nvic.NVIC_IRQChannel = EXTI1_IRQn; // PC1 -> EXTI_Line1 -> EXTI1_IRQn vector
nvic.NVIC_IRQChannelPreemptionPriority = 0x00; // Set priority
nvic.NVIC_IRQChannelSubPriority = 0x00; // Set sub priority
nvic.NVIC_IRQChannelCmd = ENABLE; // Enable interrupt
NVIC_Init(&nvic); // Config NVIC
/* Add IRQ vector to NVIC */
nvic.NVIC_IRQChannel = EXTI0_IRQn; // PA0 -> EXTI_Line0 -> EXTI0_IRQn vector
nvic.NVIC_IRQChannelPreemptionPriority = 0x00; // Set priority
nvic.NVIC_IRQChannelSubPriority = 0x00; // Set sub priority
nvic.NVIC_IRQChannelCmd = ENABLE; // Enable interrupt
NVIC_Init(&nvic); // Config NVIC
}
static void init_timer()
{
TIM_TimeBaseInitTypeDef t;
const int APB1_CLK = 42E6;
RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM7, ENABLE); // Enable clock for TIM6
/* Timer 7 configuration */
TIM_TimeBaseStructInit(&t); // Init TimeBaseStruct
t.TIM_Prescaler = APB1_CLK / 1000 - 1; // 41999 prescaler
t.TIM_Period = 50 - 1; // 50ms count time
TIM_TimeBaseInit(TIM7, &t); // Init TIM7
TIM_ITConfig(TIM7, TIM_IT_Update, ENABLE); // Enable update IRQ for TIM7
NVIC_EnableIRQ(TIM7_IRQn); // Enable IRQs for TIM7
}
/* Interrupt service routines ------------------------------------------ */
void EXTI0_IRQHandler()
{
if (EXTI_GetITStatus(EXTI_Line0) == SET) { // If the right interrupt flag is set
gui_screen_navigate(get_screen_calibrate()); //switch to calibrate screen
EXTI_ClearITPendingBit(EXTI_Line0); // Clear interrupt flag
}
}
void EXTI1_IRQHandler()
{
if (EXTI_GetITStatus(EXTI_Line1) == SET) { // If the right interrupt flag is set
TIM_Cmd(TIM7, ENABLE); // Start the timer
EXTI_ClearITPendingBit(EXTI_Line1); // Clear interrupt flag
}
}
void TIM7_IRQHandler()
{
if(TIM_GetFlagStatus(TIM7, TIM_IT_Update) == SET){ // Make sure the interrupt flag is set
TIM_Cmd(TIM7, DISABLE); // Disable the timer during the measuring
if(PENIRQ){ // Only do this if the PENIRQ line is still low
for(i = 0; i < (NSAMPLE-1); i++){ // Sample 16 times and apply some calibration
x_samples[i] = (((long)(DWIDTH - 2 * CCENTER) * 2 * (long)((long)touch_get_x_coord() - x1) / dx + 1) >> 1) + CCENTER;
y_samples[i] = (((long)(DHEIGHT -2 * CCENTER) * 2 * (long)((long)touch_get_y_coord() - y1) / dy + 1) >> 1) + CCENTER;
}
touch_add_raw_event(avg_vals(x_samples, NSAMPLE), avg_vals(y_samples, NSAMPLE), TOUCH_DOWN); // Update position
//tft_draw_pixel(avg_vals(x_samples, NSAMPLE), avg_vals(y_samples, NSAMPLE), RED);
TIM_Cmd(TIM7, ENABLE); // Reenable timer
} else {
touch_add_raw_event(avg_vals(x_samples, NSAMPLE), avg_vals(y_samples, NSAMPLE), TOUCH_UP); // Update position one last time
//tft_draw_pixel(avg_vals(x_samples, NSAMPLE), avg_vals(y_samples, NSAMPLE), RED);
TIM_Cmd(TIM7, DISABLE); // Disable timer
}
TIM_ClearFlag(TIM7, TIM_IT_Update); // Clear timer interrupt flag
}
}

BIN
doc/PID_REGELUNG.tgz Normal file
View File

Binary file not shown.