Changeset a9059a5 in orbit


Ignore:
Timestamp:
05/11/13 22:06:36 (7 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, RawEEG, Raw_EEG_Plot, Servo, Tab_Interface, pyramid
Children:
969e7b2, f323fb4
Parents:
0caeed7
Message:

Arduino:

  • updated to permit custom setting of Throttle, Yaw, and Pitch

Android:

  • Minor tweak to Configuration location

iOS:

Files:
78 added
6 edited

Legend:

Unmodified
Added
Removed

  • android/src/info/puzzlebox/orbit/OrbitActivity.java

    rc298bcb ra9059a5  
    6161         * Configuration 
    6262         */ 
    63         Configuration config; 
    6463        int eegAttention = 0; 
    6564        int eegMeditation = 0; 
    … …  
    7473         * UI 
    7574         */ 
     75        Configuration config; 
    7676        ProgressBar progressBarAttention; 
    7777        SeekBar seekBarAttention; 

  • arduino/puzzlebox_orbit_Uno_V3/puzzlebox_orbit_Uno_V3.ino

    r1a53973 ra9059a5  
    11/* 
    22 
    3  Mimics the fade example but with an extra parameter for frequency. It should dim but with a flicker  
    4  because the frequency has been set low enough for the human eye to detect. This flicker is easiest to see when  
    5  the LED is moving with respect to the eye and when it is between about 20% - 60% brighness. The library  
    6  allows for a frequency range from 1Hz - 2MHz on 16 bit timers and 31Hz - 2 MHz on 8 bit timers. When  
    7  SetPinFrequency()/SetPinFrequencySafe() is called, a bool is returned which can be tested to verify the  
    8  frequency was actually changed. 
    9   
    10  This example runs on mega and uno. 
    11  */ 
     3Mimics the fade example but with an extra parameter for frequency. It should dim but with a flicker  
     4because the frequency has been set low enough for the human eye to detect. This flicker is easiest to see when  
     5the LED is moving with respect to the eye and when it is between about 20% - 60% brighness. The library  
     6allows for a frequency range from 1Hz - 2MHz on 16 bit timers and 31Hz - 2 MHz on 8 bit timers. When  
     7SetPinFrequency()/SetPinFrequencySafe() is called, a bool is returned which can be tested to verify the  
     8frequency was actually changed. 
     9 
     10This example runs on mega and uno. 
     11*/ 
    1212 
    1313#include <PWM.h> 
    1414 
    15 //use pin 11 on the Mega instead, otherwise there is a frequency cap at 31 Hz 
    16 int IR = 10;                // the pin that the Infrared LED is attached to 
    17 int ON = 128;         // 17.5us/26us = 172.3/256 
     15// use pin 11 on the Mega instead, otherwise there is a frequency cap at 31 Hz 
     16int IR = 10;  // the pin that the Infrared LED is attached to 
     17int ON = 128; // 17.5us/26us = 172.3/256 
    1818int OFF = 0; 
    19 int32_t frequency = 38400; //frequency (in Hz) 
    20  
    21 //variables start with "_" means global variable  
    22 char _throttle=0; //32~127, default 0 
    23 char _pitch=31; //0~63, default 31 
    24 char _yaw=78; //16~127, default 78 
     19int32_t frequency = 38400; // frequency (in Hz) 
     20 
     21// variables start with "_" means global variable  
     22char _throttle=0; // 32~127, default 0 
     23char _pitch=31;   // 0~63, default 31 
     24char _yaw=78;     // 16~127, default 78 
    2525char _channel='A'; 
    2626char _command; 
    27 //long _mainCode=0; 
    28  
    29 //generate ON/OFF control signals, with starting and stopping PWM generator 
     27// long _mainCode=0; 
     28 
     29 
     30// generate ON/OFF control signals, with starting and stopping PWM generator 
    3031void innerCycle(int onTime, int offTime) 
    3132{ 
    32   pwmWrite(IR, ON); 
    33   delayMicroseconds(onTime); 
    34   pwmWrite(IR, OFF); 
    35   delayMicroseconds(offTime); 
    36 } 
    37  
    38 void emitCode(char BIT)//emitCode generate LOWs between HIGHs as same as the parameter. 
    39 { 
    40   if (BIT) innerCycle(671,732);// 1 
    41   else innerCycle(337,402);// 0 
    42 } 
     33pwmWrite(IR, ON); 
     34delayMicroseconds(onTime); 
     35pwmWrite(IR, OFF); 
     36delayMicroseconds(offTime); 
     37} // innerCycle 
     38 
     39 
     40void emitCode(char BIT) // emitCode generate LOWs between HIGHs as same as the parameter. 
     41{ 
     42        if (BIT) innerCycle(671,732); // 1 
     43        else innerCycle(337,402); // 0 
     44} // emitCode 
     45 
    4346 
    4447void sendCode(long code) 
    4548{  
    46  char n;  
    47   //starting code, with special time period. 
    48   innerCycle(730,392); //(773 414)->824 450 
    49   innerCycle(730,392);  
    50    
    51   for (n=28;n>=0;n--)  emitCode((code >> n) & 1); //getting bits out from code 
    52  
    53 } 
     49        char n;  
     50        //starting code, with special time period. 
     51        innerCycle(730,392); //(773 414)->824 450 
     52        innerCycle(730,392);  
     53         
     54        for (n=28;n>=0;n--)  emitCode((code >> n) & 1); // getting bits out from code 
     55         
     56} // sendCode 
     57 
    5458 
    5559long formCode(char throttle,char yaw,char pitch) 
    5660{ 
    57   char n; 
    58   long mainCode=0; 
    59   int checkSum=0; 
    60  
    61   //throttle 
    62   for (n=6; n>=0; n--)  bitWrite(mainCode,17+n,bitRead(throttle,n)); //getting the first 7 digits to mainCode 
    63    
    64   bitWrite(mainCode,16,1);  //meaning unclear, possibly left button. 
    65    
    66   //channel selection first half 
    67   if (_channel=='C') bitWrite(mainCode,15,1); 
    68   else bitWrite(mainCode,15,0); //this digit equals 0 in channel A or B 
    69    
    70   for (n=6; n>=0; n--)  bitWrite(mainCode,8+n,bitRead(yaw,n));//yaw 
    71    
    72   //channel selection second half 
    73   if (_channel=='A') bitWrite(mainCode,7,1); 
    74   else bitWrite(mainCode,7,0); //if channel B or C, this digit equals 0; 
    75    
    76   bitWrite(mainCode,6,0);// meaning unclear, possibly right button. 
    77    
    78   for (n=5; n>=0; n--)  bitWrite(mainCode,n,bitRead(pitch,n));//pitch   
    79      
    80   // CheckSum 
    81   for (n=0; n<=20; n=n+4)  checkSum += ((mainCode >> n) & B1111);//sum up every 4 digits in the code 
    82    
    83   checkSum=checkSum & B1111; //get the last 4 bits of the sum 
    84   checkSum=(16-checkSum) & B1111;//16-sum is the formula of this helicopter 
    85    
    86   mainCode= (mainCode << 5) | (checkSum << 1); //get the last 4 digit of CheckSum 
    87   
    88   bitWrite(mainCode,0,1);  //finish code 
    89   return mainCode; //mainCode is a 29 bit binary number 
    90 } 
     61        char n; 
     62        long mainCode=0; 
     63        int checkSum=0; 
     64         
     65        // throttle 
     66        for (n=6; n>=0; n--)  bitWrite(mainCode,17+n,bitRead(throttle,n)); // getting the first 7 digits to mainCode 
     67         
     68        bitWrite(mainCode,16,1); // meaning unclear, possibly left button. 
     69         
     70        //channel selection first half 
     71        if (_channel=='C') bitWrite(mainCode,15,1); 
     72        else bitWrite(mainCode,15,0); // this digit equals 0 in channel A or B 
     73         
     74        for (n=6; n>=0; n--)  bitWrite(mainCode,8+n,bitRead(yaw,n)); // yaw 
     75         
     76        //channel selection second half 
     77        if (_channel=='A') bitWrite(mainCode,7,1); 
     78        else bitWrite(mainCode,7,0); // if channel B or C, this digit equals 0; 
     79         
     80        bitWrite(mainCode,6,0); // meaning unclear, possibly right button. 
     81         
     82        for (n=5; n>=0; n--)  bitWrite(mainCode,n,bitRead(pitch,n)); // pitch   
     83         
     84        // CheckSum 
     85        for (n=0; n<=20; n=n+4)  checkSum += ((mainCode >> n) & B1111); // sum up every 4 digits in the code 
     86         
     87        checkSum=checkSum & B1111; // get the last 4 bits of the sum 
     88        checkSum=(16-checkSum) & B1111; // 16-sum is the formula of this helicopter 
     89         
     90        mainCode= (mainCode << 5) | (checkSum << 1); // get the last 4 digit of CheckSum 
     91         
     92        bitWrite(mainCode,0,1); // finish code 
     93        return mainCode; // mainCode is a 29 bit binary number 
     94         
     95} // formCode 
     96 
    9197 
    9298void setup() 
    9399{ 
    94   pinMode(13, OUTPUT); 
    95   digitalWrite(13,LOW); 
    96   //initialize all timers except for 0, to save time keeping functions 
    97   InitTimersSafe();  
    98  
    99   //sets the frequency for the specified pin 
    100   bool success = SetPinFrequencySafe(IR, frequency); 
    101    
    102   //if the pin frequency was set successfully, turn pin 13 on 
    103   if(success) { 
    104     digitalWrite(13, HIGH);     
    105   } 
    106   Serial.begin(9600); 
    107 } 
     100        pinMode(13, OUTPUT); 
     101        digitalWrite(13,LOW); 
     102        //initialize all timers except for 0, to save time keeping functions 
     103        InitTimersSafe();  
     104 
     105        //sets the frequency for the specified pin 
     106        bool success = SetPinFrequencySafe(IR, frequency); 
     107 
     108        //if the pin frequency was set successfully, turn pin 13 on 
     109        if(success) { 
     110                digitalWrite(13, HIGH);     
     111        } 
     112         
     113        Serial.begin(9600); 
     114         
     115} // setup 
     116 
     117 
     118void setPitch() { 
     119 
     120        char inByte=0; 
     121        int a=0; 
     122        int b=0; 
     123        int c=0; 
     124        int newPitch=0; 
     125 
     126        while (Serial.available() == 0); 
     127        inByte = Serial.read() - '0'; 
     128        //Serial.println(inByte); 
     129        a = inByte; 
     130 
     131        while (Serial.available() == 0); 
     132        inByte = Serial.read() - '0'; 
     133        //Serial.println(inByte); 
     134        b = inByte; 
     135 
     136        while (Serial.available() == 0); 
     137        inByte = Serial.read() - '0'; 
     138        //Serial.println(inByte); 
     139        c = inByte; 
     140 
     141        newPitch = (a * 100) + (b * 10) + c; 
     142 
     143        if (newPitch < 0) 
     144                newPitch=0; 
     145 
     146        if (newPitch > 100) 
     147                newPitch=100; 
     148                 
     149        _pitch=newPitch; 
     150 
     151        Serial.print("_pitch="); 
     152        Serial.println(int(_pitch)); 
     153 
     154} // setPitch 
     155 
    108156 
    109157void setThrottle() { 
    110   
    111   char inByte=0; 
    112   int a=0; 
    113   int b=0; 
    114   int c=0; 
    115   int newThrottle=0; 
    116   
    117   while (Serial.available() == 0); 
    118   inByte = Serial.read() - '0'; 
    119   //Serial.println(inByte); 
    120   a = inByte; 
    121   
    122   while (Serial.available() == 0); 
    123   inByte = Serial.read() - '0'; 
    124   //Serial.println(inByte); 
    125   b = inByte; 
    126   
    127   while (Serial.available() == 0); 
    128   inByte = Serial.read() - '0'; 
    129   //Serial.println(inByte); 
    130   c = inByte; 
    131   
    132   newThrottle = (a * 100) + (b * 10) + c; 
    133   
    134   if (newThrottle < 0) 
    135     newThrottle=0; 
    136   
    137   if (newThrottle > 100) 
    138     newThrottle=100; 
    139     
    140   _throttle=newThrottle; 
    141   
    142   Serial.print("_throttle="); 
    143   Serial.println(int(_throttle)); 
    144   
    145 } 
     158 
     159        char inByte=0; 
     160        int a=0; 
     161        int b=0; 
     162        int c=0; 
     163        int newThrottle=0; 
     164 
     165        while (Serial.available() == 0); 
     166        inByte = Serial.read() - '0'; 
     167        //Serial.println(inByte); 
     168        a = inByte; 
     169 
     170        while (Serial.available() == 0); 
     171        inByte = Serial.read() - '0'; 
     172        //Serial.println(inByte); 
     173        b = inByte; 
     174 
     175        while (Serial.available() == 0); 
     176        inByte = Serial.read() - '0'; 
     177        //Serial.println(inByte); 
     178        c = inByte; 
     179 
     180        newThrottle = (a * 100) + (b * 10) + c; 
     181 
     182        if (newThrottle < 0) 
     183                newThrottle=0; 
     184 
     185        if (newThrottle > 100) 
     186                newThrottle=100; 
     187                 
     188        _throttle=newThrottle; 
     189 
     190        Serial.print("_throttle="); 
     191        Serial.println(int(_throttle)); 
     192 
     193} // setThrottle 
     194 
     195 
     196void setYaw() { 
     197 
     198        char inByte=0; 
     199        int a=0; 
     200        int b=0; 
     201        int c=0; 
     202        int newYaw=0; 
     203 
     204        while (Serial.available() == 0); 
     205        inByte = Serial.read() - '0'; 
     206        //Serial.println(inByte); 
     207        a = inByte; 
     208 
     209        while (Serial.available() == 0); 
     210        inByte = Serial.read() - '0'; 
     211        //Serial.println(inByte); 
     212        b = inByte; 
     213 
     214        while (Serial.available() == 0); 
     215        inByte = Serial.read() - '0'; 
     216        //Serial.println(inByte); 
     217        c = inByte; 
     218 
     219        newYaw = (a * 100) + (b * 10) + c; 
     220 
     221        if (newYaw < 0) 
     222                newYaw=0; 
     223 
     224        if (newYaw > 100) 
     225                newYaw=100; 
     226                 
     227        _yaw=newYaw; 
     228 
     229        Serial.print("_yaw="); 
     230        Serial.println(int(_yaw)); 
     231 
     232} // setYaw 
     233 
    146234 
    147235void loop() 
    148 {int i; 
    149   if (Serial.available() > 0)  
    150   { 
    151     _command = Serial.read(); 
    152     switch (_command) 
    153     {  
    154       case 'P': _throttle=85; Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
    155       case 'O': _throttle=0; Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
    156       case 'U':  _throttle+=1;  Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
    157       case 'D':  _throttle-=1;  Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
    158       case 'L':  _yaw+=15;  Serial.print("_yaw="); Serial.println(int(_yaw)); break; 
    159       case 'R':  _yaw-=15;  Serial.print("_yaw="); Serial.println(int(_yaw)); break; 
    160       case 'F':  _pitch+=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
    161       case 'B':  _pitch-=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
    162       case '1':  _channel='A';  Serial.println("_channel=A"); break; 
    163       case '2':  _channel='B';  Serial.println("_channel=B"); break; 
    164       case '3':  _channel='C';  Serial.println("_channel=C"); break; 
    165       case 'x':  setThrottle(); break; 
    166     } 
    167   } 
    168    
    169   sendCode(formCode(_throttle,_yaw,_pitch)); 
    170   delay(80); //originally 36, 51, 66, 80 
    171  
    172 } 
    173  
     236{ 
     237        int i; 
     238        if (Serial.available() > 0)  
     239        { 
     240                _command = Serial.read(); 
     241                switch (_command) 
     242                {  
     243                        case 'P': _throttle=85; Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
     244                        case 'O': _throttle=0; Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
     245                        case 'U':  _throttle+=1;  Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
     246                        case 'D':  _throttle-=1;  Serial.print("_throttle="); Serial.println(int(_throttle)); break; 
     247                        case 'L':  _yaw+=15;  Serial.print("_yaw="); Serial.println(int(_yaw)); break; 
     248                        case 'R':  _yaw-=15;  Serial.print("_yaw="); Serial.println(int(_yaw)); break; 
     249                        case 'F':  _pitch+=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
     250                        case 'B':  _pitch-=5;  Serial.print("_pitch="); Serial.println(int(_pitch)); break; 
     251                        case '1':  _channel='A';  Serial.println("_channel=A"); break; 
     252                        case '2':  _channel='B';  Serial.println("_channel=B"); break; 
     253                        case '3':  _channel='C';  Serial.println("_channel=C"); break; 
     254                        case 'p':  setPitch(); break; 
     255                        case 't':  setThrottle(); break; 
     256                        case 'y':  setYaw(); break; 
     257                        case 'x':  setThrottle(); break; 
     258                } 
     259        } 
     260         
     261        sendCode(formCode(_throttle,_yaw,_pitch)); 
     262        delay(80); //originally 36, 51, 66, 80 
     263         
     264} // loop 
     265 

  • iOS/Orbit/Orbit/AppDelegate.m

    r067ea71 ra9059a5  
    1414#import "TGAccessoryDelegate.h" 
    1515#import "ViewController.h" 
     16#import "CorePlot-CocoaTouch.h" 
    1617 
    1718@implementation AppDelegate 

  • iOS/Orbit/Orbit/Orbit-Info.plist

    r2aabdf3 ra9059a5  
    2929        <string>APPL</string> 
    3030        <key>CFBundleShortVersionString</key> 
    31         <string>1.0</string> 
     31        <string>1.0.1</string> 
    3232        <key>CFBundleSignature</key> 
    3333        <string>????</string> 
    3434        <key>CFBundleVersion</key> 
    35         <string>1.0</string> 
     35        <string>1.0.01</string> 
    3636        <key>LSRequiresIPhoneOS</key> 
    3737        <true/> 

  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    rdaf54d5 ra9059a5  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="2844" systemVersion="11G63b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2"> 
     2<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="11G63b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="2"> 
    33    <dependencies> 
    4         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="1930"/> 
     4        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/> 
    55    </dependencies> 
    66    <scenes> 
    … …  
    125125        </scene> 
    126126    </scenes> 
    127     <classes> 
    128         <class className="ViewController" superclassName="UIViewController"> 
    129             <source key="sourceIdentifier" type="project" relativePath="./Classes/ViewController.h"/> 
    130             <relationships> 
    131                 <relationship kind="action" name="connectButtonPressed:"/> 
    132                 <relationship kind="action" name="demoButtonPressed:"/> 
    133                 <relationship kind="outlet" name="attention" candidateClass="UIProgressView"/> 
    134                 <relationship kind="outlet" name="attentionThreshold" candidateClass="UISlider"/> 
    135                 <relationship kind="outlet" name="connectButton" candidateClass="UIButton"/> 
    136                 <relationship kind="outlet" name="demoButton" candidateClass="UIButton"/> 
    137                 <relationship kind="outlet" name="log" candidateClass="UITextView"/> 
    138                 <relationship kind="outlet" name="meditation" candidateClass="UIProgressView"/> 
    139                 <relationship kind="outlet" name="meditationThreshold" candidateClass="UISlider"/> 
    140                 <relationship kind="outlet" name="power" candidateClass="UIProgressView"/> 
    141                 <relationship kind="outlet" name="signal" candidateClass="UIProgressView"/> 
    142             </relationships> 
    143         </class> 
    144     </classes> 
    145127    <simulatedMetricsContainer key="defaultSimulatedMetrics"> 
    146128        <simulatedStatusBarMetrics key="statusBar"/> 

  • iOS/Orbit/orbit.xcodeproj/project.pbxproj

    r067ea71 ra9059a5  
    2323                28C10EEC16875BC100ECFD59 /* throttle_hover_ios.wav in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */; }; 
    2424                28C10EF1168760CA00ECFD59 /* HOW_TO_USE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */; }; 
     25                52922BA817004D1400A39146 /* libCorePlot-CocoaTouch.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 52922BA717004D1400A39146 /* libCorePlot-CocoaTouch.a */; }; 
    2526                52FA364416899B5D004C280A /* ic_launcher-57x57.png in Resources */ = {isa = PBXBuildFile; fileRef = 52FA364316899B5D004C280A /* ic_launcher-57x57.png */; }; 
    2627                52FA364616899B69004C280A /* ic_launcher-114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = 52FA364516899B69004C280A /* ic_launcher-114x114.png */; }; 
    … …  
    5152                28C10EEB16875BC100ECFD59 /* throttle_hover_ios.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = throttle_hover_ios.wav; sourceTree = "<group>"; }; 
    5253                28C10EF0168760CA00ECFD59 /* HOW_TO_USE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HOW_TO_USE.txt; sourceTree = "<group>"; }; 
     54                52922BA717004D1400A39146 /* libCorePlot-CocoaTouch.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libCorePlot-CocoaTouch.a"; sourceTree = "<group>"; }; 
     55                52922BA917004D4400A39146 /* CorePlot-CocoaTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CorePlot-CocoaTouch.h"; sourceTree = "<group>"; }; 
     56                52922BAC1700507400A39146 /* CorePlot-CocoaTouch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CorePlot-CocoaTouch.h"; sourceTree = "<group>"; }; 
     57                52922BAD1700507400A39146 /* CPTAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAnnotation.h; sourceTree = "<group>"; }; 
     58                52922BAE1700507400A39146 /* CPTAnnotationHostLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAnnotationHostLayer.h; sourceTree = "<group>"; }; 
     59                52922BAF1700507400A39146 /* CPTAxis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxis.h; sourceTree = "<group>"; }; 
     60                52922BB01700507400A39146 /* CPTAxisLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxisLabel.h; sourceTree = "<group>"; }; 
     61                52922BB11700507400A39146 /* CPTAxisLabelGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxisLabelGroup.h; sourceTree = "<group>"; }; 
     62                52922BB21700507400A39146 /* CPTAxisSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxisSet.h; sourceTree = "<group>"; }; 
     63                52922BB31700507400A39146 /* CPTAxisTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTAxisTitle.h; sourceTree = "<group>"; }; 
     64                52922BB41700507400A39146 /* CPTBarPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTBarPlot.h; sourceTree = "<group>"; }; 
     65                52922BB51700507400A39146 /* CPTBorderedLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTBorderedLayer.h; sourceTree = "<group>"; }; 
     66                52922BB61700507400A39146 /* CPTCalendarFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTCalendarFormatter.h; sourceTree = "<group>"; }; 
     67                52922BB71700507400A39146 /* CPTColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTColor.h; sourceTree = "<group>"; }; 
     68                52922BB81700507400A39146 /* CPTColorSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTColorSpace.h; sourceTree = "<group>"; }; 
     69                52922BB91700507400A39146 /* CPTConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTConstraints.h; sourceTree = "<group>"; }; 
     70                52922BBA1700507400A39146 /* CPTDataSourceTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTDataSourceTestCase.h; sourceTree = "<group>"; }; 
     71                52922BBB1700507400A39146 /* CPTDefinitions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTDefinitions.h; sourceTree = "<group>"; }; 
     72                52922BBC1700507400A39146 /* CPTDerivedXYGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTDerivedXYGraph.h; sourceTree = "<group>"; }; 
     73                52922BBD1700507400A39146 /* CPTExceptions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTExceptions.h; sourceTree = "<group>"; }; 
     74                52922BBE1700507400A39146 /* CPTFill.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTFill.h; sourceTree = "<group>"; }; 
     75                52922BBF1700507400A39146 /* CPTGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTGradient.h; sourceTree = "<group>"; }; 
     76                52922BC01700507400A39146 /* CPTGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTGraph.h; sourceTree = "<group>"; }; 
     77                52922BC11700507400A39146 /* CPTGraphHostingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTGraphHostingView.h; sourceTree = "<group>"; }; 
     78                52922BC21700507400A39146 /* CPTGridLineGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTGridLineGroup.h; sourceTree = "<group>"; }; 
     79                52922BC31700507400A39146 /* CPTGridLines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTGridLines.h; sourceTree = "<group>"; }; 
     80                52922BC41700507400A39146 /* CPTImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTImage.h; sourceTree = "<group>"; }; 
     81                52922BC51700507400A39146 /* CPTLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLayer.h; sourceTree = "<group>"; }; 
     82                52922BC61700507400A39146 /* CPTLayerAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLayerAnnotation.h; sourceTree = "<group>"; }; 
     83                52922BC71700507400A39146 /* CPTLegend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLegend.h; sourceTree = "<group>"; }; 
     84                52922BC81700507400A39146 /* CPTLegendEntry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLegendEntry.h; sourceTree = "<group>"; }; 
     85                52922BC91700507400A39146 /* CPTLimitBand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLimitBand.h; sourceTree = "<group>"; }; 
     86                52922BCA1700507400A39146 /* CPTLineCap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLineCap.h; sourceTree = "<group>"; }; 
     87                52922BCB1700507400A39146 /* CPTLineStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTLineStyle.h; sourceTree = "<group>"; }; 
     88                52922BCC1700507400A39146 /* CPTMutableLineStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTMutableLineStyle.h; sourceTree = "<group>"; }; 
     89                52922BCD1700507400A39146 /* CPTMutableNumericData+TypeConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPTMutableNumericData+TypeConversion.h"; sourceTree = "<group>"; }; 
     90                52922BCE1700507400A39146 /* CPTMutableNumericData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTMutableNumericData.h; sourceTree = "<group>"; }; 
     91                52922BCF1700507400A39146 /* CPTMutablePlotRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTMutablePlotRange.h; sourceTree = "<group>"; }; 
     92                52922BD01700507400A39146 /* CPTMutableShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTMutableShadow.h; sourceTree = "<group>"; }; 
     93                52922BD11700507400A39146 /* CPTMutableTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTMutableTextStyle.h; sourceTree = "<group>"; }; 
     94                52922BD21700507400A39146 /* CPTNumericData+TypeConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CPTNumericData+TypeConversion.h"; sourceTree = "<group>"; }; 
     95                52922BD31700507400A39146 /* CPTNumericData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTNumericData.h; sourceTree = "<group>"; }; 
     96                52922BD41700507400A39146 /* CPTNumericDataType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTNumericDataType.h; sourceTree = "<group>"; }; 
     97                52922BD51700507400A39146 /* CPTPathExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPathExtensions.h; sourceTree = "<group>"; }; 
     98                52922BD61700507400A39146 /* CPTPieChart.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPieChart.h; sourceTree = "<group>"; }; 
     99                52922BD71700507400A39146 /* CPTPlatformSpecificCategories.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlatformSpecificCategories.h; sourceTree = "<group>"; }; 
     100                52922BD81700507400A39146 /* CPTPlatformSpecificDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlatformSpecificDefines.h; sourceTree = "<group>"; }; 
     101                52922BD91700507400A39146 /* CPTPlatformSpecificFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlatformSpecificFunctions.h; sourceTree = "<group>"; }; 
     102                52922BDA1700507400A39146 /* CPTPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlot.h; sourceTree = "<group>"; }; 
     103                52922BDB1700507400A39146 /* CPTPlotArea.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotArea.h; sourceTree = "<group>"; }; 
     104                52922BDC1700507400A39146 /* CPTPlotAreaFrame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotAreaFrame.h; sourceTree = "<group>"; }; 
     105                52922BDD1700507400A39146 /* CPTPlotGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotGroup.h; sourceTree = "<group>"; }; 
     106                52922BDE1700507400A39146 /* CPTPlotRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotRange.h; sourceTree = "<group>"; }; 
     107                52922BDF1700507400A39146 /* CPTPlotSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotSpace.h; sourceTree = "<group>"; }; 
     108                52922BE01700507400A39146 /* CPTPlotSpaceAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotSpaceAnnotation.h; sourceTree = "<group>"; }; 
     109                52922BE11700507400A39146 /* CPTPlotSymbol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTPlotSymbol.h; sourceTree = "<group>"; }; 
     110                52922BE21700507400A39146 /* CPTRangePlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTRangePlot.h; sourceTree = "<group>"; }; 
     111                52922BE31700507400A39146 /* CPTResponder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTResponder.h; sourceTree = "<group>"; }; 
     112                52922BE41700507400A39146 /* CPTScatterPlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTScatterPlot.h; sourceTree = "<group>"; }; 
     113                52922BE51700507400A39146 /* CPTShadow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTShadow.h; sourceTree = "<group>"; }; 
     114                52922BE61700507400A39146 /* CPTTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTestCase.h; sourceTree = "<group>"; }; 
     115                52922BE71700507400A39146 /* CPTTextLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTextLayer.h; sourceTree = "<group>"; }; 
     116                52922BE81700507400A39146 /* CPTTextStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTextStyle.h; sourceTree = "<group>"; }; 
     117                52922BE91700507400A39146 /* CPTTextStylePlatformSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTextStylePlatformSpecific.h; sourceTree = "<group>"; }; 
     118                52922BEA1700507400A39146 /* CPTTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTheme.h; sourceTree = "<group>"; }; 
     119                52922BEB1700507400A39146 /* CPTTimeFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTimeFormatter.h; sourceTree = "<group>"; }; 
     120                52922BEC1700507400A39146 /* CPTTradingRangePlot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTTradingRangePlot.h; sourceTree = "<group>"; }; 
     121                52922BED1700507400A39146 /* CPTUtilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTUtilities.h; sourceTree = "<group>"; }; 
     122                52922BEE1700507400A39146 /* CPTXYAxis.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTXYAxis.h; sourceTree = "<group>"; }; 
     123                52922BEF1700507400A39146 /* CPTXYAxisSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTXYAxisSet.h; sourceTree = "<group>"; }; 
     124                52922BF01700507400A39146 /* CPTXYGraph.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTXYGraph.h; sourceTree = "<group>"; }; 
     125                52922BF11700507400A39146 /* CPTXYPlotSpace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CPTXYPlotSpace.h; sourceTree = "<group>"; }; 
     126                52922BF21700507400A39146 /* mainpage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mainpage.h; sourceTree = "<group>"; }; 
     127                52922BF31700507400A39146 /* NSCoderExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCoderExtensions.h; sourceTree = "<group>"; }; 
     128                52922BF41700507400A39146 /* NSDecimalNumberExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDecimalNumberExtensions.h; sourceTree = "<group>"; }; 
     129                52922BF51700507400A39146 /* NSNumberExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSNumberExtensions.h; sourceTree = "<group>"; }; 
    53130                52FA364316899B5D004C280A /* ic_launcher-57x57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_launcher-57x57.png"; sourceTree = "<group>"; }; 
    54131                52FA364516899B69004C280A /* ic_launcher-114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_launcher-114x114.png"; sourceTree = "<group>"; }; 
    … …  
    61138                        buildActionMask = 2147483647; 
    62139                        files = ( 
     140                                52922BA817004D1400A39146 /* libCorePlot-CocoaTouch.a in Frameworks */, 
    63141                                2815BC15167F496C00F7E6DA /* QuartzCore.framework in Frameworks */, 
    64142                                2815BC13167F48BB00F7E6DA /* libTGAccessory.a in Frameworks */, 
    … …  
    78156                        isa = PBXGroup; 
    79157                        children = ( 
     158                                52922BAB1700507400A39146 /* CorePlotHeaders */, 
     159                                52922BA917004D4400A39146 /* CorePlot-CocoaTouch.h */, 
     160                                52922BA717004D1400A39146 /* libCorePlot-CocoaTouch.a */, 
    80161                                2815BC10167F48A000F7E6DA /* libTGAccessory.a */, 
    81162                                2815BC11167F48A000F7E6DA /* TGAccessoryDelegate.h */, 
    … …  
    146227                        sourceTree = "<group>"; 
    147228                }; 
     229                52922BAB1700507400A39146 /* CorePlotHeaders */ = { 
     230                        isa = PBXGroup; 
     231                        children = ( 
     232                                52922BAC1700507400A39146 /* CorePlot-CocoaTouch.h */, 
     233                                52922BAD1700507400A39146 /* CPTAnnotation.h */, 
     234                                52922BAE1700507400A39146 /* CPTAnnotationHostLayer.h */, 
     235                                52922BAF1700507400A39146 /* CPTAxis.h */, 
     236                                52922BB01700507400A39146 /* CPTAxisLabel.h */, 
     237                                52922BB11700507400A39146 /* CPTAxisLabelGroup.h */, 
     238                                52922BB21700507400A39146 /* CPTAxisSet.h */, 
     239                                52922BB31700507400A39146 /* CPTAxisTitle.h */, 
     240                                52922BB41700507400A39146 /* CPTBarPlot.h */, 
     241                                52922BB51700507400A39146 /* CPTBorderedLayer.h */, 
     242                                52922BB61700507400A39146 /* CPTCalendarFormatter.h */, 
     243                                52922BB71700507400A39146 /* CPTColor.h */, 
     244                                52922BB81700507400A39146 /* CPTColorSpace.h */, 
     245                                52922BB91700507400A39146 /* CPTConstraints.h */, 
     246                                52922BBA1700507400A39146 /* CPTDataSourceTestCase.h */, 
     247                                52922BBB1700507400A39146 /* CPTDefinitions.h */, 
     248                                52922BBC1700507400A39146 /* CPTDerivedXYGraph.h */, 
     249                                52922BBD1700507400A39146 /* CPTExceptions.h */, 
     250                                52922BBE1700507400A39146 /* CPTFill.h */, 
     251                                52922BBF1700507400A39146 /* CPTGradient.h */, 
     252                                52922BC01700507400A39146 /* CPTGraph.h */, 
     253                                52922BC11700507400A39146 /* CPTGraphHostingView.h */, 
     254                                52922BC21700507400A39146 /* CPTGridLineGroup.h */, 
     255                                52922BC31700507400A39146 /* CPTGridLines.h */, 
     256                                52922BC41700507400A39146 /* CPTImage.h */, 
     257                                52922BC51700507400A39146 /* CPTLayer.h */, 
     258                                52922BC61700507400A39146 /* CPTLayerAnnotation.h */, 
     259                                52922BC71700507400A39146 /* CPTLegend.h */, 
     260                                52922BC81700507400A39146 /* CPTLegendEntry.h */, 
     261                                52922BC91700507400A39146 /* CPTLimitBand.h */, 
     262                                52922BCA1700507400A39146 /* CPTLineCap.h */, 
     263                                52922BCB1700507400A39146 /* CPTLineStyle.h */, 
     264                                52922BCC1700507400A39146 /* CPTMutableLineStyle.h */, 
     265                                52922BCD1700507400A39146 /* CPTMutableNumericData+TypeConversion.h */, 
     266                                52922BCE1700507400A39146 /* CPTMutableNumericData.h */, 
     267                                52922BCF1700507400A39146 /* CPTMutablePlotRange.h */, 
     268                                52922BD01700507400A39146 /* CPTMutableShadow.h */, 
     269                                52922BD11700507400A39146 /* CPTMutableTextStyle.h */, 
     270                                52922BD21700507400A39146 /* CPTNumericData+TypeConversion.h */, 
     271                                52922BD31700507400A39146 /* CPTNumericData.h */, 
     272                                52922BD41700507400A39146 /* CPTNumericDataType.h */, 
     273                                52922BD51700507400A39146 /* CPTPathExtensions.h */, 
     274                                52922BD61700507400A39146 /* CPTPieChart.h */, 
     275                                52922BD71700507400A39146 /* CPTPlatformSpecificCategories.h */, 
     276                                52922BD81700507400A39146 /* CPTPlatformSpecificDefines.h */, 
     277                                52922BD91700507400A39146 /* CPTPlatformSpecificFunctions.h */, 
     278                                52922BDA1700507400A39146 /* CPTPlot.h */, 
     279                                52922BDB1700507400A39146 /* CPTPlotArea.h */, 
     280                                52922BDC1700507400A39146 /* CPTPlotAreaFrame.h */, 
     281                                52922BDD1700507400A39146 /* CPTPlotGroup.h */, 
     282                                52922BDE1700507400A39146 /* CPTPlotRange.h */, 
     283                                52922BDF1700507400A39146 /* CPTPlotSpace.h */, 
     284                                52922BE01700507400A39146 /* CPTPlotSpaceAnnotation.h */, 
     285                                52922BE11700507400A39146 /* CPTPlotSymbol.h */, 
     286                                52922BE21700507400A39146 /* CPTRangePlot.h */, 
     287                                52922BE31700507400A39146 /* CPTResponder.h */, 
     288                                52922BE41700507400A39146 /* CPTScatterPlot.h */, 
     289                                52922BE51700507400A39146 /* CPTShadow.h */, 
     290                                52922BE61700507400A39146 /* CPTTestCase.h */, 
     291                                52922BE71700507400A39146 /* CPTTextLayer.h */, 
     292                                52922BE81700507400A39146 /* CPTTextStyle.h */, 
     293                                52922BE91700507400A39146 /* CPTTextStylePlatformSpecific.h */, 
     294                                52922BEA1700507400A39146 /* CPTTheme.h */, 
     295                                52922BEB1700507400A39146 /* CPTTimeFormatter.h */, 
     296                                52922BEC1700507400A39146 /* CPTTradingRangePlot.h */, 
     297                                52922BED1700507400A39146 /* CPTUtilities.h */, 
     298                                52922BEE1700507400A39146 /* CPTXYAxis.h */, 
     299                                52922BEF1700507400A39146 /* CPTXYAxisSet.h */, 
     300                                52922BF01700507400A39146 /* CPTXYGraph.h */, 
     301                                52922BF11700507400A39146 /* CPTXYPlotSpace.h */, 
     302                                52922BF21700507400A39146 /* mainpage.h */, 
     303                                52922BF31700507400A39146 /* NSCoderExtensions.h */, 
     304                                52922BF41700507400A39146 /* NSDecimalNumberExtensions.h */, 
     305                                52922BF51700507400A39146 /* NSNumberExtensions.h */, 
     306                        ); 
     307                        path = CorePlotHeaders; 
     308                        sourceTree = "<group>"; 
     309                }; 
    148310/* End PBXGroup section */ 
    149311 
    … …  
    172334                        isa = PBXProject; 
    173335                        attributes = { 
    174                                 LastUpgradeCheck = 0450; 
     336                                LastUpgradeCheck = 0460; 
    175337                                ORGANIZATIONNAME = "Puzzlebox Productions, LLC"; 
    176338                        }; 
    … …  
    250412                                CLANG_ENABLE_OBJC_ARC = YES; 
    251413                                CLANG_WARN_EMPTY_BODY = YES; 
    252                                 CLANG_WARN_OBJCPP_ARC_ABI = NO; 
    253414                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 
    254415                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 
    … …  
    279440                                CLANG_ENABLE_OBJC_ARC = YES; 
    280441                                CLANG_WARN_EMPTY_BODY = YES; 
    281                                 CLANG_WARN_OBJCPP_ARC_ABI = NO; 
    282442                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; 
    283443                                "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; 
    … …  
    300460                                GCC_PRECOMPILE_PREFIX_HEADER = YES; 
    301461                                GCC_PREFIX_HEADER = "Orbit/Orbit-Prefix.pch"; 
     462                                GCC_VERSION = ""; 
     463                                HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Orbit\"/**"; 
     464                                "HEADER_SEARCH_PATHS[arch=*]" = ""; 
    302465                                INFOPLIST_FILE = "Orbit/Orbit-Info.plist"; 
    303466                                IPHONEOS_DEPLOYMENT_TARGET = 5.0; 
    … …  
    306469                                        "\"$(SRCROOT)/Orbit\"", 
    307470                                ); 
     471                                "OTHER_LDFLAGS[arch=*]" = "-ObjC"; 
    308472                                PRODUCT_NAME = "$(TARGET_NAME)"; 
    309473                                WRAPPER_EXTENSION = app; 
    … …  
    317481                                GCC_PRECOMPILE_PREFIX_HEADER = YES; 
    318482                                GCC_PREFIX_HEADER = "Orbit/Orbit-Prefix.pch"; 
     483                                HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Orbit\"/**"; 
     484                                "HEADER_SEARCH_PATHS[arch=*]" = ""; 
    319485                                INFOPLIST_FILE = "Orbit/Orbit-Info.plist"; 
    320486                                IPHONEOS_DEPLOYMENT_TARGET = 5.0; 
    … …  
    323489                                        "\"$(SRCROOT)/Orbit\"", 
    324490                                ); 
     491                                "OTHER_LDFLAGS[arch=*]" = "-ObjC"; 
    325492                                PRODUCT_NAME = "$(TARGET_NAME)"; 
    326493                                WRAPPER_EXTENSION = app; 
Note: See TracChangeset for help on using the changeset viewer.