Includeガードの競合問題を解消

Author: ContentsViewer

ArduinOS/Samples/Blink/Blink.ino

@@ -0,0 +1,29 @@
+
+DeclareTaskLoop(SerialTask);
+
+void setup() {
+  Serial.begin(19200);
+
+  pinMode(13, OUTPUT);
+
+  CreateTaskLoop(SerialTask, HIGH_PRIORITY);
+  
+  
+
+}
+
+void loop() {
+  digitalWrite(13, HIGH);
+  delay(1000);
+  
+  digitalWrite(13, LOW);
+  delay(1000);
+}
+
+TaskLoop(SerialTask){
+
+  Serial.println(millis());
+  DelayWithBlocked(1000);
+  
+}
+

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/ArduinOS.h

@@ -99,6 +99,8 @@
 //   MegaOSからArduinOSへ名称変更
 //   mainLoopTaskの優先度, およびスタックサイズをスケッチ内で変更できるようにした
 //
+//  2017/11/1:
+//   Includeガードにかかりやすい問題を修正
 */
 
 /*

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/List.h

@@ -85,8 +85,8 @@ engineered and independently SIL3 certified version for use in safety and
 mission critical applications that require provable dependability.
 */
 
-#ifndef LIST_H
-#define LIST_H
+#ifndef ARDUINOS_LIST_H
+#define ARDUINOS_LIST_H
 
 #ifdef __cplusplus
 extern "C" {

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/Malloc.h

@@ -1,6 +1,6 @@
 
-#ifndef MALLOC_H
-#define	MALLOC_H
+#ifndef ARDUINOS_MALLOC_H
+#define	ARDUINOS_MALLOC_H
 
 #ifdef __cplusplus
 extern "C" {

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/MallocOverride.h

@@ -1,6 +1,6 @@
 
-#ifndef MALLOC_OVERRIDE_H
-#define	MALLOC_OVERRIDE_H
+#ifndef ARDUINOS_MALLOC_OVERRIDE_H
+#define	ARDUINOS_MALLOC_OVERRIDE_H
 
 #include "Malloc.h"
 

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/PortMacro.h

@@ -90,8 +90,8 @@ mission critical applications that require provable dependability.
 // ---------------------------------------------------------
 
 
-#ifndef PORTMACRO_H
-#define PORTMACRO_H
+#ifndef ARDUINOS_PORTMACRO_H
+#define ARDUINOS_PORTMACRO_H
 
 // C言語でコンパイルするように宣言
 // 関数が正しくリンクされるようにするため.

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/Portable.h

@@ -85,8 +85,8 @@ mission critical applications that require provable dependability.
 */
 
 
-#ifndef PORTABLE_H
-#define PORTABLE_H
+#ifndef ARDUINOS_PORTABLE_H
+#define ARDUINOS_PORTABLE_H
 
 #include "PortMacro.h"
 

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/ProjDefs.h

@@ -85,8 +85,8 @@ engineered and independently SIL3 certified version for use in safety and
 mission critical applications that require provable dependability.
 */
 
-#ifndef PROJDEFS_H
-#define PROJDEFS_H
+#ifndef ARDUINOS_PROJDEFS_H
+#define ARDUINOS_PROJDEFS_H
 
 //タスク関数が従うプロトタイプ
 //Defines the prototype to which task functions must conform

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/Queue.h

@@ -86,8 +86,8 @@ mission critical applications that require provable dependability.
 */
 
 
-#ifndef QUEUE_H
-#define QUEUE_H
+#ifndef ARDUINOS_QUEUE_H
+#define ARDUINOS_QUEUE_H
 
 #ifndef ARDUINOS_H
     #error "include ArduinOS.h" must appear in source files before "include Queue.h"

ArduinOS/hardware/avr/cores/arduino.ArduinOS/ArduinOS/Semaphore.h

@@ -85,8 +85,8 @@ engineered and independently SIL3 certified version for use in safety and
 mission critical applications that require provable dependability.
 */
 
-#ifndef SEMAPHORE_H
-#define SEMAPHORE_H
+#ifndef ARDUINOS_SEMAPHORE_H
+#define ARDUINOS_SEMAPHORE_H
 
 #ifndef ARDUINOS_H
 #error "include ArduinOS.h" must appear in source files before "include Semaphore.h"