wuqiyang312
/
u8g2-copy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

track

This commit is contained in:
kraus 2018-03-31 20:31:05 +02:00
parent c42152355d
commit 8df7e628ad
2 changed files with 109 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/arduino/u8g2_page_buffer/TrackControl/TrackControl.ino
View File

@ -46,6 +46,7 @@
#endif
#define MENU_FONT u8g2_font_helvB18_tr
#define SUBMENU_FONT u8g2_font_helvB12_tr
/*
@ -533,11 +534,42 @@ void set_motor_speed(uint8_t motor, uint8_t speed)
}
}
uint16_t motor_noise_raw;
uint16_t motor_noise_filt;
uint16_t motor_speed_raw; // lower is faster
uint16_t motor_speed_filt; // lower is faster
void read_motor_data(uint8_t motor)
{
uint8_t error;
Wire.beginTransmission(40+motor); // motor controller
error = Wire.endTransmission(false);
if ( error == 0 )
{
Wire.beginTransmission(40+motor); // motor controller
Wire.write(1); // reset to index 0
Wire.endTransmission();
Wire.requestFrom(40+motor, 9);
Wire.read(); // dummy read
motor_noise_raw = Wire.read();
motor_noise_raw |= (((uint16_t)Wire.read())<<8);
motor_noise_filt = Wire.read();
motor_noise_filt |= (((uint16_t)Wire.read())<<8);
motor_speed_raw = Wire.read();
motor_speed_raw |= (((uint16_t)Wire.read())<<8);
motor_speed_filt = Wire.read();
motor_speed_filt |= (((uint16_t)Wire.read())<<8);
}
}
void show_motor_set_speed(uint8_t motor, uint8_t speed)
{
u8g2_uint_t y;
u8g2_uint_t o = 18;
button_event = 0;
read_motor_data(motor);
u8g2.firstPage();
do
{
@ -548,14 +580,25 @@ void show_motor_set_speed(uint8_t motor, uint8_t speed)
check_button_event();
y = (uint8_t)(((uint16_t)(128-o)*(uint16_t)(127-speed/2))>>7);
u8g2.setCursor(16, y+o);
u8g2.setCursor(14, y+o);
u8g2.print(speed);
check_button_event();
u8g2.setCursor(70, 20);
u8g2.setCursor(60, 20);
u8g2.print("Motor: ");
u8g2.print(motor);
u8g2.setFont(SUBMENU_FONT);
u8g2.setCursor(60, 50);
u8g2.print("Noise: ");
u8g2.setCursor(120, 50);
u8g2.print(motor_noise_filt);
u8g2.setCursor(60, 70);
u8g2.print("Speed: ");
u8g2.setCursor(120, 70);
u8g2.print(motor_speed_filt);
draw_log();
} while( u8g2.nextPage() );
@ -574,6 +617,7 @@ void motor_speed_test(void)
for(;;)
{
show_motor_set_speed(motor, speed[motor]);
if ( button_event == U8X8_MSG_GPIO_MENU_UP )
{
if ( speed[motor] < 128 && speed[motor]+step > 128 )

113
sys/arm/stm32l031x6/drv8871/main.c
View File

@ -43,6 +43,28 @@ uint8_t u8g2_x, u8g2_y; // current position on the screen
volatile unsigned long SysTickCount = 0;
/*=======================================================================*/
/* I2C */
volatile unsigned char i2c_mem[256]; /* contains data, which read or written */
volatile unsigned char i2c_idx; /* the current index into i2c_mem */
volatile unsigned char i2c_is_write_idx; /* write state */
/*
i2c_mem[0] input: speed
i2c_mem[1] not used
i2c_mem[2] = adc_diff_noise_per_sample_raw & 255
i2c_mem[3] = adc_diff_noise_per_sample_raw>>8;
i2c_mem[4] = adc_diff_noise_per_sample_filt & 255
i2c_mem[5] = adc_diff_noise_per_sample_filt>>8;
i2c_mem[6] = adc_max_raw & 255;
i2c_mem[7] = adc_max_raw>>8;
i2c_mem[8] = adc_max_filt & 255;
i2c_mem[9] = adc_max_filt>>8;
*/
/*=======================================================================*/
void __attribute__ ((interrupt, used)) SysTick_Handler(void)
@ -869,20 +891,29 @@ void adcExecAcquisition(void)
adc_calculation_pos = 0;
adc_diff_sum = adc_diff_sum_tmp;
adc_diff_noise_per_sample_raw = (adc_diff_sum_tmp * 256UL)/adc_diff_sum_cnt;
i2c_mem[2] = adc_diff_noise_per_sample_raw & 255;
i2c_mem[3] = adc_diff_noise_per_sample_raw>>8;
/*
this is a strong low-pass filter
currently the filter value is calculated with 100Hz (every 5th duty cycle)
3V DC Motor: adc_diff_noise_per_sample_filt < 0x0200 stop, adc_diff_noise_per_sample_filt > 0x0250 running
3V DC Motor: adc_diff_noise_per_sample_filt < 0x0600 stop, adc_diff_noise_per_sample_filt > 0x0700 running
*/
adc_diff_noise_per_sample_filt = (((((1UL<<5) - 1)*(uint32_t)adc_diff_noise_per_sample_filt)) + (uint32_t)((1*adc_diff_noise_per_sample_raw)))>>5;
i2c_mem[4] = adc_diff_noise_per_sample_filt & 255;
i2c_mem[5] = adc_diff_noise_per_sample_filt>>8;
/*
low-pass filter for the max value of the ADC.
If the DC motor rotates, then the max value indicates speed: lower values are faster, higher values are slower
3V DC Motor: values are from 0x01d (fastest) to 0x90 (almost stopped)
3V DC Motor: values are from 0x0160 (fastest) to >0x4b0 (almost stopped)
*/
adc_max_raw = adc_max_tmp;
i2c_mem[6] = adc_max_raw & 255;
i2c_mem[7] = adc_max_raw>>8;
adc_max_filt = (((((1UL<<5) - 1)*(uint32_t)adc_max_filt)) + (uint32_t)((1*adc_max_raw))) >> 5;
i2c_mem[8] = adc_max_filt & 255;
i2c_mem[9] = adc_max_filt>>8;
adc_calculation_state++;
}
@ -1068,13 +1099,10 @@ void __attribute__ ((interrupt, used)) TIM22_IRQHandler(void)
TIM22->SR &= ~TIM_SR_UIF; /* clear interrupt */
}
/*=======================================================================*/
/* I2C */
volatile unsigned char i2c_mem[256]; /* contains data, which read or written */
volatile unsigned char i2c_idx; /* the current index into i2c_mem */
volatile unsigned char i2c_is_write_idx; /* write state */
volatile uint16_t i2c_total_irq_cnt;
volatile uint16_t i2c_TXIS_cnt;
volatile uint16_t i2c_RXNE_cnt;
@ -1280,15 +1308,17 @@ void __attribute__ ((interrupt, used)) I2C1_IRQHandler(void)
int main()
{
uint16_t adc_value;
uint16_t adc_value = 0x80;
uint16_t old_adc_value = 0x0ffff;
uint16_t tim_duty;
uint16_t zero_pos;
uint16_t i;
u8g2_uint_t y, yy;
uint8_t is_i2c = 0;
setHSIClock(); /* enable 32 MHz Clock */
startUp(); /* enable systick irq and several power regions */
i2c_hw_init(40*2); /* activage I2C, adr = 40 */
i2c_init(40*2); /* activage I2C, adr = 40 */
initDisplay(); /* aktivate display */
initADC();
@ -1323,59 +1353,42 @@ int main()
u8g2_ClearBuffer(&u8g2);
//adc_value = getADC(5);
adc_value = adc_variable_resistor_value;
adc_value = i2c_mem[0];
if ( adc_value >= 0x080 )
if ( is_i2c != 0 )
{
adc_value -= 0x080;
adc_value *= 2;
tim_duty = ((uint32_t)adc_value*((uint32_t)TIM_CYCLE_TIME-TIM_CYCLE_UPPER_SKIP-TIM_CYCLE_LOWER_SKIP))>>8;
tim_duty += TIM_CYCLE_LOWER_SKIP;
setTIM2RawDuty(tim_duty, 1);
adc_value = i2c_mem[0];
}
else
{
adc_value = 0x080 - adc_value;
adc_value *= 2;
tim_duty = ((uint32_t)adc_value*((uint32_t)TIM_CYCLE_TIME-TIM_CYCLE_UPPER_SKIP-TIM_CYCLE_LOWER_SKIP))>>8;
tim_duty += TIM_CYCLE_LOWER_SKIP;
setTIM2RawDuty(tim_duty, 0);
}
/*
TIM2->SR &= ~TIM_SR_UIF;
while( (TIM2->SR & TIM_SR_UIF) == 0 )
;
yy = 30;
for( i = 0; i < 128; i++ )
{
y = 30-(gpio_buf[i*BUF_MUL]&2)*2;
u8g2_DrawPixel(&u8g2, i, y);
if ( y < yy )
u8g2_DrawVLine(&u8g2, i, y, yy-y+1);
if ( i2c_mem[0] != 0x080 )
{
adc_value = i2c_mem[0];
is_i2c = 1;
}
else
u8g2_DrawVLine(&u8g2, i, yy, y-yy+1);
yy = y;
{
adc_value = adc_variable_resistor_value;
}
}
*/
/*
for( i = 0; i < 128*BUF_MUL; i++ )
if ( old_adc_value != adc_value )
{
adc_buf[i] = i;
if ( adc_value >= 0x080 )
{
tim_duty = ((uint32_t)((adc_value-0x080)*2)*((uint32_t)TIM_CYCLE_TIME-TIM_CYCLE_UPPER_SKIP-TIM_CYCLE_LOWER_SKIP))>>8;
tim_duty += TIM_CYCLE_LOWER_SKIP;
setTIM2RawDuty(tim_duty, 1);
}
else
{
tim_duty = ((uint32_t)((0x080 - adc_value)*2)*((uint32_t)TIM_CYCLE_TIME-TIM_CYCLE_UPPER_SKIP-TIM_CYCLE_LOWER_SKIP))>>8;
tim_duty += TIM_CYCLE_LOWER_SKIP;
setTIM2RawDuty(tim_duty, 0);
}
old_adc_value = adc_value;
}
scanADC(6, 128*BUF_MUL, adc_buf);
*/
yy = 60;