Merged in osx-migrate-to-develop-sdk (pull request PunchThrough#29)

Osx migrate to develop sdk
nazt · Mar 4, 2016 · dd62357 · dd62357
2 parents f649c82 + 481136b
commit dd62357
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Bean OSX Static Library/Bean OSX LibraryTests/TestPTDIntelHex.m b/Bean OSX Static Library/Bean OSX LibraryTests/TestPTDIntelHex.m
@@ -56,4 +56,13 @@ - (void)testFileToBytes
     XCTAssertTrue([hexBytes isEqualToData:self.expectedBytes]);
 }
 
+/**
+ *  Ensure PTDIntelHex sets the sketch name when it parses a sketch from an NSURL file object.
+ */
+- (void)testFileSetsName
+{
+    PTDIntelHex *hexObject = [PTDIntelHex intelHexFromFileURL:[NSURL fileURLWithPath:self.intelHexPath]];
+    XCTAssertTrue([hexObject.name isEqualToString:@"IntelHexSource"]);
+}
+
 @end
diff --git a/source/Helper/PTDIntelHex.h b/source/Helper/PTDIntelHex.h
@@ -2,7 +2,15 @@
 
 @interface PTDIntelHex : NSObject
 
-@property(nonatomic, strong) NSString *name;
+/**
+ *  The name of the sketch this hex was compiled from. Used by Bean Loaders to set the name of Bean's sketch.
+ */
+@property (nonatomic, strong) NSString *name;
+/**
+ *  The version prefix of the hardware this sketch is intended for.
+ *  For example, "1" = Bean, "2" = Bean+.
+ */
+@property (nonatomic, strong) NSString *beanHardwareVersion;
 
 /**
  *  Create a PTDIntelHex object from a string of Intel HEX data.
@@ -30,3 +38,4 @@
 - (NSData *)bytes;
 
 @end
+
diff --git a/source/Helper/PTDIntelHex.m b/source/Helper/PTDIntelHex.m
@@ -51,6 +51,9 @@ - (id)initWithFileURL:(NSURL *)file
         if (![self parseHexString:fileContents]) {
             return nil;
         }
+
+        // Set this object's name property to the filename (without .hex extension) of the NSURL file
+        _name = [[[file absoluteString] lastPathComponent] componentsSeparatedByString:@"."][0];
     }
     return self;
 }