Skip to content

Commit

Permalink
Upgrade to v3.1.9 (#6)
Browse files Browse the repository at this point in the history
* Upgrade brother printer SDK to 3.1.9

* Bump cocoapods version
  • Loading branch information
LFabien authored Nov 9, 2018
1 parent bc38076 commit 627c337
Show file tree
Hide file tree
Showing 15 changed files with 406 additions and 115 deletions.
4 changes: 2 additions & 2 deletions BRPtouchPrinterKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Pod::Spec.new do |s|
#

s.name = "BRPtouchPrinterKit"
s.version = "3.1.6"
s.version = "3.1.9"
s.summary = "Brother Print SDK for iPhone/iPad."

s.description = <<-DESC
Expand Down Expand Up @@ -73,7 +73,7 @@ Pod::Spec.new do |s|
# Supports git, hg, bzr, svn and HTTP.
#

s.source = { :git => "https://github.com/envoy/BRPtouchPrinterKit.git", :tag => "3.1.6" }
s.source = { :git => "https://github.com/envoy/BRPtouchPrinterKit.git", :tag => "3.1.9" }


# ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// BRPtouchBLEManager.h
// BRPtouchPrinterKit
//
// Copyright (c) 2017-2018 Brother Industries, Ltd. All rights reserved.
//

#import <Foundation/Foundation.h>
#import "BRPtouchDeviceInfo.h"
#import <CoreBluetooth/CoreBluetooth.h>

@interface BRPtouchBLEManager : NSObject

+ (BRPtouchBLEManager *)sharedManager;

/**
Start searching BLE printers
@return NO if BLE is not available, otherwise YES
*/
typedef void (^BRBLEManagerSearchCompletionHandler)(BRPtouchDeviceInfo *deviceInfo);
- (BOOL)startSearchWithCompletionHandler:(BRBLEManagerSearchCompletionHandler)handler;

/**
Stop searching BLE printers
*/
- (void)stopSearch;

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// BRPtouchBatteryInfo.h
// BRPtouchPrinterKit
//
// Copyright (c) 2018 Brother Industries, Ltd. All rights reserved.
//
#import <Foundation/Foundation.h>

typedef NS_ENUM(NSUInteger, BRPtouchBatteryInfoBatteryHealthStatus) {
BRPtouchBatteryInfoBatteryHealthStatusExcellent,
BRPtouchBatteryInfoBatteryHealthStatusGood,
BRPtouchBatteryInfoBatteryHealthStatusReplaceSoon,
BRPtouchBatteryInfoBatteryHealthStatusReplaceBattery,
BRPtouchBatteryInfoBatteryHealthStatusNotInstalled,
};

@interface BRPtouchBatteryInfo : NSObject
@property (nonatomic, readonly) int8_t batteryChargeLevel; // 0~100[%] Not Installed: -1
@property (nonatomic, readonly) int8_t batteryHealthLevel; // 0~100[%] Not Installed: -1
@property (nonatomic, readonly) BRPtouchBatteryInfoBatteryHealthStatus batteryHealthStatus;

- (instancetype)initWithChargeLevel:(int8_t)chargeLevel
healthLevel:(int8_t)healthLevel
healthStatusData:(int8_t)healthStatusData;

@end
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// BRPtouchBluetoothManager.h
// BRSearchModule
//
// Copyright (c) 2017 Brother. All rights reserved.
// Copyright (c) 2015-2018 Brother Industries, Ltd. All rights reserved.
//


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,21 @@
// BRPtouchDevice.h
// BRSearchModule
//
// Copyright (c) 2017 Brother. All rights reserved.
// Copyright (c) 2015-2018 Brother Industries, Ltd. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface BRPtouchDeviceInfo : NSObject

@property (copy,nonatomic)NSString* strIPAddress;
@property (copy,nonatomic)NSString* strLocation;
@property (copy,nonatomic)NSString* strModelName;
@property (copy,nonatomic)NSString* strPrinterName;
@property (copy,nonatomic)NSString* strSerialNumber;
@property (copy,nonatomic)NSString* strNodeName;
@property (copy,nonatomic)NSString* strMACAddress;
@property (copy,nonatomic)NSString* strIPAddress;
@property (copy,nonatomic)NSString* strLocation;
@property (copy,nonatomic)NSString* strModelName;
@property (copy,nonatomic)NSString* strPrinterName;
@property (copy,nonatomic)NSString* strSerialNumber;
@property (copy,nonatomic)NSString* strNodeName;
@property (copy,nonatomic)NSString* strMACAddress;
@property (copy,nonatomic)NSString* strBLEAdvertiseLocalName;

- (NSString *)description;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
//
// BRPtouchLabelInfo.h
// BRPtouchPrinterKit
//
// Copyright (c) 2016-2018 Brother Industries, Ltd. All rights reserved.
//

#import <Foundation/Foundation.h>

typedef NS_ENUM(NSUInteger, LabelIdType) {

//QL
LabelIdTypeW17H54 = 0x01,
LabelIdTypeW17H87 = 0x02,
LabelIdTypeW23H23 = 0x03,
LabelIdTypeW29H42 = 0x04,
LabelIdTypeW29H90 = 0x05,
LabelIdTypeW38H90 = 0x06,
LabelIdTypeW39H48 = 0x07,
LabelIdTypeW52H29 = 0x08,
LabelIdTypeW62H29 = 0x09,
LabelIdTypeW62H100 = 0x0a,
LabelIdTypeW12 = 0x0b, //also used in PT
LabelIdTypeW29 = 0xc,
LabelIdTypeW38 = 0xd,
LabelIdTypeW50 = 0xe,
LabelIdTypeW54 = 0xf,
LabelIdTypeW62 = 0x10,
LabelIdTypeW60H86 = 0x11,

//PT
LabelIdTypeW3_5 = 0x12,
LabelIdTypeW6 = 0x13,
LabelIdTypeW9 = 0x14,
LabelIdTypeW18 = 0x15,
LabelIdTypeW24 = 0x16,
LabelIdTypeHS_W6 = 0x17,
LabelIdTypeHS_W9 = 0x18,
LabelIdTypeHS_W12 = 0x19,
LabelIdTypeHS_W18 = 0x1a,
LabelIdTypeHS_W24 = 0x1b,
LabelIdTypeW36 = 0x1c,

LabelIdTypeR6_5 = 0x1d,
LabelIdTypeR6_0 = 0x1f,
LabelIdTypeR5_0 = 0x20,
LabelIdTypeR4_0 = 0x21,
LabelIdTypeR3_5 = 0x22,
LabelIdTypeR3_0 = 0x23,
LabelIdTypeR2_5 = 0x24,

LabelIdTypeFLE_W21H45 = 0x25,

//QL-8対応
LabelIdTypeW62RB = 0x26,
LabelIdTypeW54H29 = 0x27,

//QL_1100
LabelIdTypeW102 = 0x28,
LabelIdTypeW102H51 = 0x29,
LabelIdTypeW102H152 = 0x30,
LabelIdTypeW103 = 0x31,
LabelIdTypeW103H164 = 0x32,
LabelIdTypeDT_W90 = 0x33,
LabelIdTypeDT_W102 = 0x34,
LabelIdTypeDT_W102H51 = 0x35,
LabelIdTypeDT_W102H152 = 0x36,

LabelIdTypeLABEL_MAX

};

typedef NS_ENUM(NSUInteger, ColorType) {
WHITE = 0x01,
OTHERS,
CLEAR,
RED,
BLUE,
YELLOW,
GREEN,
BLACK,
CLEAR_WHITE,
GOLD = 0x0A ,
GOLD_PREMIUM = 0x0B,
SILVER_PREMIUM = 0x0C,
OTHERS_PREMIUM = 0x0D,
OTHERS_MASKING = 0x0E,
MATTE_WHITE = 0x20,
MATTE_CLEAR,
MATTE_SILVER,
SATIN_GOLD,
SATIN_SILVER = 0x24,
BLUE_WHITE = 0x30,
RED_WHITE = 0x31,
FLOURESCENT_ORANGE = 0x40,
FLOURESCENT_YELLOW = 0x41,
BERRY_PINK = 0x50,
LIGHT_GLAY,
LIME_GREEN = 0x52,
FABRIC_YELLOW = 0x60,
FABRIC_PINK = 0x61,
FABRIC_BLUE = 0x62,
TUBE_WHITE = 0x70,
SELF_WHITE = 0x80,
FLEXIBLE_WHITE = 0x90,
FLEXIBLE_YELLOW = 0x91,
CLEANING = 0xF0,
STENCIL = 0xF1,
UNSUPPORT = 0xFF,
};

@interface BRPtouchLabelInfoStatus : NSObject
@property (nonatomic) LabelIdType labelID;
@property (nonatomic) ColorType labelColor;
@property (nonatomic) ColorType fontColor;

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
//
// BRPtouchLabelParam.h
// BRPtouchPrinterKit
//
// Copyright (c) 2016-2018 Brother Industries, Ltd. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface BRPtouchLabelParam : NSObject
@property (nonatomic) unsigned int paperID;
@property (nonatomic, copy) NSString* paperName;
@property (nonatomic) unsigned int paperSize;
@property (nonatomic) unsigned int pinOffsetLeft;
@property (nonatomic) unsigned int pinOffsetRight;
@property (nonatomic) unsigned int physicalOffsetX;
@property (nonatomic) unsigned int physicalOffsetY;
@property (nonatomic) unsigned int paperWidth; //dot
@property (nonatomic) float paperWidth_mm; //mm
@property (nonatomic) unsigned int paperLength; //dot
@property (nonatomic) float paperLength_mm; //mm
@property (nonatomic) unsigned int imageAreaWidth; //dot
@property (nonatomic) unsigned int imageAreaWidth_mm; //mm
@property (nonatomic) unsigned int imageAreaLength; //dot
@property (nonatomic) unsigned int imageAreaLength_mm; //mm

@end
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// BRPtouchNetwork.h
// BRPtouchPrinterKit
//
// Copyright (c) 2017 Brother Industries, Ltd. All rights reserved.
// Copyright (c) 2012-2018 Brother Industries, Ltd. All rights reserved.
//

#import <Foundation/Foundation.h>
Expand All @@ -15,8 +15,6 @@

@protocol BRPtouchNetworkDelegate;

@class PLNetworkModule;

@interface BRPtouchNetworkManager : NSObject <NSNetServiceBrowserDelegate,NSNetServiceDelegate>


Expand All @@ -39,6 +37,8 @@

@protocol BRPtouchNetworkDelegate <NSObject>

-(void) didFinishSearch:(id)sender;
- (void)didFinishSearch:(id)sender;
@optional
- (void)didFindDevice:(BRPtouchDeviceInfo *)deviceInfo;

@end
Loading

0 comments on commit 627c337

Please sign in to comment.