Skip to content
This repository has been archived by the owner on Dec 31, 2019. It is now read-only.

Commit

Permalink
Update frameworks to 3.1.78 with iOS 9 fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Corey Earwood committed Aug 24, 2015
1 parent e08d472 commit 845fc12
Show file tree
Hide file tree
Showing 67 changed files with 268 additions and 182 deletions.
4 changes: 0 additions & 4 deletions frameworks/OvalCompiler.framework/Headers/ovmlanguage.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,6 @@ enum OvmOpCodes {
kNumOpCodes
};

#ifndef OVM_ERROR_CODES
#define OVM_ERROR_CODES
// All of the error codes that can be used by the OVM
enum OvmErrorCodes {
ERR_NONE = 0, // No error
Expand Down Expand Up @@ -171,8 +169,6 @@ enum OvmErrorCodes {
ERR_SET_LIBRARY_FROM_LIBRARY, // Call set library function while the VM is executing library code
};

#endif

typedef unsigned char byte;

// All OVM data is in chunks of this size.
Expand Down
8 changes: 4 additions & 4 deletions frameworks/OvalCompiler.framework/Headers/platform_ovm.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
# define OVM_STREAMING_CODE_SIZE ((255*9)/4) // Assume best decompression ratio = 9
# define OVM_DECOMPRESSION_BUFFER_SIZE 20
// Total size for the OVM stack
# define OVM_STACK_SIZE 196
# define OVM_STACK_SIZE 384
// Total size for the associative array used
// for jump operations
# define OVM_JUMP_TABLE_SIZE 128
# define OVM_MEM_MAP_TABLE_SIZE 65
# define OVM_PLATFORM_OP_TABLE_SIZE 14
# define OVM_JUMP_TABLE_SIZE 192
# define OVM_MEM_MAP_TABLE_SIZE 66
# define OVM_PLATFORM_OP_TABLE_SIZE 15
// The call stack has a max depth for now
# define OVM_CALL_STACK_SIZE 32
// Build robot-specific functionality into the VM.
Expand Down
Binary file modified frameworks/OvalCompiler.framework/Info.plist
Binary file not shown.
Binary file modified frameworks/OvalCompiler.framework/OvalCompiler
Binary file not shown.
Binary file modified frameworks/OvalCompiler.framework/_CodeSignature/CodeDirectory
Binary file not shown.
10 changes: 5 additions & 5 deletions frameworks/OvalCompiler.framework/_CodeSignature/CodeResources
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
</data>
<key>Headers/ovmlanguage.h</key>
<data>
/FGoeb6OXH/Q2h1VVP85wsgFKiY=
n/O5wnXHCaJZv3fl0cIl6mvLImM=
</data>
<key>Headers/platform_ovm.h</key>
<data>
tDAstOnh1bGuV2dKDthGOeaMH5g=
27V3bQkxTzU1dpZSuKQLmpuAUYY=
</data>
<key>Headers/sphero_types.h</key>
<data>
1+JzAdJKODaLWRLqhOxWbhWlMuY=
</data>
<key>Info.plist</key>
<data>
aj0h7oPfI1s+8t6QHEoQZc1oPZ8=
SKoVwwbawVkuvSrf25KxN4qY2ag=
</data>
</dict>
<key>files2</key>
Expand All @@ -49,11 +49,11 @@
</data>
<key>Headers/ovmlanguage.h</key>
<data>
/FGoeb6OXH/Q2h1VVP85wsgFKiY=
n/O5wnXHCaJZv3fl0cIl6mvLImM=
</data>
<key>Headers/platform_ovm.h</key>
<data>
tDAstOnh1bGuV2dKDthGOeaMH5g=
27V3bQkxTzU1dpZSuKQLmpuAUYY=
</data>
<key>Headers/sphero_types.h</key>
<data>
Expand Down
Binary file modified frameworks/OvalCompiler.framework/_CodeSignature/CodeSignature
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@
@interface RKAppUtils : NSObject

+ (BOOL)isAppActive;
+ (BOOL)isAppForeground;

@end
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ typedef NS_ENUM(uint8_t, RKCoreCommandIdType) {
RKCoreCommandGoToSleep = 0x22,
RKCoreCommandSetVoltageTripPoints = 0x24,
RKCoreCommandSetInactivityTimeout = 0x25,
RKCoreCommandGetFactoryConfigBlockCRC = 0x27,
RKCoreCommandJumpToBootloader = 0x30,
RKCoreCommandLevel1Diagnostic = 0x40,
RKCoreCommandAssignTimeValue = 0x50,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// RKForceRechargeCommand.h
// RobotCommandKit
//
// Created by wes on 7/23/15.
// Copyright (c) 2015 Orbotix Inc. All rights reserved.
//

#import <RobotCommandKit/RobotCommandKit.h>

@interface RKForceChargeCommand : RKDeviceCommand

+ (id) command;

@end
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@

@interface RKReadOdometerResponse : RKDeviceResponse

@property (readonly) uint32_t distanceInMeters;
@property (readonly) uint32_t distanceInCentimeters;

@end
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,18 @@ typedef void (^RKDeviceResponseBlock)(RKDeviceResponse* response);
-(void) handleResponseString:(NSString*) stringResponse forRobot:(id<RKRobotBase>) robot;
-(void) handleAsyncMessage:(RKAsyncMessage*) message forRobot:(id<RKRobotBase>) robot;


//#pragma mark - responses
//-(void) handleReadOdometerResponse:(RKGetOdometerResponse*) response forRobot:(id<RKRobotBase>) robot;
//
//
//#pragma mark - unsolicted robot messages
//
//-(void) handleSleepWillOccurAsyncMessage:(RKSleepWillOccurMessage*) msg forRobot:(id<RKRobotBase>) robot;
//-(void) handleSleepDidOccurAsyncMessage:(RKSleepDidOccurMessage*) msg forRobot:(id<RKRobotBase>) robot;
//-(void) handleCollisionDetectedAsyncMessage:(RKCollisionDetectedAsyncData*) msg forRobot:(id<RKRobotBase>) robot;
//-(void) handleSensorsAsyncData:(RKDeviceSensorsAsyncData*) msg forRobot:(id<RKRobotBase>) robot;
//[self registerClass:[RKSelfLevelCompleteAsyncData class]];
//[self registerClass:[RKPowerNotificationAsyncData class]];

@end
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ typedef NS_OPTIONS(uint64_t, RKDataStreamingMask) {
/*! Mask to register for locator streaming of y velocity - ONLY FOR FIRMWARE 1.17 OR GREATER */
RKDataStreamingMaskVelocityY = 0x0080000000000000,

/*! Convenience mask to register for all gyro filtered data (x, y, z) */
RKDataStreamingMaskGyroFilteredAll = 0x0000000000001C00,
/*! Convenience mask to register for all IMU gyro angle filtered data (roll, pitch, yaw) */
RKDataStreamingMaskIMUAnglesFilteredAll = 0x0000000000070000,
/*! Convenience mask to register for all filtered accelerometer data (x-axis, y-axis, z-axis) */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,32 @@

#import <Foundation/Foundation.h>

typedef NS_ENUM(int, RKStatKey) {
RKStatKeyDistanceDriven = 0,
RKStatKeyRGBChange = 1,
RKStatKeyMacroRun = 2,
RKStatKeyCollision = 3,
RKStatKeyBluetoothConnectionEvent = 4,
RKStatKeyConnectTime = 5,
RKStatKeyOdometer = 6,
RKStatKeyRobotProfile = 7,
typedef NS_ENUM(uint8_t, RKStatKey) {
RKStatKeyDistanceDriven,
RKStatKeyRGBChange,
RKStatKeyMacroRun,
RKStatKeyCollision,
RKStatKeyBluetoothConnectionEvent,
RKStatKeyConnectTime,
RKStatKeyOdometer,
RKStatKeyRobotProfile,
};

typedef NS_ENUM(uint8_t, RKStatDataKey) {
RKStatDataKeyId,
RKStatDataKeyTime,
RKStatDataKeyValue,
RKStatDataKeyCm,
RKStatDataKeyHex,
RKStatDataKeyName,
RKStatDataKeySerialNumber,
RKStatDataKeyModel,
RKStatDataKeyMainApp,
RKStatDataKeyBootloader,
RKStatDataKeyRadioFirmware,
RKStatDataKeySku,
RKStatDataKeyChassisId,
RKStatDataKeyFactoryConfigBlockCRC,
};

@interface RKStat : NSObject
Expand All @@ -23,7 +40,8 @@ typedef NS_ENUM(int, RKStatKey) {

+ (instancetype)statWithKey:(RKStatKey)key mac:(NSString *)mac;

- (void)addDataToStatWithKey:(NSString *)key value:(NSString *)value;
- (void)addDataToStatWithKey:(RKStatDataKey)key value:(NSString *)value;
- (void)addDataToStatWithKey:(RKStatDataKey)key uintValue:(uint32_t)uintValue;

- (NSDictionary *)getDataDictionary;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
@interface RKStatEventListener : NSObject <RKResponseObserver>

+ (instancetype)sharedListener;

+ (instancetype)new NS_UNAVAILABLE;
- (instancetype)init NS_UNAVAILABLE;

- (void)startListener;
- (void)stopListener;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// RKTemperatureCommand.h
// RobotCommandKit
//
// Created by Adam Wilson on 5/18/15.
// Copyright (c) 2015 Orbotix Inc. All rights reserved.
//

#import <RobotCommandKit/RobotCommandKit.h>

@interface RKTemperatureCommand : RKDeviceCommand

+(id) command;

@end
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// RKTemperatureResponse.h
// RobotCommandKit
//
// Created by Adam Wilson on 5/18/15.
// Copyright (c) 2015 Orbotix Inc. All rights reserved.
//

#import <RobotCommandKit/RobotCommandKit.h>

@interface RKTemperatureResponse : RKDeviceResponse

@property (strong, nonatomic) NSNumber* temperature;


@end
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
#import "RKSetPIDCommand.h"
#import "RKGetSkuCommand.h"
#import "FWLevel1DiagnosticCommand.h"
#import "RKForceChargeCommand.h"

#pragma mark - LEDS
#import "RKGetUserRGBLEDColorCommand.h"
Expand Down Expand Up @@ -154,6 +155,9 @@
#import "RKTypes.h"


#import "RKTemperatureCommand.h"
#import "RKTemperatureResponse.h"

#define SYSTEM_VERSION_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedSame)
#define SYSTEM_VERSION_GREATER_THAN(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] == NSOrderedDescending)
#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) ([[[UIDevice currentDevice] systemVersion] compare:v options:NSNumericSearch] != NSOrderedAscending)
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 845fc12

Please sign in to comment.