From 8b4b811b942e20a38cf31bade9625b4c3ec96e54 Mon Sep 17 00:00:00 2001 From: Edward Emelianov Date: Sat, 13 Mar 2021 15:52:27 +0300 Subject: [PATCH] add MAX7219 --- F1-nolib/MAX7219_screen/MAX7219.bin | Bin 0 -> 5812 bytes F1-nolib/MAX7219_screen/MAX7219.c | 183 +++++++++++ F1-nolib/MAX7219_screen/MAX7219.h | 33 ++ F1-nolib/MAX7219_screen/Makefile | 139 ++++++++ F1-nolib/MAX7219_screen/Readme | 1 + F1-nolib/MAX7219_screen/hardware.c | 50 +++ F1-nolib/MAX7219_screen/hardware.h | 54 ++++ F1-nolib/MAX7219_screen/main.c | 89 ++++++ F1-nolib/MAX7219_screen/proto.c | 317 ++++++++++++++++++ F1-nolib/MAX7219_screen/proto.h | 30 ++ F1-nolib/MAX7219_screen/spi.c | 87 +++++ F1-nolib/MAX7219_screen/spi.h | 36 +++ F1-nolib/MAX7219_screen/usb.c | 167 ++++++++++ F1-nolib/MAX7219_screen/usb.h | 33 ++ F1-nolib/MAX7219_screen/usb_defs.h | 102 ++++++ F1-nolib/MAX7219_screen/usb_lib.c | 476 ++++++++++++++++++++++++++++ F1-nolib/MAX7219_screen/usb_lib.h | 184 +++++++++++ 17 files changed, 1981 insertions(+) create mode 100755 F1-nolib/MAX7219_screen/MAX7219.bin create mode 100644 F1-nolib/MAX7219_screen/MAX7219.c create mode 100644 F1-nolib/MAX7219_screen/MAX7219.h create mode 100644 F1-nolib/MAX7219_screen/Makefile create mode 100644 F1-nolib/MAX7219_screen/Readme create mode 100644 F1-nolib/MAX7219_screen/hardware.c create mode 100644 F1-nolib/MAX7219_screen/hardware.h create mode 100644 F1-nolib/MAX7219_screen/main.c create mode 100644 F1-nolib/MAX7219_screen/proto.c create mode 100644 F1-nolib/MAX7219_screen/proto.h create mode 100644 F1-nolib/MAX7219_screen/spi.c create mode 100644 F1-nolib/MAX7219_screen/spi.h create mode 100644 F1-nolib/MAX7219_screen/usb.c create mode 100644 F1-nolib/MAX7219_screen/usb.h create mode 100644 F1-nolib/MAX7219_screen/usb_defs.h create mode 100644 F1-nolib/MAX7219_screen/usb_lib.c create mode 100644 F1-nolib/MAX7219_screen/usb_lib.h diff --git a/F1-nolib/MAX7219_screen/MAX7219.bin b/F1-nolib/MAX7219_screen/MAX7219.bin new file mode 100755 index 0000000000000000000000000000000000000000..3f9eb4513691e19da430f94c293b8eec7bb6e65d GIT binary patch literal 5812 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 R5kV5>CJIYG949j!{6E?yqU8Vp literal 0 HcmV?d00001 diff --git a/F1-nolib/MAX7219_screen/MAX7219.c b/F1-nolib/MAX7219_screen/MAX7219.c new file mode 100644 index 0000000..4c60b9b --- /dev/null +++ b/F1-nolib/MAX7219_screen/MAX7219.c @@ -0,0 +1,183 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "hardware.h" +#include "spi.h" +#include "MAX7219.h" +#ifdef EBUG +#include "usb.h" +#include "proto.h" +#endif + +// all registers: +typedef enum { + REG_NO_OP = 0x00 << 8, + REG_DIGIT_0 = 0x01 << 8, + REG_DIGIT_1 = 0x02 << 8, + REG_DIGIT_2 = 0x03 << 8, + REG_DIGIT_3 = 0x04 << 8, + REG_DIGIT_4 = 0x05 << 8, + REG_DIGIT_5 = 0x06 << 8, + REG_DIGIT_6 = 0x07 << 8, + REG_DIGIT_7 = 0x08 << 8, + REG_DECODE_MODE = 0x09 << 8, + REG_INTENSITY = 0x0A << 8, + REG_SCAN_LIMIT = 0x0B << 8, + REG_SHUTDOWN = 0x0C << 8, + REG_DISPLAY_TEST = 0x0F << 8, +} MAX7219_REGISTERS; + +typedef enum{ + S_RELAX, + S_REFRESH, +} Status; + +static uint8_t rdy2sendNXT = 1; + +static Status s; + +// screen buffer, sent line by line +static uint8_t screenbuf[8][NSCREENS]; + +// init controlling registers +static void inireg(uint16_t reg){ + CLEAR(CS); + for(int i = 0; i < NSCREENS; ++i) + SPI_blocktransmit(reg); + SET(CS); +} +// setup display +void MAX7219_setup(){ + SET(CS); + rdy2sendNXT = 1; + SPI_setup(); +#ifdef EBUG + for(int i = 0; i < NSCREENS; ++i){ + MAX7219_point(0 + 8*i, 7, 1); + MAX7219_point(1 + 8*i, 6, 1); + MAX7219_point(2 + 8*i, 5, 1); + MAX7219_point(3 + 8*i, 4, 1); + MAX7219_point(4 + 8*i, 3, 1); + MAX7219_point(5 + 8*i, 2, 1); + MAX7219_point(6 + 8*i, 1, 1); + MAX7219_point(7 + 8*i, 0, 1); + } +#endif + // send !shutdown + inireg(REG_SHUTDOWN | 1); + inireg(REG_DECODE_MODE); + inireg(REG_INTENSITY | 3); // low intensity by default + inireg(REG_SCAN_LIMIT | 7); // show all digits + s = S_RELAX; + // s = S_REFRESH; +} + +// change intensity +void MAX7219_setintens(uint8_t intens){ + while(!rdy2sendNXT); + uint16_t tr = REG_INTENSITY | intens; + CLEAR(CS); + for(int i = 0; i < NSCREENS; ++i) + SPI_blocktransmit(tr); + SET(CS); +} + +// send command "display test" +void MAX7219_test(int t){ + while(!rdy2sendNXT); + uint16_t tr = REG_DISPLAY_TEST; + if(t) tr |= 1; + CLEAR(CS); + for(int i = 0; i < NSCREENS; ++i) + SPI_blocktransmit(tr); + SET(CS); +} + +void MAX7219_refresh(){ + s = S_REFRESH; +} + +/** + * @brief MAX7219_point - set or clear point + * @param x,y - coordinates (x=0..(8*NSCREENS-1), y=0..7 + * @param sc - clear (0) or set (!0) pixel + * @return 0 if failed + */ +int MAX7219_point(int x, int y, int sc){ + if(x < 0 || x >= 8*NSCREENS) return 0; + if(y < 0 || y > 7) return 0; + int N = x / 8, n = 7 - (x - N*8); // nbyte, nbit +#ifdef EBUG + USB_send("pix N="); USB_send(u2str(N)); + USB_send(", n="); USB_send(u2str(n)); + USB_send(", x="); USB_send(u2str(x)); + USB_send(", y="); USB_send(u2str(y)); + USB_send("\n"); +#endif + if(sc){ // set pixel + screenbuf[y][N] |= 1<SR & SPI_SR_TXE && !(SPI1->SR & SPI_SR_BSY)){ // last data transmitted + SET(CS); + rdy2sendNXT = 1; +#ifdef EBUG + USB_send("Nxt\n"); +#endif + } + } +} + +// roll screen by 1 pixel to the left +void MAX7219_rollscreen(){ + for(int y = 0; y < 8; ++y){ + uint8_t _1st = (screenbuf[y][0] & (1<<7)) ? 1:0; + for(int n = NSCREENS-1; n > -1; --n){ + uint8_t val = screenbuf[y][n]; + screenbuf[y][n] = (val<<1) | _1st; + _1st = (val & (1<<7)) ? 1:0; + } + } +} diff --git a/F1-nolib/MAX7219_screen/MAX7219.h b/F1-nolib/MAX7219_screen/MAX7219.h new file mode 100644 index 0000000..05a5403 --- /dev/null +++ b/F1-nolib/MAX7219_screen/MAX7219.h @@ -0,0 +1,33 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef MAX_H__ +#define MAX_H__ + +#include + +void MAX7219_test(int i); +void MAX7219_setup(); +void MAX7219_setintens(uint8_t i); +void MAX7219_process(); +int MAX7219_point(int x, int y, int s); +void MAX7219_refresh(); +void MAX7219_rollscreen(); + +#endif // MAX_H__ diff --git a/F1-nolib/MAX7219_screen/Makefile b/F1-nolib/MAX7219_screen/Makefile new file mode 100644 index 0000000..3c7fe5e --- /dev/null +++ b/F1-nolib/MAX7219_screen/Makefile @@ -0,0 +1,139 @@ +BINARY = MAX7219 +BOOTPORT ?= /dev/ttyUSB0 +BOOTSPEED ?= 115200 +# MCU FAMILY +FAMILY ?= F1 +# MCU code +MCU ?= F103x8 +# density (stm32f10x.h, lines 70-84) +DENSITY ?= MD +# change this linking script depending on particular MCU model, +LDSCRIPT ?= stm32f103x8.ld +# debug +#DEFS = -DEBUG + +INDEPENDENT_HEADERS= + +FP_FLAGS ?= -msoft-float -mfloat-abi=soft +ASM_FLAGS ?= -mthumb -mcpu=cortex-m3 -mfix-cortex-m3-ldrd +ARCH_FLAGS = $(ASM_FLAGS) $(FP_FLAGS) + +############################################################################### +# Executables +#PREFIX ?= arm-none-eabi +# gcc from arm web site +PREFIX ?= /opt/bin/arm-none-eabi +TOOLCHLIB ?= /opt/arm-none-eabi/lib +RM := rm -f +RMDIR := rmdir +CC := $(PREFIX)-gcc +# don't replace ld with gcc: the binary size would be much greater!! +LD := $(PREFIX)-ld +AR := $(PREFIX)-ar +AS := $(PREFIX)-as +SIZE := $(PREFIX)-size +OBJCOPY := $(PREFIX)-objcopy +OBJDUMP := $(PREFIX)-objdump +GDB := $(PREFIX)-gdb +STFLASH := $(shell which st-flash) +STBOOT := $(shell which stm32flash) +DFUUTIL := $(shell which dfu-util) + +############################################################################### +# Source files +OBJDIR = mk +SRC := $(wildcard *.c) +OBJS := $(addprefix $(OBJDIR)/, $(SRC:%.c=%.o)) +STARTUP = $(OBJDIR)/startup.o +OBJS += $(STARTUP) +# dependencies: we need them to recompile files if their headers-dependencies changed +DEPS := $(OBJS:.o=.d) + +INC_DIR ?= ../inc + +INCLUDE := -I$(INC_DIR)/Fx -I$(INC_DIR)/cm +LIB_DIR := $(INC_DIR)/ld + +############################################################################### +# C flags +CFLAGS += -O2 -g -D__thumb2__=1 -MD -Wl,--gc-sections +CFLAGS += -Wall -Werror -Wextra -Wshadow +CFLAGS += -fno-common -ffunction-sections -fdata-sections -fno-stack-protector +CFLAGS += $(ARCH_FLAGS) + +############################################################################### +# Linker flags +LDFLAGS += -nostartfiles --static -nostdlibs --gc-sections +LDFLAGS += -L$(LIB_DIR) -L$(TOOLCHLIB) +LDFLAGS += -T$(LDSCRIPT) + +############################################################################### +# Used libraries +LDLIBS += -lc $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) + +DEFS += -DSTM32$(FAMILY) -DSTM32$(MCU) -DSTM32F10X_$(DENSITY) + +ELF := $(OBJDIR)/$(BINARY).elf +LIST := $(OBJDIR)/$(BINARY).list +BIN := $(BINARY).bin +HEX := $(BINARY).hex + +all: bin list size + +elf: $(ELF) +bin: $(BIN) +hex: $(HEX) +list: $(LIST) + +ifneq ($(MAKECMDGOALS),clean) +-include $(DEPS) +endif + +$(OBJDIR): + mkdir $(OBJDIR) + +$(STARTUP): $(INC_DIR)/startup/vector.c + $(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $< + +$(OBJDIR)/%.o: %.c + @echo " CC $<" + $(CC) $(CFLAGS) $(DEFS) $(INCLUDE) -o $@ -c $< + +$(BIN): $(ELF) + @echo " OBJCOPY $(BIN)" + $(OBJCOPY) -Obinary $(ELF) $(BIN) + +$(HEX): $(ELF) + @echo " OBJCOPY $(HEX)" + $(OBJCOPY) -Oihex $(ELF) $(HEX) + +$(LIST): $(ELF) + @echo " OBJDUMP $(LIST)" + $(OBJDUMP) -S $(ELF) > $(LIST) + +$(ELF): $(OBJDIR) $(OBJS) + @echo " LD $(ELF)" + $(LD) $(LDFLAGS) $(OBJS) $(LDLIBS) -o $(ELF) + +size: $(ELF) + $(SIZE) $(ELF) + +clean: + @echo " CLEAN" + $(RM) $(OBJS) $(DEPS) $(ELF) $(HEX) $(LIST) + @rmdir $(OBJDIR) 2>/dev/null || true + + +flash: $(BIN) + @echo " FLASH $(BIN)" + $(STFLASH) write $(BIN) 0x8000000 + +boot: $(BIN) + @echo " LOAD $(BIN) through bootloader" + $(STBOOT) -b$(BOOTSPEED) $(BOOTPORT) -w $(BIN) + +dfuboot: $(BIN) + @echo " LOAD $(BIN) THROUGH DFU" + $(DFUUTIL) -a0 -D $(BIN) -s 0x08000000 + +.PHONY: clean flash boot diff --git a/F1-nolib/MAX7219_screen/Readme b/F1-nolib/MAX7219_screen/Readme new file mode 100644 index 0000000..e6f6e40 --- /dev/null +++ b/F1-nolib/MAX7219_screen/Readme @@ -0,0 +1 @@ +STM32F103 work with N LED matrices 8x8 diff --git a/F1-nolib/MAX7219_screen/hardware.c b/F1-nolib/MAX7219_screen/hardware.c new file mode 100644 index 0000000..25c93f7 --- /dev/null +++ b/F1-nolib/MAX7219_screen/hardware.c @@ -0,0 +1,50 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "hardware.h" +#include "spi.h" + +static inline void gpio_setup(){ + // Enable clocks to the GPIO subsystems, turn on AFIO clocking to disable SWD/JTAG + RCC->APB2ENR |= RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPCEN | RCC_APB2ENR_AFIOEN; + // Set led as opendrain output + GPIOC->CRH = CRH(13, CNF_ODOUTPUT|MODE_SLOW); + // turn off SWJ/JTAG (PA13 is in use) + //AFIO->MAPR = AFIO_MAPR_SWJ_CFG_DISABLE; + AFIO->MAPR = AFIO_MAPR_SWJ_CFG_JTAGDISABLE; // for PA15 + // USB pullup (PA15) - pushpull output + GPIOA->CRH = CRH(15, CNF_PPOUTPUT|MODE_SLOW); + GPIOA->CRL = CRL(6, CNF_PPOUTPUT|MODE_FAST); // SS +} + +void hw_setup(){ + gpio_setup(); +} + +void iwdg_setup(){ + uint32_t tmout = 16000000; + RCC->CSR |= RCC_CSR_LSION; + while((RCC->CSR & RCC_CSR_LSIRDY) != RCC_CSR_LSIRDY){if(--tmout == 0) break;} /* (2) */ + IWDG->KR = IWDG_START; + IWDG->KR = IWDG_WRITE_ACCESS; + IWDG->PR = IWDG_PR_PR_1; + IWDG->RLR = 1250; + tmout = 16000000; + while(IWDG->SR){if(--tmout == 0) break;} + IWDG->KR = IWDG_REFRESH; +} diff --git a/F1-nolib/MAX7219_screen/hardware.h b/F1-nolib/MAX7219_screen/hardware.h new file mode 100644 index 0000000..4c70374 --- /dev/null +++ b/F1-nolib/MAX7219_screen/hardware.h @@ -0,0 +1,54 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef HARDWARE_H__ +#define HARDWARE_H__ + +#include "stm32f1.h" + +// LED0 - PC13 (bluepill), blinking each second +#define LED0_port GPIOC +#define LED0_pin (1<<13) + +// USB pullup (not present in bluepill, should be soldered) - PA15 +#define USBPU_port GPIOA +#define USBPU_pin (1<<15) +#define USBPU_ON() pin_set(USBPU_port, USBPU_pin) +#define USBPU_OFF() pin_clear(USBPU_port, USBPU_pin) + +#define LED_blink(x) pin_toggle(x ## _port, x ## _pin) +#define LED_on(x) pin_clear(x ## _port, x ## _pin) +#define LED_off(x) pin_set(x ## _port, x ## _pin) + +// SPI DMA channel +#define DMA_SPI_Channel DMA1_Channel3 +// SCREEN PINs: PA5 - SCK, PA6 - CS, PA7 - MOSI +#define CS_port GPIOA +#define CS_pin (1<<6) +#define SET(x) pin_set(x ## _port, x ## _pin) +#define CLEAR(x) pin_clear(x ## _port, x ## _pin) +#define TOGGLE(x) pin_toggle(x ## _port, x ## _pin) + +// amount of 8x8 matrices +#define NSCREENS (4) + +void hw_setup(); +void iwdg_setup(); + +#endif // HARDWARE_H__ diff --git a/F1-nolib/MAX7219_screen/main.c b/F1-nolib/MAX7219_screen/main.c new file mode 100644 index 0000000..f4645c6 --- /dev/null +++ b/F1-nolib/MAX7219_screen/main.c @@ -0,0 +1,89 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "hardware.h" +#include "MAX7219.h" +#include "proto.h" +#include "usb.h" +#include "usb_lib.h" + +volatile uint32_t Tms = 0; +uint32_t rollpause = 199; +uint8_t roll = 0; // roll screen + +/* Called when systick fires */ +void sys_tick_handler(void){ + ++Tms; +} + +// usb getline +static char *get_USB(){ + static char tmpbuf[512], *curptr = tmpbuf; + static int rest = 511; + int x = USB_receive(curptr); + curptr[x] = 0; + if(!x) return NULL; + if(curptr[x-1] == '\n'){ + curptr = tmpbuf; + rest = 511; + return tmpbuf; + } + curptr += x; rest -= x; + if(rest <= 0){ // buffer overflow + curptr = tmpbuf; + rest = 511; + } + return NULL; +} + +int main(void){ + uint32_t lastT = 0, lastTroll = 0; + sysreset(); + StartHSE(); + SysTick_Config(72000); + + USBPU_OFF(); + USB_setup(); + hw_setup(); + MAX7219_setup(); + iwdg_setup(); + USBPU_ON(); + + while (1){ + IWDG->KR = IWDG_REFRESH; // refresh watchdog + if(Tms - lastT > 499){ + LED_blink(LED0); + lastT = Tms; + } + if(roll && Tms - lastTroll > rollpause){ + MAX7219_rollscreen(); + MAX7219_refresh(); + lastTroll = Tms; + } + MAX7219_process(); + usb_proc(); + char *txt; + const char *ans; + if((txt = get_USB())){ + ans = parse_cmd(txt); + if(ans) USB_send(ans); + } + } + return 0; +} + diff --git a/F1-nolib/MAX7219_screen/proto.c b/F1-nolib/MAX7219_screen/proto.c new file mode 100644 index 0000000..4bcafc8 --- /dev/null +++ b/F1-nolib/MAX7219_screen/proto.c @@ -0,0 +1,317 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "hardware.h" +#include "proto.h" +#include "MAX7219.h" +#include "usb.h" + +extern volatile uint32_t Tms; +extern uint32_t rollpause; +extern uint8_t roll; + +char *omit_spaces(const char *buf){ + while(*buf){ + if(*buf > ' ') break; + ++buf; + } + return (char*)buf; +} + +// In case of overflow return `buf` and N==0xffffffff +// read decimal number & return pointer to next non-number symbol +static char *getdec(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '9'){ + break; + } + if(num > 429496729 || (num == 429496729 && c > '5')){ // overflow + *N = 0xffffff; + return start; + } + num *= 10; + num += c - '0'; + ++buf; + } + *N = num; + return (char*)buf; +} +// read hexadecimal number (without 0x prefix!) +static char *gethex(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + uint8_t M = 0; + if(c >= '0' && c <= '9'){ + M = '0'; + }else if(c >= 'A' && c <= 'F'){ + M = 'A' - 10; + }else if(c >= 'a' && c <= 'f'){ + M = 'a' - 10; + } + if(M){ + if(num & 0xf0000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 4; + num += c - M; + }else{ + break; + } + ++buf; + } + *N = num; + return (char*)buf; +} +// read octal number (without 0 prefix!) +static char *getoct(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '7'){ + break; + } + if(num & 0xe0000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 3; + num += c - '0'; + ++buf; + } + *N = num; + return (char*)buf; +} +// read binary number (without b prefix!) +static char *getbin(const char *buf, uint32_t *N){ + char *start = (char*)buf; + uint32_t num = 0; + while(*buf){ + char c = *buf; + if(c < '0' || c > '1'){ + break; + } + if(num & 0x80000000){ // overflow + *N = 0xffffff; + return start; + } + num <<= 1; + if(c == '1') num |= 1; + ++buf; + } + *N = num; + return (char*)buf; +} + +/** + * @brief getnum - read uint32_t from string (dec, hex or bin: 127, 0x7f, 0b1111111) + * @param buf - buffer with number and so on + * @param N - the number read + * @return pointer to first non-number symbol in buf + * (if it is == buf, there's no number or if *N==0xffffffff there was overflow) + */ +char *getnum(const char *txt, uint32_t *N){ + char *nxt = NULL; + char *s = omit_spaces(txt); + if(*s == '0'){ // hex, oct or 0 + if(s[1] == 'x' || s[1] == 'X'){ // hex + nxt = gethex(s+2, N); + if(nxt == s+2) nxt = (char*)txt; + }else if(s[1] > '0'-1 && s[1] < '8'){ // oct + nxt = getoct(s+1, N); + if(nxt == s+1) nxt = (char*)txt; + }else{ // 0 + nxt = s+1; + *N = 0; + } + }else if(*s == 'b' || *s == 'B'){ + nxt = getbin(s+1, N); + if(nxt == s+1) nxt = (char*)txt; + }else{ + nxt = getdec(s, N); + if(nxt == s) nxt = (char*)txt; + } + return nxt; +} + +const char* helpmsg = + "'0' - setup again\n" + "'Cxy' - clear pixel @ x,y\n" + "'Ii' - set intensity to i\n" + "'Pp' - change roll pause to p ms (5..1000)" + "'R' - refresh screen\n" + "'r' - roll screen or stop it\n" + "'Sxy' - set pixel @ x,y\n" + "'T/t' - test on/off\n" +; + +const char *parse_cmd(const char *buf){ + if(buf[1] == '\n'){ // short commands + switch(*buf){ + case '0': + MAX7219_setup(); + return "Reinit\n"; + break; + case 'R': + MAX7219_refresh(); + return "Refresh\n"; + break; + case 'r': + if(roll){ + roll = 0; + return "Stop rolling\n"; + }else{ + roll = 1; + return "Start rolling\n"; + } + case 'T': + MAX7219_test(1); + break; + case 't': + MAX7219_test(0); + break; + default: // help + return helpmsg; + break; + } + }else{ + uint32_t x, y = 0xffff; + char *nxt = getnum(buf+1, &x), *n; + int setclr = -1; + if(nxt != buf+1){ + ++nxt; + n = getnum(nxt, &y); + if(n == nxt){ + y = 0xffff; + }else{ + if(y > 7 || x > 8*NSCREENS) y = 0xffff; + } + } + switch(*buf){ + case 'C': + setclr = 0; + break; + case 'I': + if(x > 15) return "I should be < 16!\n"; + MAX7219_setintens(x); + return "Done\n"; + case 'P': + if(x < 5 || x > 1000) return "Bad pause length\n"; + rollpause = x - 1; + return "Changed\n"; + break; + case 'S': + setclr = 1; + break; + default: + return buf; + } + if(setclr != -1){ + if(y == 0xffff) return "Wrong coordinates\n"; + if(!MAX7219_point(x, y, setclr)) return "Error\n"; + else return "Done"; + } + } + return NULL; +} + +/* +const char *parse_cmd(const char *buf){ + uint8_t u; + if(buf[1] == '\n'){ // one symbol commands + switch(*buf){ + case '0': + if(BMP180_reset()) return "Reseted\n"; + else return "Error in reset\n"; + break; + case '1': + if(!BMP180_init()) return "Error in init process\n"; + return "OK, inited\n"; + break; + case 'I': + BMP180_read_ID(&u); + if(u == BMP180_CHIP_ID) return "BMP180\n"; + else return "ID unknown\n"; + break; + case 'M': + if(!BMP180_start()) return "BMP180 not found or not inited\n"; + else return "Start\n"; + break; + case 'R': + USB_send("Soft reset\n"); + NVIC_SystemReset(); + break; + case 'W': + USB_send("Wait for reboot\n"); + while(1){nop();}; + break; + default: + return helpmsg; + } + return NULL; + } + uint32_t Num = 0; + switch(*buf){ // long messages + case 'O': + ++buf; + if(buf != getnum(buf, &Num) && Num < BMP180_OVERSMAX){ + BMP180_setOS(Num); + return "Changed\n"; + }else return "Wrong OS number"; + break; + default: + return buf; + } + return NULL; +}*/ + +static char *_2str(uint32_t val, uint8_t minus){ + static char strbuf[12]; + char *bufptr = &strbuf[11]; + *bufptr = 0; + if(!val){ + *(--bufptr) = '0'; + }else{ + while(val){ + *(--bufptr) = val % 10 + '0'; + val /= 10; + } + } + if(minus) *(--bufptr) = '-'; + return bufptr; +} + +// return string with number `val` +char *u2str(uint32_t val){ + return _2str(val, 0); +} +char *i2str(int32_t i){ + uint8_t minus = 0; + uint32_t val; + if(i < 0){ + minus = 1; + val = -i; + }else val = i; + return _2str(val, minus); +} diff --git a/F1-nolib/MAX7219_screen/proto.h b/F1-nolib/MAX7219_screen/proto.h new file mode 100644 index 0000000..2abcbed --- /dev/null +++ b/F1-nolib/MAX7219_screen/proto.h @@ -0,0 +1,30 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +#pragma once +#ifndef PROTO_H__ +#define PROTO_H__ + +#include + +const char *parse_cmd(const char *buf); +char *omit_spaces(const char *buf); +char *getnum(const char *buf, uint32_t *N); +char *u2str(uint32_t val); +char *i2str(int32_t val); + +#endif // PROTO_H__ diff --git a/F1-nolib/MAX7219_screen/spi.c b/F1-nolib/MAX7219_screen/spi.c new file mode 100644 index 0000000..3e00187 --- /dev/null +++ b/F1-nolib/MAX7219_screen/spi.c @@ -0,0 +1,87 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "spi.h" +#include "hardware.h" + +spiStatus SPI_status = SPI_NOTREADY; + +// 16 bit SPI transfer setup +void SPI_setup(){ + // setup SPI GPIO - alternate function PP (PA4 - NSS, PA5 - SCK, PA7 - MOSI) + GPIOA->CRL |= CRL(5, CNF_AFPP|MODE_FAST) | CRL(7, CNF_AFPP|MODE_FAST); + // configure SPI (transmit only) + /* Enable the peripheral clock SPI1 */ + RCC->APB2ENR |= RCC_APB2ENR_SPI1EN; + /* Configure SPI1 in master */ + /* (1) Master selection, BR: Fpclk/16 + CPOL and CPHA at zero (rising first edge), 16 bit (DFF) */ + /* (2) TX with DMA, slave select output disabled (software managed - SPI_CR1_SSM | SPI_CR1_SSI?) */ + /* (3) Enable SPI1 */ + SPI1->CR1 = SPI_CR1_MSTR | SPI_CR1_BR_0 | SPI_CR1_BR_1 | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_DFF; /* (1) */ + SPI1->CR2 = SPI_CR2_TXDMAEN; /* (2) */ + // setup SPI1 DMA + /* Enable the peripheral clock DMA1 */ + RCC->AHBENR |= RCC_AHBENR_DMA1EN; + /* DMA1 Channel3 SPI1_TX config */ + /* (5) Peripheral address */ + /* (7) Memory increment */ + /* Memory to peripheral */ + /* 16-bit transfer (both memory & periph) */ + /* Transfer complete IRQ enable */ + DMA_SPI_Channel->CPAR = (uint32_t)&(SPI1->DR); /* (5) */ + DMA_SPI_Channel->CCR |= DMA_CCR_MINC | DMA_CCR_DIR | DMA_CCR_MSIZE_0 | DMA_CCR_PSIZE_0 | DMA_CCR_TCIE; /* (7) */ + NVIC_SetPriority(DMA1_Channel3_IRQn, 0); + NVIC_EnableIRQ(DMA1_Channel3_IRQn); + //NVIC_EnableIRQ(SPI1_IRQn); + SPI_status = SPI_READY; + SPI1->CR1 |= SPI_CR1_SPE; /* (3) */ +} + +/** + * @brief SPI_transmit - transmit data over SPI DMA + * @param buf - data to transmit + * @param len - its length + * @return 0 if all OK + */ +uint8_t SPI_transmit(const uint16_t *buf, uint8_t len){ + if(!buf || !len) return 1; // bad data format + if(SPI_status != SPI_READY) return 2; // spi not ready to transmit data + DMA_SPI_Channel->CCR &=~ DMA_CCR_EN; + DMA_SPI_Channel->CMAR = (uint32_t)buf; + DMA_SPI_Channel->CNDTR = len; + SPI_status = SPI_BUSY; + DMA_SPI_Channel->CCR |= DMA_CCR_EN; + return 0; +} + +// blocking transmission of one data portion +void SPI_blocktransmit(const uint16_t data){ + while(SPI_status == SPI_BUSY); + *(uint16_t *)&(SPI1->DR) = data; + while(!(SPI1->SR & SPI_SR_TXE)); + while(SPI1->SR & SPI_SR_BSY); +} + +// SPI DMA Tx interrupt +void dma1_channel3_isr(){ + if(DMA1->ISR & DMA_ISR_TCIF3){ + DMA1->IFCR |= DMA_IFCR_CTCIF3; // Clear TC flag + SPI_status = SPI_READY; + } +} diff --git a/F1-nolib/MAX7219_screen/spi.h b/F1-nolib/MAX7219_screen/spi.h new file mode 100644 index 0000000..684d82f --- /dev/null +++ b/F1-nolib/MAX7219_screen/spi.h @@ -0,0 +1,36 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef MAX7219_H__ +#define MAX7219_H__ + +#include "stm32f1.h" + +typedef enum{ + SPI_NOTREADY, + SPI_READY, + SPI_BUSY +} spiStatus; + +extern spiStatus SPI_status; + +void SPI_setup(); +uint8_t SPI_transmit(const uint16_t *buf, uint8_t len); +void SPI_blocktransmit(const uint16_t data); +#endif // MAX7219_H__ diff --git a/F1-nolib/MAX7219_screen/usb.c b/F1-nolib/MAX7219_screen/usb.c new file mode 100644 index 0000000..ecc6b4a --- /dev/null +++ b/F1-nolib/MAX7219_screen/usb.c @@ -0,0 +1,167 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "usb.h" +#include "usb_lib.h" + +static volatile uint8_t tx_succesfull = 1; +static volatile uint8_t rxNE = 0; + +static int sstrlen(const char *s){ + if(!s) return 0; + int l = 0; + while(*s++) ++l; + return l; +} + +// interrupt IN handler (never used?) +static void EP1_Handler(){ + uint16_t epstatus = KEEP_DTOG(USB->EPnR[1]); + if(RX_FLAG(epstatus)) epstatus = (epstatus & ~USB_EPnR_STAT_TX) ^ USB_EPnR_STAT_RX; // set valid RX + else epstatus = epstatus & ~(USB_EPnR_STAT_TX|USB_EPnR_STAT_RX); + // clear CTR + epstatus = (epstatus & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX)); + USB->EPnR[1] = epstatus; +} + +// data IN/OUT handlers +static void transmit_Handler(){ // EP3IN + tx_succesfull = 1; + uint16_t epstatus = KEEP_DTOG_STAT(USB->EPnR[3]); + // clear CTR keep DTOGs & STATs + USB->EPnR[3] = (epstatus & ~(USB_EPnR_CTR_TX)); // clear TX ctr +} + +static void receive_Handler(){ // EP2OUT + rxNE = 1; + uint16_t epstatus = KEEP_DTOG_STAT(USB->EPnR[2]); + USB->EPnR[2] = (epstatus & ~(USB_EPnR_CTR_RX)); // clear RX ctr +} + +void USB_setup(){ + NVIC_DisableIRQ(USB_LP_CAN1_RX0_IRQn); + NVIC_DisableIRQ(USB_HP_CAN1_TX_IRQn); + RCC->APB1ENR |= RCC_APB1ENR_USBEN; + USB->CNTR = USB_CNTR_FRES; // Force USB Reset + for(uint32_t ctr = 0; ctr < 72000; ++ctr) nop(); // wait >1ms + //uint32_t ctr = 0; + USB->CNTR = 0; + USB->BTABLE = 0; + USB->DADDR = 0; + USB->ISTR = 0; + USB->CNTR = USB_CNTR_RESETM | USB_CNTR_WKUPM; // allow only wakeup & reset interrupts + NVIC_EnableIRQ(USB_LP_CAN1_RX0_IRQn); +} + +static int usbwr(const char *buf, int l){ + uint32_t ctra = 1000000; + while(--ctra && tx_succesfull == 0){ + IWDG->KR = IWDG_REFRESH; + } + tx_succesfull = 0; + EP_Write(3, (uint8_t*)buf, l); + ctra = 1000000; + while(--ctra && tx_succesfull == 0){ + IWDG->KR = IWDG_REFRESH; + } + if(tx_succesfull == 0){usbON = 0; return 1;} // usb is OFF? + return 0; +} + +static char usbbuff[USB_TXBUFSZ-1]; // temporary buffer (63 - to prevent need of ZLP) +static int buflen = 0; // amount of symbols in usbbuff + +// send next up to 63 bytes of data in usbbuff +static void send_next(){ + if(!buflen || !tx_succesfull) return; + tx_succesfull = 0; + EP_Write(3, (uint8_t*)usbbuff, buflen); + buflen = 0; +} + +// unblocking sending - just fill a buffer +void USB_send(const char *buf){ + int len = sstrlen(buf); + if(!usbON || !len) return; + if(len > USB_TXBUFSZ-1 - buflen){ + usbwr(usbbuff, buflen); + buflen = 0; + } + if(len > USB_TXBUFSZ-1){ + USB_send_blk(buf, len); + return; + } + while(len--) usbbuff[buflen++] = *buf++; +} + +// blocking sending +void USB_send_blk(const char *buf, int len){ + if(!usbON || !len) return; // USB disconnected + if(buflen){ + usbwr(usbbuff, buflen); + buflen = 0; + } + int needzlp = 0; + while(len){ + if(len == USB_TXBUFSZ) needzlp = 1; + int s = (len > USB_TXBUFSZ) ? USB_TXBUFSZ : len; + if(usbwr(buf, s)) return; + len -= s; + buf += s; + } + if(needzlp){ + usbwr(NULL, 0); + } +} + +void usb_proc(){ + switch(USB_Dev.USB_Status){ + case USB_STATE_CONFIGURED: + // make new BULK endpoint + // Buffer have 1024 bytes, but last 256 we use for CAN bus (30.2 of RM: USB main features) + EP_Init(1, EP_TYPE_INTERRUPT, USB_EP1BUFSZ, 0, EP1_Handler); // IN1 - transmit + EP_Init(2, EP_TYPE_BULK, 0, USB_RXBUFSZ, receive_Handler); // OUT2 - receive data + EP_Init(3, EP_TYPE_BULK, USB_TXBUFSZ, 0, transmit_Handler); // IN3 - transmit data + USB_Dev.USB_Status = USB_STATE_CONNECTED; + break; + case USB_STATE_DEFAULT: + case USB_STATE_ADDRESSED: + if(usbON){ + usbON = 0; + } + break; + default: // USB_STATE_CONNECTED - send next data portion + if(!usbON) return; + send_next(); + } +} + +/** + * @brief USB_receive + * @param buf (i) - buffer[64] for received data + * @return amount of received bytes + */ +int USB_receive(char *buf){ + if(!usbON || !rxNE) return 0; + int sz = EP_Read(2, (uint16_t*)buf); + uint16_t epstatus = KEEP_DTOG(USB->EPnR[2]); + // keep stat_tx & set ACK rx + USB->EPnR[2] = (epstatus & ~(USB_EPnR_STAT_TX)) ^ USB_EPnR_STAT_RX; + rxNE = 0; + return sz; +} diff --git a/F1-nolib/MAX7219_screen/usb.h b/F1-nolib/MAX7219_screen/usb.h new file mode 100644 index 0000000..847df22 --- /dev/null +++ b/F1-nolib/MAX7219_screen/usb.h @@ -0,0 +1,33 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef __USB_H__ +#define __USB_H__ + +#include "hardware.h" + +#define BUFFSIZE (64) + +void USB_setup(); +void usb_proc(); +void USB_send(const char *buf); +void USB_send_blk(const char *buf, int len); +int USB_receive(char *buf); + +#endif // __USB_H__ diff --git a/F1-nolib/MAX7219_screen/usb_defs.h b/F1-nolib/MAX7219_screen/usb_defs.h new file mode 100644 index 0000000..8b88b26 --- /dev/null +++ b/F1-nolib/MAX7219_screen/usb_defs.h @@ -0,0 +1,102 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef __USB_DEFS_H__ +#define __USB_DEFS_H__ + +#include + +// max endpoints number +#define STM32ENDPOINTS 8 +/** + * Buffers size definition + **/ +#define USB_BTABLE_SIZE 512 +// first 64 bytes of USB_BTABLE are registers! +//#define USB_EP0_BASEADDR 64 +// for USB FS EP0 buffers are from 8 to 64 bytes long (64 for PL2303) +#define USB_EP0_BUFSZ 64 +// USB transmit buffer size (64 for PL2303) +#define USB_TXBUFSZ 64 +// USB receive buffer size (64 for PL2303) +#define USB_RXBUFSZ 64 +// EP1 - interrupt - buffer size +#define USB_EP1BUFSZ 8 + +#define USB_BTABLE_BASE 0x40006000 +#define USB_BASE ((uint32_t)0x40005C00) +#define USB ((USB_TypeDef *) USB_BASE) + +#ifdef USB_BTABLE +#undef USB_BTABLE +#endif +#define USB_BTABLE ((USB_BtableDef *)(USB_BTABLE_BASE)) +#define USB_ISTR_EPID 0x0000000F +#define USB_FNR_LSOF_0 0x00000800 +#define USB_FNR_lSOF_1 0x00001000 +#define USB_LPMCSR_BESL_0 0x00000010 +#define USB_LPMCSR_BESL_1 0x00000020 +#define USB_LPMCSR_BESL_2 0x00000040 +#define USB_LPMCSR_BESL_3 0x00000080 +#define USB_EPnR_CTR_RX 0x00008000 +#define USB_EPnR_DTOG_RX 0x00004000 +#define USB_EPnR_STAT_RX 0x00003000 +#define USB_EPnR_STAT_RX_0 0x00001000 +#define USB_EPnR_STAT_RX_1 0x00002000 +#define USB_EPnR_SETUP 0x00000800 +#define USB_EPnR_EP_TYPE 0x00000600 +#define USB_EPnR_EP_TYPE_0 0x00000200 +#define USB_EPnR_EP_TYPE_1 0x00000400 +#define USB_EPnR_EP_KIND 0x00000100 +#define USB_EPnR_CTR_TX 0x00000080 +#define USB_EPnR_DTOG_TX 0x00000040 +#define USB_EPnR_STAT_TX 0x00000030 +#define USB_EPnR_STAT_TX_0 0x00000010 +#define USB_EPnR_STAT_TX_1 0x00000020 +#define USB_EPnR_EA 0x0000000F +#define USB_COUNTn_RX_BLSIZE 0x00008000 +#define USB_COUNTn_NUM_BLOCK 0x00007C00 +#define USB_COUNTn_RX 0x0000003F + +#ifdef USB_TypeDef +#define USB_TypeDef USB_TypeDef_custom +#endif + +typedef struct { + __IO uint32_t EPnR[STM32ENDPOINTS]; + __IO uint32_t RESERVED[STM32ENDPOINTS]; + __IO uint32_t CNTR; + __IO uint32_t ISTR; + __IO uint32_t FNR; + __IO uint32_t DADDR; + __IO uint32_t BTABLE; +} USB_TypeDef; + +typedef struct{ + __IO uint32_t USB_ADDR_TX; + __IO uint32_t USB_COUNT_TX; + __IO uint32_t USB_ADDR_RX; + __IO uint32_t USB_COUNT_RX; +} USB_EPDATA_TypeDef; + +typedef struct{ + __IO USB_EPDATA_TypeDef EP[STM32ENDPOINTS]; +} USB_BtableDef; + +#endif // __USB_DEFS_H__ diff --git a/F1-nolib/MAX7219_screen/usb_lib.c b/F1-nolib/MAX7219_screen/usb_lib.c new file mode 100644 index 0000000..eb3acf5 --- /dev/null +++ b/F1-nolib/MAX7219_screen/usb_lib.c @@ -0,0 +1,476 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include "usb_lib.h" + +ep_t endpoints[STM32ENDPOINTS]; + +usb_dev_t USB_Dev; +static usb_LineCoding lineCoding = {115200, 0, 0, 8}; +static config_pack_t setup_packet; +static uint8_t ep0databuf[EP0DATABUF_SIZE]; +static uint8_t ep0dbuflen = 0; + +usb_LineCoding getLineCoding(){return lineCoding;} + +uint8_t usbON = 0; // device disconnected from terminal + +// definition of parts common for USB_DeviceDescriptor & USB_DeviceQualifierDescriptor +#define bcdUSB_L 0x10 +#define bcdUSB_H 0x01 +#define bDeviceClass 0 +#define bDeviceSubClass 0 +#define bDeviceProtocol 0 +#define bNumConfigurations 1 + +static const uint8_t USB_DeviceDescriptor[] = { + 18, // bLength + 0x01, // bDescriptorType - Device descriptor + bcdUSB_L, // bcdUSB_L - 1.10 + bcdUSB_H, // bcdUSB_H + bDeviceClass, // bDeviceClass - USB_COMM + bDeviceSubClass, // bDeviceSubClass + bDeviceProtocol, // bDeviceProtocol + USB_EP0_BUFSZ, // bMaxPacketSize + 0x7b, // idVendor_L PL2303: VID=0x067b, PID=0x2303 + 0x06, // idVendor_H + 0x03, // idProduct_L + 0x23, // idProduct_H + 0x00, // bcdDevice_Ver_L + 0x03, // bcdDevice_Ver_H + 0x01, // iManufacturer + 0x02, // iProduct + 0x00, // iSerialNumber + bNumConfigurations // bNumConfigurations +}; + +static const uint8_t USB_DeviceQualifierDescriptor[] = { + 10, //bLength + 0x06, // bDescriptorType - Device qualifier + bcdUSB_L, // bcdUSB_L + bcdUSB_H, // bcdUSB_H + bDeviceClass, // bDeviceClass + bDeviceSubClass, // bDeviceSubClass + bDeviceProtocol, // bDeviceProtocol + USB_EP0_BUFSZ, // bMaxPacketSize0 + bNumConfigurations, // bNumConfigurations + 0x00 // Reserved +}; + +static const uint8_t USB_ConfigDescriptor[] = { + /*Configuration Descriptor*/ + 0x09, /* bLength: Configuration Descriptor size */ + 0x02, /* bDescriptorType: Configuration */ + 39, /* wTotalLength:no of returned bytes */ + 0x00, + 0x01, /* bNumInterfaces: 1 interface */ + 0x01, /* bConfigurationValue: Configuration value */ + 0x00, /* iConfiguration: Index of string descriptor describing the configuration */ + 0xa0, /* bmAttributes - Bus powered, Remote wakeup */ + 0x32, /* MaxPower 100 mA */ + + /*---------------------------------------------------------------------------*/ + + /*Interface Descriptor */ + 0x09, /* bLength: Interface Descriptor size */ + 0x04, /* bDescriptorType: Interface */ + 0x00, /* bInterfaceNumber: Number of Interface */ + 0x00, /* bAlternateSetting: Alternate setting */ + 0x03, /* bNumEndpoints: 3 endpoints used */ + 0xff, /* bInterfaceClass */ + 0x00, /* bInterfaceSubClass */ + 0x00, /* bInterfaceProtocol */ + 0x00, /* iInterface: */ +/////////////////////////////////////////////////// + /*Endpoint 1 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x81, /* bEndpointAddress IN1 */ + 0x03, /* bmAttributes: Interrupt */ + 0x0a, /* wMaxPacketSize LO: */ + 0x00, /* wMaxPacketSize HI: */ + 0x01, /* bInterval: */ + + /*Endpoint OUT2 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x02, /* bEndpointAddress: OUT2 */ + 0x02, /* bmAttributes: Bulk */ + (USB_RXBUFSZ & 0xff), /* wMaxPacketSize: 64 */ + (USB_RXBUFSZ >> 8), + 0x00, /* bInterval: ignore for Bulk transfer */ + + /*Endpoint IN3 Descriptor*/ + 0x07, /* bLength: Endpoint Descriptor size */ + 0x05, /* bDescriptorType: Endpoint */ + 0x83, /* bEndpointAddress IN3 */ + 0x02, /* bmAttributes: Bulk */ + (USB_TXBUFSZ & 0xff), /* wMaxPacketSize: 64 */ + (USB_TXBUFSZ >> 8), + 0x00, /* bInterval: ignore for Bulk transfer */ +}; + +_USB_LANG_ID_(USB_StringLangDescriptor, LANG_US); +// these descriptors are not used in PL2303 emulator! +_USB_STRING_(USB_StringSerialDescriptor, u"0"); +_USB_STRING_(USB_StringManufacturingDescriptor, u"Prolific Technology Inc."); +_USB_STRING_(USB_StringProdDescriptor, u"USB-Serial Controller"); + +/* + * default handlers + */ +// SET_LINE_CODING +void WEAK linecoding_handler(usb_LineCoding __attribute__((unused)) *lc){ +} + +// SET_CONTROL_LINE_STATE +void WEAK clstate_handler(uint16_t __attribute__((unused)) val){ +} + +// SEND_BREAK +void WEAK break_handler(){ +} + +// handler of vendor requests +void WEAK vendor_handler(config_pack_t *packet){ + if(packet->bmRequestType & 0x80){ // read + uint8_t c; + switch(packet->wValue){ + case 0x8484: + c = 2; + break; + case 0x0080: + c = 1; + break; + case 0x8686: + c = 0xaa; + break; + default: + c = 0; + } + EP_WriteIRQ(0, &c, 1); + }else{ // write ZLP + EP_WriteIRQ(0, (uint8_t *)0, 0); + } +} + +static void wr0(const uint8_t *buf, uint16_t size){ + if(setup_packet.wLength < size) size = setup_packet.wLength; // shortened request + if(size < endpoints[0].txbufsz){ + EP_WriteIRQ(0, buf, size); + return; + } + while(size){ + uint16_t l = size; + if(l > endpoints[0].txbufsz) l = endpoints[0].txbufsz; + EP_WriteIRQ(0, buf, l); + buf += l; + size -= l; + uint8_t needzlp = (l == endpoints[0].txbufsz) ? 1 : 0; + if(size || needzlp){ // send last data buffer + uint16_t status = KEEP_DTOG(USB->EPnR[0]); + // keep DTOGs, clear CTR_RX,TX, set TX VALID, leave stat_Rx + USB->EPnR[0] = (status & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX|USB_EPnR_STAT_RX)) + ^ USB_EPnR_STAT_TX; + uint32_t ctr = 1000000; + while(--ctr && (USB->ISTR & USB_ISTR_CTR) == 0){IWDG->KR = IWDG_REFRESH;}; + if((USB->ISTR & USB_ISTR_CTR) == 0){ + return; + } + if(needzlp) EP_WriteIRQ(0, (uint8_t*)0, 0); + } + } +} + +static inline void get_descriptor(){ + switch(setup_packet.wValue){ + case DEVICE_DESCRIPTOR: + wr0(USB_DeviceDescriptor, sizeof(USB_DeviceDescriptor)); + break; + case CONFIGURATION_DESCRIPTOR: + wr0(USB_ConfigDescriptor, sizeof(USB_ConfigDescriptor)); + break; + case STRING_LANG_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringLangDescriptor, STRING_LANG_DESCRIPTOR_SIZE_BYTE); + break; + case STRING_MAN_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringManufacturingDescriptor, USB_StringManufacturingDescriptor.bLength); + break; + case STRING_PROD_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringProdDescriptor, USB_StringProdDescriptor.bLength); + break; + case STRING_SN_DESCRIPTOR: + wr0((const uint8_t *)&USB_StringSerialDescriptor, USB_StringSerialDescriptor.bLength); + break; + case DEVICE_QUALIFIER_DESCRIPTOR: + wr0(USB_DeviceQualifierDescriptor, USB_DeviceQualifierDescriptor[0]); + break; + default: + break; + } +} + +static uint8_t configuration = 0; // reply for GET_CONFIGURATION (==1 if configured) +static inline void std_d2h_req(){ + uint16_t status = 0; // bus powered + switch(setup_packet.bRequest){ + case GET_DESCRIPTOR: + get_descriptor(); + break; + case GET_STATUS: + EP_WriteIRQ(0, (uint8_t *)&status, 2); // send status: Bus Powered + break; + case GET_CONFIGURATION: + EP_WriteIRQ(0, &configuration, 1); + break; + default: + break; + } +} + +static inline void std_h2d_req(){ + switch(setup_packet.bRequest){ + case SET_ADDRESS: + // new address will be assigned later - after acknowlegement or request to host + USB_Dev.USB_Addr = setup_packet.wValue; + break; + case SET_CONFIGURATION: + // Now device configured + USB_Dev.USB_Status = USB_STATE_CONFIGURED; + configuration = setup_packet.wValue; + break; + default: + break; + } +} + +/* +bmRequestType: 76543210 +7 direction: 0 - host->device, 1 - device->host +65 type: 0 - standard, 1 - class, 2 - vendor +4..0 getter: 0 - device, 1 - interface, 2 - endpoint, 3 - other +*/ +/** + * Endpoint0 (control) handler + */ +static void EP0_Handler(){ + uint16_t epstatus = USB->EPnR[0]; // EP0R on input -> return this value after modifications + uint8_t reqtype = setup_packet.bmRequestType & 0x7f; + uint8_t dev2host = (setup_packet.bmRequestType & 0x80) ? 1 : 0; + int rxflag = RX_FLAG(epstatus); + if(rxflag && SETUP_FLAG(epstatus)){ + switch(reqtype){ + case STANDARD_DEVICE_REQUEST_TYPE: // standard device request + if(dev2host){ + std_d2h_req(); + }else{ + std_h2d_req(); + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + break; + case STANDARD_ENDPOINT_REQUEST_TYPE: // standard endpoint request + if(setup_packet.bRequest == CLEAR_FEATURE){ + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + break; + case VENDOR_REQUEST_TYPE: + vendor_handler(&setup_packet); + break; + case CONTROL_REQUEST_TYPE: + switch(setup_packet.bRequest){ + case GET_LINE_CODING: + EP_WriteIRQ(0, (uint8_t*)&lineCoding, sizeof(lineCoding)); + break; + case SET_LINE_CODING: // omit this for next stage, when data will come + break; + case SET_CONTROL_LINE_STATE: + usbON = 1; + clstate_handler(setup_packet.wValue); + break; + case SEND_BREAK: + usbON = 0; + break_handler(); + break; + default: + break; + } + if(setup_packet.bRequest != GET_LINE_CODING) EP_WriteIRQ(0, (uint8_t *)0, 0); // write acknowledgement + break; + default: + EP_WriteIRQ(0, (uint8_t *)0, 0); + } + }else if(rxflag){ // got data over EP0 or host acknowlegement + if(endpoints[0].rx_cnt){ + if(setup_packet.bRequest == SET_LINE_CODING){ + linecoding_handler((usb_LineCoding*)ep0databuf); + } + } + } else if(TX_FLAG(epstatus)){ // package transmitted + // now we can change address after enumeration + if ((USB->DADDR & USB_DADDR_ADD) != USB_Dev.USB_Addr){ + USB->DADDR = USB_DADDR_EF | USB_Dev.USB_Addr; + // change state to ADRESSED + USB_Dev.USB_Status = USB_STATE_ADDRESSED; + } + } + epstatus = KEEP_DTOG(USB->EPnR[0]); + if(rxflag) epstatus ^= USB_EPnR_STAT_TX; // start ZLP/data transmission + else epstatus &= ~USB_EPnR_STAT_TX; // or leave unchanged + // keep DTOGs, clear CTR_RX,TX, set RX VALID + USB->EPnR[0] = (epstatus & ~(USB_EPnR_CTR_RX|USB_EPnR_CTR_TX)) ^ USB_EPnR_STAT_RX; +} + +static uint16_t lastaddr = LASTADDR_DEFAULT; +/** + * Endpoint initialisation + * @param number - EP num (0...7) + * @param type - EP type (EP_TYPE_BULK, EP_TYPE_CONTROL, EP_TYPE_ISO, EP_TYPE_INTERRUPT) + * @param txsz - transmission buffer size @ USB/CAN buffer + * @param rxsz - reception buffer size @ USB/CAN buffer + * @param uint16_t (*func)(ep_t *ep) - EP handler function + * @return 0 if all OK + */ +int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)(ep_t ep)){ + if(number >= STM32ENDPOINTS) return 4; // out of configured amount + if(txsz > USB_BTABLE_SIZE || rxsz > USB_BTABLE_SIZE) return 1; // buffer too large + if(lastaddr + txsz + rxsz >= USB_BTABLE_SIZE) return 2; // out of btable + USB->EPnR[number] = (type << 9) | (number & USB_EPnR_EA); + USB->EPnR[number] ^= USB_EPnR_STAT_RX | USB_EPnR_STAT_TX_1; + if(rxsz & 1 || rxsz > 512) return 3; // wrong rx buffer size + uint16_t countrx = 0; + if(rxsz < 64) countrx = rxsz / 2; + else{ + if(rxsz & 0x1f) return 3; // should be multiple of 32 + countrx = 31 + rxsz / 32; + } + USB_BTABLE->EP[number].USB_ADDR_TX = lastaddr; + endpoints[number].tx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2); + endpoints[number].txbufsz = txsz; + lastaddr += txsz; + USB_BTABLE->EP[number].USB_COUNT_TX = 0; + USB_BTABLE->EP[number].USB_ADDR_RX = lastaddr; + endpoints[number].rx_buf = (uint16_t *)(USB_BTABLE_BASE + lastaddr*2); + lastaddr += rxsz; + USB_BTABLE->EP[number].USB_COUNT_RX = countrx << 10; + endpoints[number].func = func; + return 0; +} + +// standard IRQ handler +void usb_lp_can_rx0_isr(){ + if(USB->ISTR & USB_ISTR_RESET){ + usbON = 0; + // Reinit registers + USB->CNTR = USB_CNTR_RESETM | USB_CNTR_CTRM | USB_CNTR_SUSPM | USB_CNTR_WKUPM; + USB->ISTR = 0; + // Endpoint 0 - CONTROL + // ON USB LS size of EP0 may be 8 bytes, but on FS it should be 64 bytes! + lastaddr = LASTADDR_DEFAULT; + // clear address, leave only enable bit + USB->DADDR = USB_DADDR_EF; + USB_Dev.USB_Status = USB_STATE_DEFAULT; + USB->ISTR = ~USB_ISTR_RESET; + if(EP_Init(0, EP_TYPE_CONTROL, USB_EP0_BUFSZ, USB_EP0_BUFSZ, EP0_Handler)){ + return; + } + } + if(USB->ISTR & USB_ISTR_CTR){ + // EP number + uint8_t n = USB->ISTR & USB_ISTR_EPID; + // copy status register + uint16_t epstatus = USB->EPnR[n]; + // copy received bytes amount + endpoints[n].rx_cnt = USB_BTABLE->EP[n].USB_COUNT_RX & 0x3FF; // low 10 bits is counter + // check direction + if(USB->ISTR & USB_ISTR_DIR){ // OUT interrupt - receive data, CTR_RX==1 (if CTR_TX == 1 - two pending transactions: receive following by transmit) + if(n == 0){ // control endpoint + if(epstatus & USB_EPnR_SETUP){ // setup packet -> copy data to conf_pack + EP_Read(0, (uint16_t*)&setup_packet); + ep0dbuflen = 0; + // interrupt handler will be called later + }else if(epstatus & USB_EPnR_CTR_RX){ // data packet -> push received data to ep0databuf + ep0dbuflen = endpoints[0].rx_cnt; + EP_Read(0, (uint16_t*)&ep0databuf); + } + } + } + // call EP handler + if(endpoints[n].func) endpoints[n].func(endpoints[n]); + } + if(USB->ISTR & USB_ISTR_SUSP){ // suspend -> still no connection, may sleep + usbON = 0; + USB->CNTR |= USB_CNTR_FSUSP | USB_CNTR_LP_MODE; + USB->ISTR = ~USB_ISTR_SUSP; + } + if(USB->ISTR & USB_ISTR_WKUP){ // wakeup + USB->CNTR &= ~(USB_CNTR_FSUSP | USB_CNTR_LP_MODE); // clear suspend flags + USB->ISTR = ~USB_ISTR_WKUP; + } +} + +/** + * Write data to EP buffer (called from IRQ handler) + * @param number - EP number + * @param *buf - array with data + * @param size - its size + */ +void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size){ + uint8_t i; + if(size > endpoints[number].txbufsz) size = endpoints[number].txbufsz; + uint16_t N2 = (size + 1) >> 1; + // the buffer is 16-bit, so we should copy data as it would be uint16_t + uint16_t *buf16 = (uint16_t *)buf; + uint32_t *out = (uint32_t *)endpoints[number].tx_buf; + for(i = 0; i < N2; ++i, ++out){ + *out = buf16[i]; + } + USB_BTABLE->EP[number].USB_COUNT_TX = size; +} + +/** + * Write data to EP buffer (called outside IRQ handler) + * @param number - EP number + * @param *buf - array with data + * @param size - its size + */ +void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size){ + EP_WriteIRQ(number, buf, size); + uint16_t status = KEEP_DTOG(USB->EPnR[number]); + // keep DTOGs, clear CTR_TX & set TX VALID to start transmission + USB->EPnR[number] = (status & ~(USB_EPnR_CTR_TX)) ^ USB_EPnR_STAT_TX; +} + +/* + * Copy data from EP buffer into user buffer area + * @param *buf - user array for data + * @return amount of data read + */ +int EP_Read(uint8_t number, uint16_t *buf){ + int sz = endpoints[number].rx_cnt; + if(!sz) return 0; + endpoints[number].rx_cnt = 0; + int n = (sz + 1) >> 1; + uint32_t *in = (uint32_t *)endpoints[number].rx_buf; + if(n){ + for(int i = 0; i < n; ++i, ++in) + buf[i] = *(uint16_t*)in; + } + return sz; +} + diff --git a/F1-nolib/MAX7219_screen/usb_lib.h b/F1-nolib/MAX7219_screen/usb_lib.h new file mode 100644 index 0000000..7ec91a9 --- /dev/null +++ b/F1-nolib/MAX7219_screen/usb_lib.h @@ -0,0 +1,184 @@ +/* + * This file is part of the MAX7219 project. + * Copyright 2021 Edward V. Emelianov . + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once +#ifndef __USB_LIB_H__ +#define __USB_LIB_H__ + +#include +#include "usb_defs.h" + +#define EP0DATABUF_SIZE (64) +#define LASTADDR_DEFAULT (STM32ENDPOINTS * 8) + +// bmRequestType & 0x7f +#define STANDARD_DEVICE_REQUEST_TYPE 0 +#define STANDARD_ENDPOINT_REQUEST_TYPE 2 +#define VENDOR_REQUEST_TYPE 0x40 +#define CONTROL_REQUEST_TYPE 0x21 +// bRequest, standard; for bmRequestType == 0x80 +#define GET_STATUS 0x00 +#define GET_DESCRIPTOR 0x06 +#define GET_CONFIGURATION 0x08 +// for bmRequestType == 0 +#define CLEAR_FEATURE 0x01 +#define SET_FEATURE 0x03 // unused +#define SET_ADDRESS 0x05 +#define SET_DESCRIPTOR 0x07 // unused +#define SET_CONFIGURATION 0x09 +// for bmRequestType == 0x81, 1 or 0xB2 +#define GET_INTERFACE 0x0A // unused +#define SET_INTERFACE 0x0B // unused +#define SYNC_FRAME 0x0C // unused +#define VENDOR_REQUEST 0x01 // unused + +// Class-Specific Control Requests +#define SEND_ENCAPSULATED_COMMAND 0x00 // unused +#define GET_ENCAPSULATED_RESPONSE 0x01 // unused +#define SET_COMM_FEATURE 0x02 // unused +#define GET_COMM_FEATURE 0x03 // unused +#define CLEAR_COMM_FEATURE 0x04 // unused +#define SET_LINE_CODING 0x20 +#define GET_LINE_CODING 0x21 +#define SET_CONTROL_LINE_STATE 0x22 +#define SEND_BREAK 0x23 + +// control line states +#define CONTROL_DTR 0x01 +#define CONTROL_RTS 0x02 + +// wValue +#define DEVICE_DESCRIPTOR 0x100 +#define CONFIGURATION_DESCRIPTOR 0x200 +#define STRING_LANG_DESCRIPTOR 0x300 +#define STRING_MAN_DESCRIPTOR 0x301 +#define STRING_PROD_DESCRIPTOR 0x302 +#define STRING_SN_DESCRIPTOR 0x303 +#define DEVICE_QUALIFIER_DESCRIPTOR 0x600 + +#define RX_FLAG(epstat) (epstat & USB_EPnR_CTR_RX) +#define TX_FLAG(epstat) (epstat & USB_EPnR_CTR_TX) +#define SETUP_FLAG(epstat) (epstat & USB_EPnR_SETUP) + +// EPnR bits manipulation +#define KEEP_DTOG_STAT(EPnR) (EPnR & ~(USB_EPnR_STAT_RX|USB_EPnR_STAT_TX|USB_EPnR_DTOG_RX|USB_EPnR_DTOG_TX)) +#define KEEP_DTOG(EPnR) (EPnR & ~(USB_EPnR_DTOG_RX|USB_EPnR_DTOG_TX)) + +// USB state: uninitialized, addressed, ready for use +typedef enum{ + USB_STATE_DEFAULT, + USB_STATE_ADDRESSED, + USB_STATE_CONFIGURED, + USB_STATE_CONNECTED +} USB_state; + +// EP types +#define EP_TYPE_BULK 0x00 +#define EP_TYPE_CONTROL 0x01 +#define EP_TYPE_ISO 0x02 +#define EP_TYPE_INTERRUPT 0x03 + +#define LANG_US (uint16_t)0x0409 + +#define _USB_STRING_(name, str) \ +static const struct name \ +{ \ + uint8_t bLength; \ + uint8_t bDescriptorType; \ + uint16_t bString[(sizeof(str) - 2) / 2]; \ + \ +} \ +name = {sizeof(name), 0x03, str} + +#define _USB_LANG_ID_(name, lng_id) \ + \ +static const struct name \ +{ \ + uint8_t bLength; \ + uint8_t bDescriptorType; \ + uint16_t bString; \ + \ +} \ +name = {0x04, 0x03, lng_id} +#define STRING_LANG_DESCRIPTOR_SIZE_BYTE (4) + +// EP0 configuration packet +typedef struct { + uint8_t bmRequestType; + uint8_t bRequest; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; +} config_pack_t; + +// endpoints state +typedef struct{ + uint16_t *tx_buf; // transmission buffer address + uint16_t txbufsz; // transmission buffer size + uint16_t *rx_buf; // reception buffer address + void (*func)(); // endpoint action function + unsigned rx_cnt : 10; // received data counter +} ep_t; + +// USB status & its address +typedef struct { + uint8_t USB_Status; + uint16_t USB_Addr; +}usb_dev_t; + +typedef struct { + uint32_t dwDTERate; + uint8_t bCharFormat; + #define USB_CDC_1_STOP_BITS 0 + #define USB_CDC_1_5_STOP_BITS 1 + #define USB_CDC_2_STOP_BITS 2 + uint8_t bParityType; + #define USB_CDC_NO_PARITY 0 + #define USB_CDC_ODD_PARITY 1 + #define USB_CDC_EVEN_PARITY 2 + #define USB_CDC_MARK_PARITY 3 + #define USB_CDC_SPACE_PARITY 4 + uint8_t bDataBits; +} __attribute__ ((packed)) usb_LineCoding; + +typedef struct { + uint8_t bmRequestType; + uint8_t bNotificationType; + uint16_t wValue; + uint16_t wIndex; + uint16_t wLength; +} __attribute__ ((packed)) usb_cdc_notification; + +extern ep_t endpoints[]; +extern usb_dev_t USB_Dev; +extern uint8_t usbON; + +void USB_Init(); +void USB_ResetState(); +int EP_Init(uint8_t number, uint8_t type, uint16_t txsz, uint16_t rxsz, void (*func)()); +void EP_WriteIRQ(uint8_t number, const uint8_t *buf, uint16_t size); +void EP_Write(uint8_t number, const uint8_t *buf, uint16_t size); +int EP_Read(uint8_t number, uint16_t *buf); +usb_LineCoding getLineCoding(); + +void linecoding_handler(usb_LineCoding *lc); +void clstate_handler(uint16_t val); +void break_handler(); +void vendor_handler(config_pack_t *packet); + +#endif // __USB_LIB_H__