diff --git a/basalt.png b/basalt.png new file mode 100644 index 0000000..80f33e1 Binary files /dev/null and b/basalt.png differ diff --git a/build/appinfo.json b/build/appinfo.json index 27eb74c..4cd6e22 100644 --- a/build/appinfo.json +++ b/build/appinfo.json @@ -1,7 +1,12 @@ { - "versionLabel": "1.0", + "targetPlatforms": [ + "basalt", + "diorite" + ], "projectType": "rocky", - "name": "Geiger Counter", + "watchapp": { + "watchface": true + }, "messageKeys": { "ControlKeyResetRequest": 1, "ControlKeyUnsupportedError": 4, @@ -10,26 +15,25 @@ }, "companyName": "Zahkc", "enableMultiJS": true, + "versionLabel": "1.0", + "longName": "geiger", + "shortName": "geiger", + "name": "Geiger Counter", "sdkVersion": "3", - "capabilities": [], + "displayName": "geiger", + "uuid": "a426b361-f97e-4934-8581-4e1cb299b74a", "appKeys": { "ControlKeyResetRequest": 1, "ControlKeyUnsupportedError": 4, "ControlKeyChunk": 3, "ControlKeyResetComplete": 2 }, - "watchapp": { - "watchface": true - }, - "longName": "geiger", - "displayName": "geiger", - "shortName": "geiger", + "capabilities": [], "main": { "rockyjs": "src/rocky/index.js", "pkjs": "src/pkjs/index.js" }, "resources": { "media": [] - }, - "uuid": "a426b361-f97e-4934-8581-4e1cb299b74a" + } } \ No newline at end of file diff --git a/build/basalt/app_resources.pbpack b/build/basalt/app_resources.pbpack index 03dbe57..224b6d1 100644 Binary files a/build/basalt/app_resources.pbpack and b/build/basalt/app_resources.pbpack differ diff --git a/build/basalt/appinfo.auto.c.21.o b/build/basalt/appinfo.auto.c.21.o new file mode 100644 index 0000000..2e5183b Binary files /dev/null and b/build/basalt/appinfo.auto.c.21.o differ diff --git a/build/basalt/pebble-app.bin b/build/basalt/pebble-app.bin index 75b77d1..5ebcaa3 100644 Binary files a/build/basalt/pebble-app.bin and b/build/basalt/pebble-app.bin differ diff --git a/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.bytecode b/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.bytecode index e0d530a..5ab63dc 100644 Binary files a/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.bytecode and b/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.bytecode differ diff --git a/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.reso b/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.reso index 60bd8d4..4d530fe 100644 Binary files a/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.reso and b/build/basalt/resources/rocky-app.js.JS_SNAPSHOT.reso differ diff --git a/build/basalt/src/resource_ids.auto.c.21.o b/build/basalt/src/resource_ids.auto.c.21.o new file mode 100644 index 0000000..0590359 Binary files /dev/null and b/build/basalt/src/resource_ids.auto.c.21.o differ diff --git a/build/basalt/src/rocky.c.21.o b/build/basalt/src/rocky.c.21.o new file mode 100644 index 0000000..f78c7b0 Binary files /dev/null and b/build/basalt/src/rocky.c.21.o differ diff --git a/build/basalt/system_resources.resball b/build/basalt/system_resources.resball index 271679b..3e83347 100644 Binary files a/build/basalt/system_resources.resball and b/build/basalt/system_resources.resball differ diff --git a/build/basalt_snapshot_size.json b/build/basalt_snapshot_size.json index 13e70d0..cfff5f3 100644 --- a/build/basalt_snapshot_size.json +++ b/build/basalt_snapshot_size.json @@ -1 +1 @@ -{"size":3452,"max":24576} \ No newline at end of file +{"size":3436,"max":24576} \ No newline at end of file diff --git a/build/c4che/_cache.py b/build/c4che/_cache.py index b550eb0..45746ba 100644 --- a/build/c4che/_cache.py +++ b/build/c4che/_cache.py @@ -15,13 +15,13 @@ NODE_PATH = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules' PEBBLE_SDK_COMMON = '/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/common' PEBBLE_SDK_ROOT = '/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble' PREFIX = '/usr/local' -PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'watchapp': {u'watchface': True}, 'versionLabel': u'1.0', 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} -REQUESTED_PLATFORMS = [] +PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'targetPlatforms': [u'basalt', u'diorite'], 'versionLabel': u'1.0', u'watchapp': {u'watchface': True}, 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} +REQUESTED_PLATFORMS = [u'basalt', u'diorite'] RESOURCES_JSON = [] SANDBOX = False SUPPORTED_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TARGET_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TIMESTAMP = 1691328646 +TARGET_PLATFORMS = ['diorite', 'basalt'] +TIMESTAMP = 1691330724 USE_GROUPS = True VERBOSE = 0 WEBPACK = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules/.bin/webpack' diff --git a/build/c4che/basalt_cache.py b/build/c4che/basalt_cache.py index aa8d8ad..23a9449 100644 --- a/build/c4che/basalt_cache.py +++ b/build/c4che/basalt_cache.py @@ -47,8 +47,8 @@ PEBBLE_SDK_ROOT = '/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble' PLATFORM = {'TAGS': ['basalt', 'color', 'rect', 'mic', 'strap', 'strappower', 'compass', 'health', '144w', '168h'], 'MAX_FONT_GLYPH_SIZE': 256, 'ADDITIONAL_TEXT_LINES_FOR_PEBBLE_H': [], 'MAX_APP_BINARY_SIZE': 65536, 'MAX_RESOURCES_SIZE': 1048576, 'MAX_APP_MEMORY_SIZE': 65536, 'MAX_WORKER_MEMORY_SIZE': 10240, 'NAME': 'basalt', 'BUNDLE_BIN_DIR': 'basalt', 'BUILD_DIR': 'basalt', 'MAX_RESOURCES_SIZE_APPSTORE': 262144, 'DEFINES': ['PBL_PLATFORM_BASALT', 'PBL_COLOR', 'PBL_RECT', 'PBL_MICROPHONE', 'PBL_SMARTSTRAP', 'PBL_HEALTH', 'PBL_COMPASS', 'PBL_SMARTSTRAP_POWER', 'PBL_DISPLAY_WIDTH=144', 'PBL_DISPLAY_HEIGHT=168']} PLATFORM_NAME = 'basalt' PREFIX = '/usr/local' -PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'watchapp': {u'watchface': True}, 'versionLabel': u'1.0', 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} -REQUESTED_PLATFORMS = [] +PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'targetPlatforms': [u'basalt', u'diorite'], 'versionLabel': u'1.0', u'watchapp': {u'watchface': True}, 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} +REQUESTED_PLATFORMS = [u'basalt', u'diorite'] RESOURCES_JSON = [] RPATH_ST = '-Wl,-rpath,%s' SANDBOX = False @@ -61,8 +61,8 @@ STLIBPATH_ST = '-L%s' STLIB_MARKER = None STLIB_ST = '-l%s' SUPPORTED_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TARGET_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TIMESTAMP = 1691328646 +TARGET_PLATFORMS = ['diorite', 'basalt'] +TIMESTAMP = 1691330724 USE_GROUPS = True VERBOSE = 0 WEBPACK = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules/.bin/webpack' diff --git a/build/c4che/build.config.py b/build/c4che/build.config.py index e52eb1e..74000fc 100644 --- a/build/c4che/build.config.py +++ b/build/c4che/build.config.py @@ -1,2 +1,2 @@ version = 0x1070b00 -tools = [{'tool': 'pebble_sdk_common', 'tooldir': None, 'funs': None}, {'tool': 'process_message_keys', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk', 'tooldir': None, 'funs': None}] +tools = [{'tool': 'pebble_sdk_common', 'tooldir': None, 'funs': None}, {'tool': 'process_message_keys', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'ar', 'tooldir': None, 'funs': None}, {'tool': 'c', 'tooldir': None, 'funs': None}, {'tool': 'gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk_gcc', 'tooldir': None, 'funs': None}, {'tool': 'pebble_sdk', 'tooldir': None, 'funs': None}] diff --git a/build/c4che/chalk_cache.py b/build/c4che/chalk_cache.py index 2d018ff..6009d7a 100644 --- a/build/c4che/chalk_cache.py +++ b/build/c4che/chalk_cache.py @@ -62,7 +62,7 @@ STLIB_MARKER = None STLIB_ST = '-l%s' SUPPORTED_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] TARGET_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TIMESTAMP = 1691328646 +TIMESTAMP = 1691330589 USE_GROUPS = True VERBOSE = 0 WEBPACK = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules/.bin/webpack' diff --git a/build/c4che/diorite_cache.py b/build/c4che/diorite_cache.py index 144b89d..ffcd521 100644 --- a/build/c4che/diorite_cache.py +++ b/build/c4che/diorite_cache.py @@ -47,8 +47,8 @@ PEBBLE_SDK_ROOT = '/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble' PLATFORM = {'TAGS': ['diorite', 'bw', 'rect', 'mic', 'strap', 'health', '144w', '168h'], 'MAX_FONT_GLYPH_SIZE': 256, 'ADDITIONAL_TEXT_LINES_FOR_PEBBLE_H': [], 'MAX_APP_BINARY_SIZE': 65536, 'MAX_RESOURCES_SIZE': 1048576, 'MAX_APP_MEMORY_SIZE': 65536, 'MAX_WORKER_MEMORY_SIZE': 10240, 'NAME': 'diorite', 'BUNDLE_BIN_DIR': 'diorite', 'BUILD_DIR': 'diorite', 'MAX_RESOURCES_SIZE_APPSTORE': 262144, 'DEFINES': ['PBL_PLATFORM_DIORITE', 'PBL_BW', 'PBL_RECT', 'PBL_MICROPHONE', 'PBL_HEALTH', 'PBL_SMARTSTRAP', 'PBL_DISPLAY_WIDTH=144', 'PBL_DISPLAY_HEIGHT=168']} PLATFORM_NAME = 'diorite' PREFIX = '/usr/local' -PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'watchapp': {u'watchface': True}, 'versionLabel': u'1.0', 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} -REQUESTED_PLATFORMS = [] +PROJECT_INFO = {'appKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, u'sdkVersion': u'3', u'projectType': u'rocky', u'uuid': u'a426b361-f97e-4934-8581-4e1cb299b74a', 'messageKeys': {'ControlKeyResetRequest': 1, 'ControlKeyUnsupportedError': 4, 'ControlKeyChunk': 3, 'ControlKeyResetComplete': 2}, 'companyName': u'Zahkc', u'enableMultiJS': True, u'targetPlatforms': [u'basalt', u'diorite'], 'versionLabel': u'1.0', u'watchapp': {u'watchface': True}, 'longName': u'geiger', u'displayName': u'geiger', 'shortName': u'geiger', u'main': {u'rockyjs': u'src/rocky/index.js', u'pkjs': u'src/pkjs/index.js'}, u'resources': {u'media': []}, 'name': u'Geiger Counter'} +REQUESTED_PLATFORMS = [u'basalt', u'diorite'] RESOURCES_JSON = [] RPATH_ST = '-Wl,-rpath,%s' SANDBOX = False @@ -61,8 +61,8 @@ STLIBPATH_ST = '-L%s' STLIB_MARKER = None STLIB_ST = '-l%s' SUPPORTED_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TARGET_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TIMESTAMP = 1691328646 +TARGET_PLATFORMS = ['diorite', 'basalt'] +TIMESTAMP = 1691330724 USE_GROUPS = True VERBOSE = 0 WEBPACK = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules/.bin/webpack' diff --git a/build/c4che/emery_cache.py b/build/c4che/emery_cache.py index 2d1619d..9e77bc9 100644 --- a/build/c4che/emery_cache.py +++ b/build/c4che/emery_cache.py @@ -62,7 +62,7 @@ STLIB_MARKER = None STLIB_ST = '-l%s' SUPPORTED_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] TARGET_PLATFORMS = ['emery', 'diorite', 'chalk', 'basalt'] -TIMESTAMP = 1691328646 +TIMESTAMP = 1691330589 USE_GROUPS = True VERBOSE = 0 WEBPACK = '/home/zahkc/.pebble-sdk/SDKs/current/node_modules/.bin/webpack' diff --git a/build/chalk/app_resources.pbpack b/build/chalk/app_resources.pbpack index 03dbe57..224b6d1 100644 Binary files a/build/chalk/app_resources.pbpack and b/build/chalk/app_resources.pbpack differ diff --git a/build/chalk/pebble-app.bin b/build/chalk/pebble-app.bin index 6f7f73a..fffbc9d 100644 Binary files a/build/chalk/pebble-app.bin and b/build/chalk/pebble-app.bin differ diff --git a/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.bytecode b/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.bytecode index e0d530a..5ab63dc 100644 Binary files a/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.bytecode and b/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.bytecode differ diff --git a/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.reso b/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.reso index 60bd8d4..4d530fe 100644 Binary files a/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.reso and b/build/chalk/resources/rocky-app.js.JS_SNAPSHOT.reso differ diff --git a/build/chalk/system_resources.resball b/build/chalk/system_resources.resball index 271679b..3e83347 100644 Binary files a/build/chalk/system_resources.resball and b/build/chalk/system_resources.resball differ diff --git a/build/chalk_snapshot_size.json b/build/chalk_snapshot_size.json index 13e70d0..cfff5f3 100644 --- a/build/chalk_snapshot_size.json +++ b/build/chalk_snapshot_size.json @@ -1 +1 @@ -{"size":3452,"max":24576} \ No newline at end of file +{"size":3436,"max":24576} \ No newline at end of file diff --git a/build/config.log b/build/config.log index 1beeb05..bd6926a 100644 --- a/build/config.log +++ b/build/config.log @@ -1,4 +1,4 @@ -# project configured on Sun Aug 6 23:30:46 2023 by +# project configured on Mon Aug 7 00:05:24 2023 by # waf 1.7.11 (abi 98, python 20712f0 on linux2) # using /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/waf configure # @@ -17,17 +17,6 @@ Checking for program node,nodejs /usr/bin/node find program=['node', 'nodejs'] paths=['/home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin', '/home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin', '/home/zahkc/.local/bin', '/home/zahkc/.local/bin/lvim', '/home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/bin', '/home/zahkc/gems/bin', '/home/zahkc/gems/bin', '/usr/local/bin', '/usr/bin', '/bin', '/usr/local/games', '/usr/games', '/snap/bin', '/home/zahkc/.dotnet', '/home/zahkc/.dotnet/tools'] var='NODE' -> '/usr/bin/node' ---------------------------------------- -Found Pebble SDK for emery in: -/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/emery ----------------------------------------- -Checking for program gcc,cc -arm-none-eabi-gcc -find program=['gcc', 'cc'] paths='' var='CC' -> 'arm-none-eabi-gcc' ----------------------------------------- -Checking for program ar -arm-none-eabi-ar -find program=['ar'] paths='' var='AR' -> 'arm-none-eabi-ar' ----------------------------------------- Found Pebble SDK for diorite in: /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/diorite ---------------------------------------- @@ -39,17 +28,6 @@ Checking for program ar arm-none-eabi-ar find program=['ar'] paths='' var='AR' -> 'arm-none-eabi-ar' ---------------------------------------- -Found Pebble SDK for chalk in: -/home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/chalk ----------------------------------------- -Checking for program gcc,cc -arm-none-eabi-gcc -find program=['gcc', 'cc'] paths='' var='CC' -> 'arm-none-eabi-gcc' ----------------------------------------- -Checking for program ar -arm-none-eabi-ar -find program=['ar'] paths='' var='AR' -> 'arm-none-eabi-ar' ----------------------------------------- Found Pebble SDK for basalt in: /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt ---------------------------------------- diff --git a/build/diorite/app_resources.pbpack b/build/diorite/app_resources.pbpack index 03dbe57..224b6d1 100644 Binary files a/build/diorite/app_resources.pbpack and b/build/diorite/app_resources.pbpack differ diff --git a/build/diorite/appinfo.auto.c.12.o b/build/diorite/appinfo.auto.c.12.o new file mode 100644 index 0000000..fea8ef8 Binary files /dev/null and b/build/diorite/appinfo.auto.c.12.o differ diff --git a/build/diorite/pebble-app.bin b/build/diorite/pebble-app.bin index f1ac9c5..95d41da 100644 Binary files a/build/diorite/pebble-app.bin and b/build/diorite/pebble-app.bin differ diff --git a/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.bytecode b/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.bytecode index e0d530a..5ab63dc 100644 Binary files a/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.bytecode and b/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.bytecode differ diff --git a/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.reso b/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.reso index 60bd8d4..4d530fe 100644 Binary files a/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.reso and b/build/diorite/resources/rocky-app.js.JS_SNAPSHOT.reso differ diff --git a/build/diorite/src/resource_ids.auto.c.12.o b/build/diorite/src/resource_ids.auto.c.12.o new file mode 100644 index 0000000..85f28e6 Binary files /dev/null and b/build/diorite/src/resource_ids.auto.c.12.o differ diff --git a/build/diorite/src/rocky.c.12.o b/build/diorite/src/rocky.c.12.o new file mode 100644 index 0000000..9752a75 Binary files /dev/null and b/build/diorite/src/rocky.c.12.o differ diff --git a/build/diorite/system_resources.resball b/build/diorite/system_resources.resball index 271679b..3e83347 100644 Binary files a/build/diorite/system_resources.resball and b/build/diorite/system_resources.resball differ diff --git a/build/diorite_snapshot_size.json b/build/diorite_snapshot_size.json index 13e70d0..cfff5f3 100644 --- a/build/diorite_snapshot_size.json +++ b/build/diorite_snapshot_size.json @@ -1 +1 @@ -{"size":3452,"max":24576} \ No newline at end of file +{"size":3436,"max":24576} \ No newline at end of file diff --git a/build/emery/app_resources.pbpack b/build/emery/app_resources.pbpack index 03dbe57..224b6d1 100644 Binary files a/build/emery/app_resources.pbpack and b/build/emery/app_resources.pbpack differ diff --git a/build/emery/pebble-app.bin b/build/emery/pebble-app.bin index 86dc572..bed259d 100644 Binary files a/build/emery/pebble-app.bin and b/build/emery/pebble-app.bin differ diff --git a/build/emery/resources/rocky-app.js.JS_SNAPSHOT.bytecode b/build/emery/resources/rocky-app.js.JS_SNAPSHOT.bytecode index e0d530a..5ab63dc 100644 Binary files a/build/emery/resources/rocky-app.js.JS_SNAPSHOT.bytecode and b/build/emery/resources/rocky-app.js.JS_SNAPSHOT.bytecode differ diff --git a/build/emery/resources/rocky-app.js.JS_SNAPSHOT.reso b/build/emery/resources/rocky-app.js.JS_SNAPSHOT.reso index 60bd8d4..4d530fe 100644 Binary files a/build/emery/resources/rocky-app.js.JS_SNAPSHOT.reso and b/build/emery/resources/rocky-app.js.JS_SNAPSHOT.reso differ diff --git a/build/emery/system_resources.resball b/build/emery/system_resources.resball index 271679b..3e83347 100644 Binary files a/build/emery/system_resources.resball and b/build/emery/system_resources.resball differ diff --git a/build/emery_snapshot_size.json b/build/emery_snapshot_size.json index 13e70d0..cfff5f3 100644 --- a/build/emery_snapshot_size.json +++ b/build/emery_snapshot_size.json @@ -1 +1 @@ -{"size":3452,"max":24576} \ No newline at end of file +{"size":3436,"max":24576} \ No newline at end of file diff --git a/build/geiger.pbw b/build/geiger.pbw index 5de5a04..efe32fb 100644 Binary files a/build/geiger.pbw and b/build/geiger.pbw differ diff --git a/build/pebble-rocky.map b/build/pebble-rocky.map index 7944e09..d53b03f 100644 --- a/build/pebble-rocky.map +++ b/build/pebble-rocky.map @@ -1,7 +1,7 @@ Archive member included because of file (symbol) /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) - basalt/src/rocky.c.41.o (window_create) + basalt/src/rocky.c.21.o (window_create) Discarded input sections @@ -17,24 +17,24 @@ Discarded input sections .jcr 0x0000000000000000 0x0 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o .tm_clone_table 0x0000000000000000 0x0 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o - .text 0x0000000000000000 0x0 basalt/src/rocky.c.41.o - .bss 0x0000000000000000 0x0 basalt/src/rocky.c.41.o - .text 0x0000000000000000 0x0 basalt/appinfo.auto.c.41.o - .bss 0x0000000000000000 0x0 basalt/appinfo.auto.c.41.o - .text 0x0000000000000000 0x0 basalt/src/resource_ids.auto.c.41.o - .bss 0x0000000000000000 0x0 basalt/src/resource_ids.auto.c.41.o + .text 0x0000000000000000 0x0 basalt/src/rocky.c.21.o + .bss 0x0000000000000000 0x0 basalt/src/rocky.c.21.o + .text 0x0000000000000000 0x0 basalt/appinfo.auto.c.21.o + .bss 0x0000000000000000 0x0 basalt/appinfo.auto.c.21.o + .text 0x0000000000000000 0x0 basalt/src/resource_ids.auto.c.21.o + .bss 0x0000000000000000 0x0 basalt/src/resource_ids.auto.c.21.o .data.RESOURCE_ID_JS_SNAPSHOT - 0x0000000000000000 0x4 basalt/src/resource_ids.auto.c.41.o - .text 0x0000000000000000 0x0 src/message_keys.auto.c.41.o - .bss 0x0000000000000000 0x0 src/message_keys.auto.c.41.o + 0x0000000000000000 0x4 basalt/src/resource_ids.auto.c.21.o + .text 0x0000000000000000 0x0 src/message_keys.auto.c.21.o + .bss 0x0000000000000000 0x0 src/message_keys.auto.c.21.o .data.MESSAGE_KEY_ControlKeyResetComplete - 0x0000000000000000 0x4 src/message_keys.auto.c.41.o + 0x0000000000000000 0x4 src/message_keys.auto.c.21.o .data.MESSAGE_KEY_ControlKeyUnsupportedError - 0x0000000000000000 0x4 src/message_keys.auto.c.41.o + 0x0000000000000000 0x4 src/message_keys.auto.c.21.o .data.MESSAGE_KEY_ControlKeyChunk - 0x0000000000000000 0x4 src/message_keys.auto.c.41.o + 0x0000000000000000 0x4 src/message_keys.auto.c.21.o .data.MESSAGE_KEY_ControlKeyResetRequest - 0x0000000000000000 0x4 src/message_keys.auto.c.41.o + 0x0000000000000000 0x4 src/message_keys.auto.c.21.o .bss 0x0000000000000000 0x0 /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) .text.accel_data_service_subscribe__deprecated 0x0000000000000000 0xc /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) @@ -1263,10 +1263,10 @@ Linker script and memory map LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crti.o LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o -LOAD basalt/src/rocky.c.41.o -LOAD basalt/appinfo.auto.c.41.o -LOAD basalt/src/resource_ids.auto.c.41.o -LOAD src/message_keys.auto.c.41.o +LOAD basalt/src/rocky.c.21.o +LOAD basalt/appinfo.auto.c.21.o +LOAD basalt/src/resource_ids.auto.c.21.o +LOAD src/message_keys.auto.c.21.o LOAD /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a START GROUP LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/libgcc.a @@ -1277,7 +1277,7 @@ LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-t .header 0x0000000000000000 0x82 *(.pbl_header) - .pbl_header 0x0000000000000000 0x82 basalt/appinfo.auto.c.41.o + .pbl_header 0x0000000000000000 0x82 basalt/appinfo.auto.c.21.o 0x0000000000000000 __pbl_app_info .note.gnu.build-id @@ -1293,7 +1293,7 @@ LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-t .text 0x00000000000000a8 0x14 /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) *(.text.*) .text.startup.main - 0x00000000000000bc 0x16 basalt/src/rocky.c.41.o + 0x00000000000000bc 0x16 basalt/src/rocky.c.21.o 0x00000000000000bc main *fill* 0x00000000000000d2 0x2 .text.window_create @@ -1331,10 +1331,10 @@ LOAD /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-t .data 0x00000000000000f8 0x0 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crti.o .data 0x00000000000000f8 0x4 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o 0x00000000000000f8 __dso_handle - .data 0x00000000000000fc 0x0 basalt/src/rocky.c.41.o - .data 0x00000000000000fc 0x0 basalt/appinfo.auto.c.41.o - .data 0x00000000000000fc 0x0 basalt/src/resource_ids.auto.c.41.o - .data 0x00000000000000fc 0x0 src/message_keys.auto.c.41.o + .data 0x00000000000000fc 0x0 basalt/src/rocky.c.21.o + .data 0x00000000000000fc 0x0 basalt/appinfo.auto.c.21.o + .data 0x00000000000000fc 0x0 basalt/src/resource_ids.auto.c.21.o + .data 0x00000000000000fc 0x0 src/message_keys.auto.c.21.o .data 0x00000000000000fc 0x0 /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) .data 0x00000000000000fc 0x0 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtend.o .data 0x00000000000000fc 0x0 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtn.o @@ -1361,13 +1361,13 @@ OUTPUT(/home/zahkc/Documents/Projects/Pebble/geiger/build/basalt/pebble-app.elf .ARM.attributes 0x0000000000000019 0x29 /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o .ARM.attributes - 0x0000000000000042 0x33 basalt/src/rocky.c.41.o + 0x0000000000000042 0x33 basalt/src/rocky.c.21.o .ARM.attributes - 0x0000000000000075 0x33 basalt/appinfo.auto.c.41.o + 0x0000000000000075 0x33 basalt/appinfo.auto.c.21.o .ARM.attributes - 0x00000000000000a8 0x33 basalt/src/resource_ids.auto.c.41.o + 0x00000000000000a8 0x33 basalt/src/resource_ids.auto.c.21.o .ARM.attributes - 0x00000000000000db 0x33 src/message_keys.auto.c.41.o + 0x00000000000000db 0x33 src/message_keys.auto.c.21.o .ARM.attributes 0x000000000000010e 0x21 /home/zahkc/.pebble-sdk/SDKs/current/sdk-core/pebble/basalt/lib/libpebble.a(tmpFRPTsFpebble.o) .ARM.attributes @@ -1378,55 +1378,55 @@ OUTPUT(/home/zahkc/Documents/Projects/Pebble/geiger/build/basalt/pebble-app.elf .comment 0x0000000000000000 0x4e .comment 0x0000000000000000 0x4e /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtbegin.o 0x4f (size before relaxing) - .comment 0x0000000000000000 0x4f basalt/src/rocky.c.41.o - .comment 0x0000000000000000 0x4f basalt/appinfo.auto.c.41.o - .comment 0x0000000000000000 0x4f basalt/src/resource_ids.auto.c.41.o - .comment 0x0000000000000000 0x4f src/message_keys.auto.c.41.o + .comment 0x0000000000000000 0x4f basalt/src/rocky.c.21.o + .comment 0x0000000000000000 0x4f basalt/appinfo.auto.c.21.o + .comment 0x0000000000000000 0x4f basalt/src/resource_ids.auto.c.21.o + .comment 0x0000000000000000 0x4f src/message_keys.auto.c.21.o .comment 0x0000000000000000 0x4f /home/zahkc/Documents/Pebble/pebble-dev/pebble-sdk-4.6-rc2-linux64/arm-cs-tools/bin/../lib/gcc/arm-none-eabi/4.7.2/thumb2/crtend.o .debug_info 0x0000000000000000 0x5fd - .debug_info 0x0000000000000000 0x15b basalt/src/rocky.c.41.o - .debug_info 0x000000000000015b 0x36a basalt/appinfo.auto.c.41.o - .debug_info 0x00000000000004c5 0x81 basalt/src/resource_ids.auto.c.41.o - .debug_info 0x0000000000000546 0xb7 src/message_keys.auto.c.41.o + .debug_info 0x0000000000000000 0x15b basalt/src/rocky.c.21.o + .debug_info 0x000000000000015b 0x36a basalt/appinfo.auto.c.21.o + .debug_info 0x00000000000004c5 0x81 basalt/src/resource_ids.auto.c.21.o + .debug_info 0x0000000000000546 0xb7 src/message_keys.auto.c.21.o .debug_abbrev 0x0000000000000000 0x22c - .debug_abbrev 0x0000000000000000 0x106 basalt/src/rocky.c.41.o - .debug_abbrev 0x0000000000000106 0x9e basalt/appinfo.auto.c.41.o - .debug_abbrev 0x00000000000001a4 0x44 basalt/src/resource_ids.auto.c.41.o - .debug_abbrev 0x00000000000001e8 0x44 src/message_keys.auto.c.41.o + .debug_abbrev 0x0000000000000000 0x106 basalt/src/rocky.c.21.o + .debug_abbrev 0x0000000000000106 0x9e basalt/appinfo.auto.c.21.o + .debug_abbrev 0x00000000000001a4 0x44 basalt/src/resource_ids.auto.c.21.o + .debug_abbrev 0x00000000000001e8 0x44 src/message_keys.auto.c.21.o .debug_loc 0x0000000000000000 0x20 - .debug_loc 0x0000000000000000 0x20 basalt/src/rocky.c.41.o + .debug_loc 0x0000000000000000 0x20 basalt/src/rocky.c.21.o .debug_aranges 0x0000000000000000 0x68 .debug_aranges - 0x0000000000000000 0x20 basalt/src/rocky.c.41.o + 0x0000000000000000 0x20 basalt/src/rocky.c.21.o .debug_aranges - 0x0000000000000020 0x18 basalt/appinfo.auto.c.41.o + 0x0000000000000020 0x18 basalt/appinfo.auto.c.21.o .debug_aranges - 0x0000000000000038 0x18 basalt/src/resource_ids.auto.c.41.o + 0x0000000000000038 0x18 basalt/src/resource_ids.auto.c.21.o .debug_aranges - 0x0000000000000050 0x18 src/message_keys.auto.c.41.o + 0x0000000000000050 0x18 src/message_keys.auto.c.21.o .debug_ranges 0x0000000000000000 0x10 - .debug_ranges 0x0000000000000000 0x10 basalt/src/rocky.c.41.o + .debug_ranges 0x0000000000000000 0x10 basalt/src/rocky.c.21.o .debug_line 0x0000000000000000 0x499 - .debug_line 0x0000000000000000 0x18a basalt/src/rocky.c.41.o - .debug_line 0x000000000000018a 0x156 basalt/appinfo.auto.c.41.o - .debug_line 0x00000000000002e0 0xe0 basalt/src/resource_ids.auto.c.41.o - .debug_line 0x00000000000003c0 0xd9 src/message_keys.auto.c.41.o + .debug_line 0x0000000000000000 0x18a basalt/src/rocky.c.21.o + .debug_line 0x000000000000018a 0x156 basalt/appinfo.auto.c.21.o + .debug_line 0x00000000000002e0 0xe0 basalt/src/resource_ids.auto.c.21.o + .debug_line 0x00000000000003c0 0xd9 src/message_keys.auto.c.21.o .debug_str 0x0000000000000000 0x526 - .debug_str 0x0000000000000000 0x15b basalt/src/rocky.c.41.o + .debug_str 0x0000000000000000 0x15b basalt/src/rocky.c.21.o 0x194 (size before relaxing) - .debug_str 0x000000000000015b 0x30a basalt/appinfo.auto.c.41.o + .debug_str 0x000000000000015b 0x30a basalt/appinfo.auto.c.21.o 0x433 (size before relaxing) - .debug_str 0x0000000000000465 0x1f basalt/src/resource_ids.auto.c.41.o + .debug_str 0x0000000000000465 0x1f basalt/src/resource_ids.auto.c.21.o 0x103 (size before relaxing) - .debug_str 0x0000000000000484 0xa2 src/message_keys.auto.c.41.o + .debug_str 0x0000000000000484 0xa2 src/message_keys.auto.c.21.o 0x16e (size before relaxing) .debug_frame 0x0000000000000000 0x28 - .debug_frame 0x0000000000000000 0x28 basalt/src/rocky.c.41.o + .debug_frame 0x0000000000000000 0x28 basalt/src/rocky.c.21.o diff --git a/build/resources/rocky-app.js b/build/resources/rocky-app.js index 03e4890..d038e91 100644 --- a/build/resources/rocky-app.js +++ b/build/resources/rocky-app.js @@ -199,7 +199,7 @@ ); ctx.stroke(); - var minDeg = Math.abs((360/12 * (parseInt(timeData.hr)%12)) - 90); + var minDeg = (360/12 * (parseInt(timeData.hr)%12)) - 90; ctx.strokeStyle = 'white'; ctx.beginPath(); ctx.moveTo(1.25 * ctx.canvas.clientWidth/10, 8.55 * ctx.canvas.clientHeight/10); diff --git a/build/src/message_keys.auto.c.12.o b/build/src/message_keys.auto.c.12.o new file mode 100644 index 0000000..f7537e8 Binary files /dev/null and b/build/src/message_keys.auto.c.12.o differ diff --git a/build/src/message_keys.auto.c.21.o b/build/src/message_keys.auto.c.21.o new file mode 100644 index 0000000..f7537e8 Binary files /dev/null and b/build/src/message_keys.auto.c.21.o differ diff --git a/diorite.png b/diorite.png new file mode 100644 index 0000000..1286e31 Binary files /dev/null and b/diorite.png differ diff --git a/package.json b/package.json index b312578..9d1b9f9 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,10 @@ "projectType": "rocky", "sdkVersion": "3", "enableMultiJS": true, + "targetPlatforms": [ + "basalt", + "diorite" + ], "watchapp": { "watchface": true }, diff --git a/src/rocky/index.js b/src/rocky/index.js index 3559bad..fb28b92 100644 --- a/src/rocky/index.js +++ b/src/rocky/index.js @@ -146,7 +146,7 @@ rocky.on('draw', function(event) { ); ctx.stroke(); - var minDeg = Math.abs((360/12 * (parseInt(timeData.hr)%12)) - 90); + var minDeg = (360/12 * (parseInt(timeData.hr)%12)) - 90; ctx.strokeStyle = 'white'; ctx.beginPath(); ctx.moveTo(1.25 * ctx.canvas.clientWidth/10, 8.55 * ctx.canvas.clientHeight/10);