Permalink
Browse files

fixing build errors

  • Loading branch information...
focalintent committed Mar 11, 2015
1 parent b818a63 commit 49d3563fdba9db0785b9884f8c8c027db713ae69
Showing with 4 additions and 7 deletions.
  1. +1 −3 chipsets.h
  2. +0 −1 color.h
  3. +3 −3 lib8tion.cpp
View
@@ -390,13 +390,11 @@ class SM16716Controller : public CLEDController {
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
<<<<<<< HEAD
#ifdef FASTLED_HAS_CLOCKLESS
=======
/// @name clockless controllers
/// Provides timing definitions for the variety of clockless controllers supplied by the library.
/// @{
>>>>>>> c0c8f765f1b01655116cc0c95979203ba05c80ef
// We want to force all avr's to use the Trinket controller when running at 8Mhz, because even the 328's at 8Mhz
// need the more tightly defined timeframes.
#if (F_CPU == 8000000 || F_CPU == 16000000 || F_CPU == 24000000) // || F_CPU == 48000000 || F_CPU == 96000000) // 125ns/clock
View
@@ -6,7 +6,6 @@ FASTLED_NAMESPACE_BEGIN
///@defgroup ColorEnums Color correction/temperature
/// definitions for color correction and light temperatures
///@{
>>>>>>> c0c8f765f1b01655116cc0c95979203ba05c80ef
typedef enum {
// Color correction starting points
View
@@ -1,6 +1,6 @@
#define FASTLED_INTERNAL
#include <stdint.h>
#include <FastLED.h>
#include "FastLED.h"
FASTLED_NAMESPACE_BEGIN
@@ -56,7 +56,7 @@ void * memset8 ( void * ptr, uint8_t val, uint16_t num )
//__attribute__ ((noinline))
void * memcpy8 ( void * dst, void* src, uint16_t num )
void * memcpy8 ( void * dst, const void* src, uint16_t num )
{
asm volatile(
" movw r30, %[src] \n\t"
@@ -84,7 +84,7 @@ void * memcpy8 ( void * dst, void* src, uint16_t num )
}
//__attribute__ ((noinline))
void * memmove8 ( void * dst, void* src, uint16_t num )
void * memmove8 ( void * dst, const void* src, uint16_t num )
{
if( src > dst) {
// if src > dst then we can use the forward-stepping memcpy8

0 comments on commit 49d3563

Please sign in to comment.