Commit 4bd44139 authored by Dean Camera's avatar Dean Camera
Browse files

Move TWI.c driver into the straight LUFA/Drivers/Peripheral/ directory.

Fix TemperatureDataLogger and Webserver project builds.
parent db420853
This diff is collapsed.
......@@ -5,7 +5,7 @@
www.fourwalledcubicle.com
*/
#include "../TWI.h"
#include "TWI.h"
bool TWI_StartTransmission(uint8_t SlaveAddress)
{
......
......@@ -41,7 +41,7 @@
*
* \section Sec_Dependencies Module Source Dependencies
* The following files must be built with any user project that uses this module:
* - LUFA/Drivers/Peripheral/AVRU4U6U7/TWI.c (for U4, U6 and U7 AVR models)
* - LUFA/Drivers/Peripheral/TWI.c
*
* \section Module Description
* Master Mode Hardware TWI driver. This module provides an easy to use driver for the hardware
......
......@@ -132,6 +132,7 @@ SRC = $(TARGET).c \
Lib/FATFs/ff.c \
Lib/DS1307.c \
$(LUFA_PATH)/LUFA/Drivers/Board/Temperature.c \
$(LUFA_PATH)/LUFA/Drivers/Peripheral/TWI.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/DevChapter9.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Endpoint.c \
$(LUFA_PATH)/LUFA/Drivers/USB/LowLevel/Host.c \
......
......@@ -245,9 +245,9 @@ void SetupHardware(void)
/* uIP Stack Initialization */
uip_init();
uip_ipaddr_t IPAddress, Netmask, GatewayIPAddress;
uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS);
uip_ipaddr(&Netmask, DEVICE_NETMASK);
uip_ipaddr(&GatewayIPAddress, );
uip_ipaddr(&IPAddress, DEVICE_IP_ADDRESS[0], DEVICE_IP_ADDRESS[1], DEVICE_IP_ADDRESS[2], DEVICE_IP_ADDRESS[3]);
uip_ipaddr(&Netmask, DEVICE_NETMASK[0], DEVICE_NETMASK[1], DEVICE_NETMASK[2], DEVICE_NETMASK[3]);
uip_ipaddr(&GatewayIPAddress, DEVICE_GATEWAY[0], DEVICE_GATEWAY[1], DEVICE_GATEWAY[2], DEVICE_GATEWAY[3]);
uip_sethostaddr(&IPAddress);
uip_setnetmask(&Netmask);
uip_setdraddr(&GatewayIPAddress);
......
......@@ -56,13 +56,13 @@
/* Macros: */
/** IP address that the webserver should use once connected to a RNDIS device. */
#define DEVICE_IP_ADDRESS 192, 168, 1, 10
#define DEVICE_IP_ADDRESS (uint8_t[]){192, 168, 1, 10}
/** Netmask that the webserver should once connected to a RNDIS device. */
#define DEVICE_NETMASK 255, 255, 255, 0
#define DEVICE_NETMASK (uint8_t[]){255, 255, 255, 0}
/** IP address of the default gateway the webserver should use when routing outside the local subnet. */
#define DEVICE_GATEWAY 192, 168, 1, 1
#define DEVICE_GATEWAY (uint8_t[]){192, 168, 1, 1}
/** LED mask for the library LED driver, to indicate that the USB interface is not ready. */
#define LEDMASK_USB_NOTREADY LEDS_LED1
......
......@@ -112,7 +112,7 @@ OBJDIR = .
# Path to the LUFA library
LUFA_PATH = ../../../
LUFA_PATH = ../../
# LUFA library compile-time options
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment