aboutsummaryrefslogtreecommitdiff
path: root/driver_fw
diff options
context:
space:
mode:
authorjaseg <git@jaseg.net>2019-04-23 11:37:34 +0900
committerjaseg <git@jaseg.net>2019-04-23 11:37:34 +0900
commit257a7b8789951d886dc38adb0561819e7172ac76 (patch)
tree2c03938a4447655ccc8262e15c7a5f0aaf0a3991 /driver_fw
parentb566518994709a69dea41a3111a1700aeb601c8d (diff)
download8seg-257a7b8789951d886dc38adb0561819e7172ac76.tar.gz
8seg-257a7b8789951d886dc38adb0561819e7172ac76.tar.bz2
8seg-257a7b8789951d886dc38adb0561819e7172ac76.zip
Fix up modulation and lcd transfer scheduling
Diffstat (limited to 'driver_fw')
-rw-r--r--driver_fw/Makefile2
-rw-r--r--driver_fw/lcd1602.c6
-rw-r--r--driver_fw/main.c70
3 files changed, 42 insertions, 36 deletions
diff --git a/driver_fw/Makefile b/driver_fw/Makefile
index ef0375d..84098e2 100644
--- a/driver_fw/Makefile
+++ b/driver_fw/Makefile
@@ -37,7 +37,7 @@ SOURCES = main.c startup_stm32f030x6.s system_stm32f0xx.c base.c $(HAL_PATH)/Src
.PHONY: program clean
-all: main.elf main.pdf
+all: main.elf
cmsis_exports.c: $(CMSIS_DEV_PATH)/Include/stm32f030x6.h $(CMSIS_PATH)/Include/core_cm0.h
python3 gen_cmsis_exports.py $^ > $@
diff --git a/driver_fw/lcd1602.c b/driver_fw/lcd1602.c
index f065afc..481ab6c 100644
--- a/driver_fw/lcd1602.c
+++ b/driver_fw/lcd1602.c
@@ -143,9 +143,13 @@ void write_byte(uint8_t in_u8Byte)
uint8_t buf[1] = { lcd_gpio | in_u8Byte };
i2c_transmit(LCD_I2C_PERIPH, buf, 1, LCD_I2C_ADDR, I2C_GENSTOP_YES);
- delay_micro(39);
+ //delay_micro(39);
};
+void i2c_transmit_one(const uint8_t b) {
+ LCD_I2C_PERIPH->CR2 = LCD_I2C_ADDR | I2C_CR2_START | I2C_CR2_AUTOEND | (1 << I2C_CR2_NBYTES_Pos);
+}
+
/*
Отправка половины байта экрану
на входе: in_u8Byte - байт с командой
diff --git a/driver_fw/main.c b/driver_fw/main.c
index b528e6e..24db291 100644
--- a/driver_fw/main.c
+++ b/driver_fw/main.c
@@ -33,6 +33,7 @@ volatile unsigned int comm_led_ctr, err_led_ctr;
volatile unsigned int sys_time_tick = 0;
volatile unsigned int sys_time_ms;
volatile unsigned int sys_time_s;
+volatile unsigned int sys_flag_1Hz;
unsigned int frame_duration_us;
volatile uint8_t global_brightness; /* FIXME implement sending */
@@ -45,7 +46,7 @@ void trigger_comm_led() {
}
static volatile struct {
- int current_symbol, next_symbol;
+ int current_symbol;
struct state_8b10b_enc st;
} txstate;
@@ -181,7 +182,7 @@ int main(void) {
TIM3->ARR = 800-1; /* Set f=2.5kHz/T=0.4ms */
xfr_8b10b_encode_reset(&txstate.st);
- txstate.current_symbol = txstate.next_symbol = xfr_8b10b_encode(&txstate.st, K28_1) | 1<<10;
+ txstate.current_symbol = xfr_8b10b_encode(&txstate.st, K28_1) | 1<<10;
TIM3->EGR |= TIM_EGR_UG;
lcd_write_str(0, 0, "8seg driver");
@@ -190,22 +191,22 @@ int main(void) {
NVIC_EnableIRQ(TIM3_IRQn);
NVIC_SetPriority(TIM3_IRQn, 2<<4);
- uint8_t txbuf[3] = {0x01, 0x05, 0x01};
- int txpos = -1;
- unsigned int tx_start_tick = 0;
while (42) {
- if (txstate.next_symbol == -NO_SYMBOL) {
- if (txpos == -1)
- txstate.next_symbol = xfr_8b10b_encode(&txstate.st, -K28_1);
- else
- txstate.next_symbol = xfr_8b10b_encode(&txstate.st, txbuf[txpos]);
-
- txpos++;
- if (txpos >= sizeof(txbuf)/sizeof(txbuf[0])) {
- frame_duration_us = (sys_time_tick - tx_start_tick) * 10 * 1000;
- tx_start_tick = sys_time_tick;
- txpos = -1;
- }
+ if (sys_flag_1Hz) {
+ sys_flag_1Hz = 0;
+
+ char buf[17];
+
+ int temp = mcp9801_read_mdegC();
+ int deg = temp/1000;
+ int frac = (temp%1000)/100;
+ mini_snprintf(buf, sizeof(buf), "Temp: %d.%01d\xdf""C" LCD_FILL, deg, frac);
+ lcd_write_str(0, 0, buf);
+
+ mini_snprintf(buf, sizeof(buf), "I=%dmA U=%dmV" LCD_FILL, ina226_read_i()*INA226_I_LSB_uA/1000, ina226_read_v()*INA226_VB_LSB_uV/1000);
+ lcd_write_str(0, 1, buf);
+
+ mcp9801_init();
}
}
}
@@ -226,15 +227,28 @@ static int flipbits10(int in) {
}
void TIM3_IRQHandler() {
+ static int txpos = -1;
+ static unsigned int tx_start_tick = 0;
+ static uint8_t txbuf[3] = {0x01, 0x05, 0x01};
+
TIM3->SR &= ~TIM_SR_UIF;
int sym = txstate.current_symbol;
int bit = sym&1;
sym >>= 1;
if (sym == 1) { /* last bit shifted out */
- if (txstate.next_symbol == -NO_SYMBOL) /*FIXME debug code*/
- asm volatile("bkpt");
- sym = flipbits10(txstate.next_symbol) | 1<<10;
- txstate.next_symbol = -NO_SYMBOL;
+ if (txpos == -1)
+ sym = xfr_8b10b_encode(&txstate.st, -K28_1);
+ else
+ sym = xfr_8b10b_encode(&txstate.st, txbuf[txpos]);
+
+ txpos++;
+ if (txpos >= sizeof(txbuf)/sizeof(txbuf[0])) {
+ frame_duration_us = (sys_time_tick - tx_start_tick) * 10 * 1000;
+ tx_start_tick = sys_time_tick;
+ txpos = -1;
+ }
+
+ sym = flipbits10(sym) | 1<<10;
}
txstate.current_symbol = sym;
@@ -264,19 +278,7 @@ void SysTick_Handler(void) {
if (sys_time_ms++ == 1000) {
sys_time_ms = 0;
sys_time_s++;
-
- char buf[17];
-
- int temp = mcp9801_read_mdegC();
- int deg = temp/1000;
- int frac = (temp%1000)/100;
- mini_snprintf(buf, sizeof(buf), "Temp: %d.%01d\xdf""C" LCD_FILL, deg, frac);
- lcd_write_str(0, 0, buf);
-
- mini_snprintf(buf, sizeof(buf), "I=%dmA U=%dmV" LCD_FILL, ina226_read_i()*INA226_I_LSB_uA/1000, ina226_read_v()*INA226_VB_LSB_uV/1000);
- lcd_write_str(0, 1, buf);
-
- mcp9801_init();
+ sys_flag_1Hz = 1;
}
/* This is a hack. We could use the SPI interrupt here if that didn't fire at the start instead of end of transmission.... -.- */