thomas/talon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: thomas:encoder
Branches Tags
thomas:master
thomas:encoder
..
compare: thomas:master
Branches Tags
thomas:encoder
thomas:master

No commits in common. "encoder" and "master" have entirely different histories.
encoder ... master

4 changed files with 37 additions and 270 deletions
Show stats Expand all files Collapse all files

145
User/lcd.c
View file

@ -1,145 +0,0 @@
#include "lcd.h"
#include "ch32v20x.h"
void lcd_begin(lcd_t *lcd);
void lcd_expander_write(lcd_t *lcd, uint8_t data);
void lcd_write4bits(lcd_t *lcd, uint8_t value);
void lcd_command(lcd_t *lcd, uint8_t cmd);
void lcd_init(lcd_t *lcd, u8 address) {
lcd->address = address;
lcd->backlight = 0;
// Enable I2C1 and GPIOB
RCC_APB1PeriphClockCmd(RCC_APB1Periph_I2C1, ENABLE);
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE);
GPIO_PinRemapConfig(GPIO_Remap_I2C1, ENABLE);
// Set up GPIO on port B
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_StructInit(&GPIO_InitStructure);
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_OD;
// SCL - PB8
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_8;
GPIO_Init(GPIOB, &GPIO_InitStructure);
// SDA - PB9
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9;
GPIO_Init(GPIOB, &GPIO_InitStructure);
I2C_DeInit(I2C1);
I2C_InitTypeDef I2C_InitStructure;
I2C_StructInit(&I2C_InitStructure);
I2C_InitStructure.I2C_ClockSpeed = 100000;
I2C_Init(I2C1, &I2C_InitStructure);
I2C_Cmd(I2C1, ENABLE);
lcd_begin(lcd);
}
void lcd_begin(lcd_t *lcd) {
lcd->backlight = LCD_BACKLIGHT;
Delay_Ms(50);
lcd_expander_write(lcd, 0);
Delay_Ms(1000);
lcd_write4bits(lcd, 0x03 << 4);
Delay_Us(4500);
lcd_write4bits(lcd, 0x03 << 4);
Delay_Us(4500);
lcd_write4bits(lcd, 0x03 << 4);
Delay_Us(150);
lcd_write4bits(lcd, 0x02 << 4);
lcd->function = LCD_4BITMODE | LCD_2LINE;
lcd_command(lcd, LCD_FUNCTIONSET | lcd->function);
lcd->dispctrl = LCD_DISPLAYON | LCD_CURSOROFF | LCD_BLINKOFF;
lcd_command(lcd, LCD_DISPLAYCONTROL | lcd->dispctrl);
lcd->entrymode = LCD_ENTRYLEFT | LCD_ENTRYSHIFTDEC;
lcd_command(lcd, LCD_ENTRYMODESET | lcd->entrymode);
lcd_clear(lcd);
lcd_home(lcd);
}
void lcd_backlight(lcd_t *lcd) {
lcd->backlight = LCD_BACKLIGHT;
lcd_expander_write(lcd, 0);
}
void lcd_no_backlight(lcd_t *lcd) {
lcd->backlight = LCD_NOBACKLIGHT;
lcd_expander_write(lcd, 0);
}
void lcd_clear(lcd_t *lcd) {
lcd_command(lcd, LCD_CLEARDISPLAY);
Delay_Us(2000);
}
void lcd_home(lcd_t *lcd) {
lcd_command(lcd, LCD_RETURNHOME);
Delay_Us(2000);
}
void lcd_cursor(lcd_t *lcd, uint8_t col, uint8_t row) {
uint8_t row_offsets[] = {0x00, 0x40, 0x14, 0x54};
lcd_command(lcd, LCD_SETDDRAMADDR | (col + row_offsets[row]));
}
void lcd_expander_write(lcd_t *lcd, uint8_t data) {
while(I2C_GetFlagStatus(I2C1, I2C_FLAG_BUSY) != RESET);
I2C_GenerateSTART(I2C1, ENABLE);
// Delay_Ms(1);
while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_MODE_SELECT));
// I2C_Send7bitAddress(I2C1, 0x4E, I2C_Direction_Receiver);
I2C_SendData(I2C1, lcd->address << 1);
// Delay_Ms(1);
while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_TRANSMITTER_MODE_SELECTED));
// I2C_SendData(I2C1, 0x27);
// while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_BYTE_TRANSMITTED));
I2C_SendData(I2C1, data | lcd->backlight);
// Delay_Ms(1);
while(!I2C_CheckEvent(I2C1, I2C_EVENT_MASTER_BYTE_TRANSMITTED));
I2C_GenerateSTOP(I2C1, ENABLE);
// Delay_Ms(1);
}
void lcd_write4bits(lcd_t *lcd, uint8_t value) {
lcd_expander_write(lcd, value);
lcd_expander_write(lcd, value | LCD_EN);
Delay_Us(1);
lcd_expander_write(lcd, value & ~LCD_EN);
Delay_Us(50);
}
void lcd_command(lcd_t *lcd, uint8_t cmd) {
lcd_write4bits(lcd, cmd & 0xF0);
lcd_write4bits(lcd, cmd << 4);
}
void lcd_write(lcd_t *lcd, char c) {
lcd_write4bits(lcd, (c & 0xF0) | LCD_RS);
lcd_write4bits(lcd, (c << 4) | LCD_RS);
}
void lcd_puts(lcd_t *lcd, char *str) {
while(*str)
lcd_write(lcd, *str++);
}

54
User/lcd.h
View file

@ -1,54 +0,0 @@
#ifndef USER_LCD_H_
#define USER_LCD_H_
#include "ch32v20x.h"
static const uint8_t LCD_RS = 0x01;
static const uint8_t LCD_RW = 0x02;
static const uint8_t LCD_EN = 0x04;
static const uint8_t LCD_BACKLIGHT = 0x08;
static const uint8_t LCD_NOBACKLIGHT = 0x00;
static const uint8_t LCD_4BITMODE = 0x00;
static const uint8_t LCD_2LINE = 0x08;
static const uint8_t LCD_CLEARDISPLAY = 0x01;
static const uint8_t LCD_RETURNHOME = 0x02;
static const uint8_t LCD_ENTRYMODESET = 0x04;
static const uint8_t LCD_DISPLAYCONTROL = 0x08;
static const uint8_t LCD_CURSORSHIFT = 0x10;
static const uint8_t LCD_FUNCTIONSET = 0x20;
static const uint8_t LCD_SETCGRAMADDR = 0x40;
static const uint8_t LCD_SETDDRAMADDR = 0x80;
static const uint8_t LCD_BLINKOFF = 0x00;
static const uint8_t LCD_BLINKON = 0x01;
static const uint8_t LCD_CURSOROFF = 0x00;
static const uint8_t LCD_CURSORON = 0x02;
static const uint8_t LCD_DISPLAYON = 0x04;
static const uint8_t LCD_DISPLAYOFF = 0x00;
static const uint8_t LCD_ENTRYSHIFTDEC = 0x00;
static const uint8_t LCD_ENTRYSHIFTINC = 0x01;
static const uint8_t LCD_ENTRYRIGHT = 0x00;
static const uint8_t LCD_ENTRYLEFT = 0x02;
typedef struct {
uint8_t address;
uint8_t backlight;
uint8_t function;
uint8_t dispctrl;
uint8_t entrymode;
} lcd_t;
void lcd_init(lcd_t *lcd, uint8_t address);
void lcd_backlight(lcd_t *lcd);
void lcd_no_backlight(lcd_t *lcd);
void lcd_clear(lcd_t *lcd);
void lcd_home(lcd_t *lcd);
void lcd_write(lcd_t *lcd, char c);
void lcd_puts(lcd_t *lcd, char *str);
void lcd_cursor(lcd_t *lcd, uint8_t row, uint8_t col);
#endif /* USER_LCD_H_ */

30
User/main.c
View file

@ -4,7 +4,6 @@
#include "memecoder.h" #include "memecoder.h"
#include "ctre.h" #include "ctre.h"
#include "mode.h" #include "mode.h"
#include "lcd.h"
#include <string.h> #include <string.h>
@ -12,24 +11,22 @@
void init_switch_gpio() { void init_switch_gpio() {
// Enable GPIOB // Enable GPIOB
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE); RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE);
// Set up switch on PB5 and PB6, use internal pull ups // Set up switch on PB5 and PB6, use internal pull ups
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_5;
GPIO_Init(GPIOB, &GPIO_InitStructure);
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
GPIO_Init(GPIOB, &GPIO_InitStructure); GPIO_Init(GPIOB, &GPIO_InitStructure);
// GPIO_InitStructure.GPIO_Pin = GPIO_Pin_6;
// GPIO_Init(GPIOB, &GPIO_InitStructure);
} }
u8 get_switch_state() { u8 get_switch_state() {
u8 state = 0; u8 state = 0;
// state |= (!GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_5)) << 0; state |= (!GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_5)) << 0;
// state |= (!GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_6)) << 1; state |= (!GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_6)) << 1;
return state; return state;
} }
@ -46,12 +43,6 @@ int main(void)
memecoder_init(); memecoder_init();
can_init(); can_init();
ctre_init(); ctre_init();
lcd_t lcd;
lcd_init(&lcd, 0x27);
lcd_backlight(&lcd);
lcd_puts(&lcd, "LIGMA");
lcd_cursor(&lcd, 2, 1);
lcd_puts(&lcd, "NUTS");
// ws2812_init(); // ws2812_init();
// Clear all existing ports // Clear all existing ports
@ -84,14 +75,7 @@ int main(void)
mode_position2_init(&app, &position2_state); mode_position2_init(&app, &position2_state);
while(1) while(1)
{ {
printf("on\r\n"); memecoder_update();
char tmp[20] = {0};
sprintf(tmp, "cnt: %5d", memecoder_get());
lcd_cursor(&lcd, 2, 2);
lcd_puts(&lcd, tmp);
}
while(1) {
app.switch_state = get_switch_state(); app.switch_state = get_switch_state();
for(int i = 0; i < dev_cnt; i++) { for(int i = 0; i < dev_cnt; i++) {
@ -102,8 +86,6 @@ int main(void)
// mode_position2(&app, &position2_state); // mode_position2(&app, &position2_state);
} }
printf("%d\r\n", memecoder_get());
// Read data from CAN // Read data from CAN
if(can_recv(&rx_msg)) { if(can_recv(&rx_msg)) {
u32 arbid = rx_msg.ExtId; u32 arbid = rx_msg.ExtId;

78
User/memecoder.c
View file

@ -7,63 +7,47 @@ int memecoder_count = 0;
void memecoder_init() { void memecoder_init() {
// Enable GPIOA // Enable GPIOB
RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOA, ENABLE); RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);
// Set up GPIO on port A // Set up GPIO on port B
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU;
// PHASE_A - PA0 // PHASE_A - PB12
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_12;
GPIO_Init(GPIOA, &GPIO_InitStructure); GPIO_Init(GPIOB, &GPIO_InitStructure);
// PHASE_B - PA1 // PHASE_A - PB13
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1; GPIO_InitStructure.GPIO_Pin = GPIO_Pin_13;
GPIO_Init(GPIOA, &GPIO_InitStructure); GPIO_Init(GPIOB, &GPIO_InitStructure);
TIM_DeInit(TIM2); // PHASE_A - PB14
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_14;
TIM_TimeBaseInitTypeDef TIM_TimeBaseInitStructure; GPIO_Init(GPIOB, &GPIO_InitStructure);
TIM_TimeBaseStructInit(&TIM_TimeBaseInitStructure);
TIM_TimeBaseInit(TIM2, &TIM_TimeBaseInitStructure);
TIM_ICInitTypeDef TIM_ICInitTypeDefStructure;
TIM_ICStructInit(&TIM_ICInitTypeDefStructure);
TIM_ICInit(TIM2, &TIM_ICInitTypeDefStructure);
TIM_ICInitTypeDefStructure.TIM_Channel = TIM_Channel_2;
TIM_ICInit(TIM2, &TIM_ICInitTypeDefStructure);
TIM_EncoderInterfaceConfig(TIM2, TIM_EncoderMode_TI12, TIM_ICPolarity_Falling, TIM_ICPolarity_Falling);
TIM_Cmd(TIM2, ENABLE);
} }
void memecoder_update() { void memecoder_update() {
// u8 cur_state = u8 cur_state =
// GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_12) << 0 | GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_12) << 0 |
// GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_13) << 1;// | GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_13) << 1 |
// GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_14) << 2; GPIO_ReadInputDataBit(GPIOB, GPIO_Pin_14) << 2;
// if(cur_state != memecoder_prev_state) { if(cur_state != memecoder_prev_state) {
// printf("%d\r\n", cur_state); if( (memecoder_prev_state == 1 && cur_state == 3) ||
// if( (memecoder_prev_state == 0 && cur_state == 1) || (memecoder_prev_state == 3 && cur_state == 2) ||
// (memecoder_prev_state == 1 && cur_state == 3) || (memecoder_prev_state == 2 && cur_state == 6) ||
// (memecoder_prev_state == 3 && cur_state == 2) || (memecoder_prev_state == 6 && cur_state == 4) ||
// (memecoder_prev_state == 2 && cur_state == 0)) { (memecoder_prev_state == 4 && cur_state == 5) ||
// if( (memecoder_prev_state == 1 && cur_state == 3) || (memecoder_prev_state == 5 && cur_state == 1)) {
// (memecoder_prev_state == 3 && cur_state == 2) || memecoder_count++;
// (memecoder_prev_state == 2 && cur_state == 6) || } else {
// (memecoder_prev_state == 6 && cur_state == 4) || memecoder_count--;
// (memecoder_prev_state == 4 && cur_state == 5) || }
// (memecoder_prev_state == 5 && cur_state == 1)) {
// memecoder_count++;
// } else {
// memecoder_count--;
// }
// memecoder_prev_state = cur_state; memecoder_prev_state = cur_state;
// } }
} }
void memecoder_set(int value) { void memecoder_set(int value) {
@ -71,7 +55,7 @@ void memecoder_set(int value) {
} }
int memecoder_get() { int memecoder_get() {
return (int16_t)TIM_GetCounter(TIM2) / 4; return memecoder_count;
} }
void memecoder_zero() { void memecoder_zero() {