josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: get usb_serial.c in. 

Once more just made sure it doesn't accidentially slip in without
giving the user a warning.
This commit is contained in:
Markus Hitter 2015-08-10 22:01:14 +02:00
parent fb317fef08
commit f8230d6565
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile-ARM
View File

@ -101,9 +101,8 @@ SOURCES = mendel.c cpu.c serial.c sermsg.c sersendf.c delay.c
SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c SOURCES += gcode_parse.c gcode_process.c pinio.c timer.c clock.c
SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c SOURCES += dda_queue.c dda_maths.c dda_kinematics.c dda.c dda_lookahead.c
SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c SOURCES += analog.c temp.c heater.c home.c debug.c crc.c pff.c pff_diskio.c
SOURCES += spi.c intercom.c graycode.c SOURCES += spi.c intercom.c graycode.c usb_serial.c
# Sources left: # Sources left:
# usb_serial.c
# watchdog.c # watchdog.c
ifeq ($(MCU), lpc1114) ifeq ($(MCU), lpc1114)

9
usb_serial.h
View File

@ -3,6 +3,13 @@
#include <stdint.h> #include <stdint.h>
/**
Test configuration.
*/
#ifdef __ARMEL__
#error Direct USB connection (USB_SERIAL) not yet supported on ARM.
#endif
// setup // setup
void usb_init(void); // initialize everything void usb_init(void); // initialize everything
uint8_t usb_configured(void); // is the USB port configured uint8_t usb_configured(void); // is the USB port configured
@ -79,7 +86,7 @@ int8_t usb_serial_set_control(uint8_t signals); // set DSR, DCD, RI, etc
#define MSB(n) ((n >> 8) & 255) #define MSB(n) ((n >> 8) & 255)
#if defined(__AVR_AT90USB162__) #if defined(__AVR_AT90USB162__)
#define HW_CONFIG() #define HW_CONFIG()
#define PLL_CONFIG() (PLLCSR = ((1<<PLLE)|(1<<PLLP0))) #define PLL_CONFIG() (PLLCSR = ((1<<PLLE)|(1<<PLLP0)))
#define USB_CONFIG() (USBCON = (1<<USBE)) #define USB_CONFIG() (USBCON = (1<<USBE))
#define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK))) #define USB_FREEZE() (USBCON = ((1<<USBE)|(1<<FRZCLK)))