Skip to content

Commit

Permalink
add: TinyUSB demo setup
Browse files Browse the repository at this point in the history
  • Loading branch information
luftaquila committed Aug 5, 2024
1 parent 169efed commit d0c5bdb
Show file tree
Hide file tree
Showing 9 changed files with 736 additions and 10 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/build-firmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ jobs:
curl -L $url | tar -xJf - -C toolchain
mv toolchain/`ls toolchain` toolchain/arm-none-eabi
- name: load tinyusb
run: git submodule update

- name: build firmware
run: |
cd device/firmware
Expand All @@ -36,4 +39,4 @@ jobs:
- uses: actions/upload-artifact@v4
with:
name: firmware
path: device/firmware/build/firmware.*
path: device/firmware/build/firmware.*
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "device/firmware/tinyusb"]
path = device/firmware/tinyusb
url = https://github.com/hathach/tinyusb.git
6 changes: 2 additions & 4 deletions device/firmware/Core/Inc/energymeter.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
#include <stdio.h>
#include <string.h>

#include "usbd_cdc_if.h"

/******************************************************************************
* basic definitions
*****************************************************************************/
Expand Down Expand Up @@ -168,11 +166,11 @@ typedef enum {
* USB CDC transmit macro
*****************************************************************************/
#define USB_Transmit(buf, len) \
{ \
/*{ \
do { \
usb_ret = CDC_Transmit_FS(buf, len); \
} while (usb_ret == USBD_BUSY); \
}
}*/

/******************************************************************************
* debug configuration
Expand Down
114 changes: 114 additions & 0 deletions device/firmware/Core/Inc/tusb_config.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2019 Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
*/

#ifndef _TUSB_CONFIG_H_
#define _TUSB_CONFIG_H_

#ifdef __cplusplus
extern "C" {
#endif

//--------------------------------------------------------------------+
// Board Specific Configuration
//--------------------------------------------------------------------+

// RHPort number used for device can be defined by board.mk, default to port 0
#ifndef BOARD_TUD_RHPORT
#define BOARD_TUD_RHPORT 0
#endif

// RHPort max operational speed can defined by board.mk
#ifndef BOARD_TUD_MAX_SPEED
#define BOARD_TUD_MAX_SPEED OPT_MODE_DEFAULT_SPEED
#endif

//--------------------------------------------------------------------
// Common Configuration
//--------------------------------------------------------------------

// defined by compiler flags for flexibility
#ifndef CFG_TUSB_MCU
#define CFG_TUSB_MCU OPT_MCU_STM32F1
#endif

#ifndef CFG_TUSB_OS
#define CFG_TUSB_OS OPT_OS_NONE
#endif

#ifndef CFG_TUSB_DEBUG
#define CFG_TUSB_DEBUG 0
#endif

// Enable Device stack
#define CFG_TUD_ENABLED 1

// Default is max speed that hardware controller could support with on-chip PHY
#define CFG_TUD_MAX_SPEED BOARD_TUD_MAX_SPEED

/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
* Tinyusb use follows macros to declare transferring memory so that they can be put
* into those specific section.
* e.g
* - CFG_TUSB_MEM SECTION : __attribute__ (( section(".usb_ram") ))
* - CFG_TUSB_MEM_ALIGN : __attribute__ ((aligned(4)))
*/
#ifndef CFG_TUSB_MEM_SECTION
#define CFG_TUSB_MEM_SECTION
#endif

#ifndef CFG_TUSB_MEM_ALIGN
#define CFG_TUSB_MEM_ALIGN __attribute__((aligned(4)))
#endif

//--------------------------------------------------------------------
// DEVICE CONFIGURATION
//--------------------------------------------------------------------

#ifndef CFG_TUD_ENDPOINT0_SIZE
#define CFG_TUD_ENDPOINT0_SIZE 64
#endif

//------------- CLASS -------------//
#define CFG_TUD_CDC 1
#define CFG_TUD_MSC 1
#define CFG_TUD_HID 0
#define CFG_TUD_MIDI 0
#define CFG_TUD_VENDOR 0

// CDC FIFO size of TX and RX
#define CFG_TUD_CDC_RX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)
#define CFG_TUD_CDC_TX_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)

// CDC Endpoint transfer buffer size, more is faster
#define CFG_TUD_CDC_EP_BUFSIZE (TUD_OPT_HIGH_SPEED ? 512 : 64)

// MSC Buffer size of Device Mass storage
#define CFG_TUD_MSC_EP_BUFSIZE 512

#ifdef __cplusplus
}
#endif

#endif /* _TUSB_CONFIG_H_ */
17 changes: 14 additions & 3 deletions device/firmware/Core/Src/energymeter_usb.c
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
#include <stdio.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>

#include "ff.h"
#include "usbd_cdc_if.h"
#include "tusb.h"

#include "energymeter.h"
#include "energymeter_usb.h"

#define APP_TX_DATA_SIZE 1024
#define APP_RX_DATA_SIZE 1024

/******************************************************************************
* global variables
*****************************************************************************/
/* USB CDC receive flag and buffer */
uint32_t usb_flag = FALSE;
extern uint8_t UserRxBufferFS[];
extern uint8_t UserTxBufferFS[];
// extern uint8_t UserRxBufferFS[];
// extern uint8_t UserTxBufferFS[];
uint8_t UserRxBufferFS[APP_RX_DATA_SIZE];
uint8_t UserTxBufferFS[APP_TX_DATA_SIZE];
uint8_t UserTxBufferFS_2[APP_TX_DATA_SIZE];

/* USB CDC command from the host system */
Expand Down Expand Up @@ -79,6 +85,9 @@ void mode_usb(void) {
uint32_t tick = HAL_GetTick();
HAL_GPIO_TogglePin(LED_STATUS_GPIO_Port, LED_STATUS_Pin);

// TinyUSB init
tusb_init();

// we don't need to be super fast here.
// let's just play with strings and busy wait led blink
while (1) {
Expand Down Expand Up @@ -137,6 +146,8 @@ void mode_usb(void) {

usb_flag = FALSE;
}

tud_task();
}

/******************************************************************************
Expand Down
Loading

0 comments on commit d0c5bdb

Please sign in to comment.