From 753e2ab11ad8b253be26c34e175bec8b159b18d2 Mon Sep 17 00:00:00 2001 From: Florent Duchon Date: Tue, 3 Apr 2012 18:37:44 +0200 Subject: digital/beacon: add APBTeam twi module --- .../src/Bitcloud_stack/Components/HAL/Makerules | 5 ----- .../src/Bitcloud_stack/Components/HAL/avr/Makefile | 6 +++--- .../lib/libHAL_ZigBit_Atmega1281_8Mhz_Gcc.a | Bin 92190 -> 84176 bytes 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'digital/beacon/src/Bitcloud_stack') diff --git a/digital/beacon/src/Bitcloud_stack/Components/HAL/Makerules b/digital/beacon/src/Bitcloud_stack/Components/HAL/Makerules index deea8742..8f133d44 100644 --- a/digital/beacon/src/Bitcloud_stack/Components/HAL/Makerules +++ b/digital/beacon/src/Bitcloud_stack/Components/HAL/Makerules @@ -761,11 +761,6 @@ else $(error unsupported COMPILER_AND_MICRO_TYPE) endif -ifneq ($(EXP_VERSION), $(COMPILER_VERSION)) - $(error ERROR in file Makerules: You are using incorrect version of compiler: \ - installed $(COMPILER_VERSION), expected $(EXP_VERSION)) -endif - ifeq ($(COMPILER_TYPE), IAR) COMPILER_TYPE_LOWER_CASE = _Iar else diff --git a/digital/beacon/src/Bitcloud_stack/Components/HAL/avr/Makefile b/digital/beacon/src/Bitcloud_stack/Components/HAL/avr/Makefile index 6b894b7f..450e054d 100644 --- a/digital/beacon/src/Bitcloud_stack/Components/HAL/avr/Makefile +++ b/digital/beacon/src/Bitcloud_stack/Components/HAL/avr/Makefile @@ -28,7 +28,7 @@ endif #### DEFINES FLAGS ####### CFLAGS += -DHAL_USE_ADC CFLAGS += -DHAL_USE_EE_READY -CFLAGS += -DHAL_USE_TWI +# CFLAGS += -DHAL_USE_TWI CFLAGS += -DHAL_USE_TIMER4_COMPA CFLAGS += -DHAL_USE_EXT_HANDLER ifneq ($(HAL), AT90USB1287) @@ -146,7 +146,7 @@ common_hwd += halAppClock common_hwd += halClkCtrl common_hwd += halUsart common_hwd += halIrq -common_hwd += i2c +# common_hwd += i2c common_hwd += halEeprom common_hwd += wdt common_hwd += halSleep @@ -190,7 +190,7 @@ hwi += usart hwi += w1 hwi += irq hwi += resetReason -hwi += i2cPacket +# hwi += i2cPacket hwi += eeprom hwi += timer hwi += adc diff --git a/digital/beacon/src/Bitcloud_stack/lib/libHAL_ZigBit_Atmega1281_8Mhz_Gcc.a b/digital/beacon/src/Bitcloud_stack/lib/libHAL_ZigBit_Atmega1281_8Mhz_Gcc.a index a787ec56..1985112a 100644 Binary files a/digital/beacon/src/Bitcloud_stack/lib/libHAL_ZigBit_Atmega1281_8Mhz_Gcc.a and b/digital/beacon/src/Bitcloud_stack/lib/libHAL_ZigBit_Atmega1281_8Mhz_Gcc.a differ -- cgit v1.2.3