Merge branch 'master' into timer1

LowLevel.h

@@ -4,13 +4,7 @@
 #include <inttypes.h>
 
 #ifdef VS_INTELLISENSE
-static inline void UserTimer_Init(void)
+#define __attribute__() 
-{
-}
-static inline void UserTimer_Run(short skipTicks)
-{
-}
-#define UserTimer_Stop() {}
 #endif
 
 #if ARDUINO >= 100
@@ -157,7 +151,7 @@ public:
 
 	inline void attachInterrupt(void (*handler)(), int mode)
 	{
-		CLEARINTERRUPT;  // clear any pending interrupt (we want to call the handler only for interrupts happending after it is attached)
+		CLEARINTERRUPT;  // clear any pending interrupt (we want to call the handler only for interrupts happening after it is attached)
 		::attachInterrupt(interruptNumber_, handler, mode);
 	}
 	inline void detachInterrupt() { ::detachInterrupt(interruptNumber_); }

OneWireIO.vcxproj

@@ -46,7 +46,7 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
       <AdditionalIncludeDirectories>D:\Outils\Arduino\hardware\arduino\avr\cores\arduino;D:\Outils\Arduino\hardware\tools\avr\avr\include;C:\Program Files %28x86%29\Arduino\hardware\arduino\avr\cores\arduino;C:\Program Files %28x86%29\Arduino\hardware\tools\avr\avr\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ARDUINO=160;__AVR__;UBRRH;__AVR_ATmega328__;VS_INTELLISENSE</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);ARDUINO=160;__AVR__;UBRRH;__AVR_ATmega328P__;VS_INTELLISENSE</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>