Commit Graph

431 Commits

Author SHA1 Message Date
Shigeru KANEMOTO
0b469f69b6 Fix i18n not working after 277d5a7 (#277)
* Fix i18n not working after 277d5a7

The translation strings file in "core" package should have file names
"core-strings.json" or "core-jsdoc-strings.json".

* Enable ja translation

Rename "core-strings.json" to "core-jsdoc-strings.json".
Add new "core-strings.json" as a copy of the template.
Add two lines for the files in "pxt.json".
2016-10-17 11:13:38 -07:00
Peli de Halleux
f7ed06108d Inputorg (#275)
* use typescript from workspace

* fixed tracking in localhost

* updated ordering of input/radio
2016-10-11 19:36:00 -07:00
Richard Knoll
9f5ebdfb78 Adding advanced attribute to blocks and categories (#273) 2016-10-11 13:48:25 -07:00
Sam El-Husseini
277d5a721c rename "microbit" package to "core" #414 (#270)
* rename "microbit" package to "core" #414

* shouldn't edit the package id.

* updating package.json

* updated the wrong version

* missed updating pxt.json of tests
2016-10-10 16:21:50 -07:00
Brahma Giri Abhijith Chatra
a114dc32e7 Merge branch 'master' of https://github.com/Microsoft/pxt-microbit 2016-09-26 10:00:13 -07:00
Abhijith
019bc34d90 Fixing hover text /help window for blocks are not correct 2016-09-26 09:59:52 -07:00
Richard Knoll
0676d780ab Fixing beat fraction typo (#263) 2016-09-23 22:27:57 -07:00
Richard Knoll
15b1f95394 Add annotation to Note.C in music enum 2016-09-22 14:36:37 -07:00
Peli de Halleux
c90dfaa6e7 added headphone part 2016-09-15 23:50:52 -07:00
Peli de Halleux
02cd0e1da3 remove "receivednumberat" from blocks 2016-09-15 23:49:50 -07:00
Peli de Halleux
0f9dde0c4e convert event source/value into TD_ID shims 2016-09-15 23:49:14 -07:00
Peli de Halleux
086bcf372f remove dependencies on dal.d.ts 2016-09-09 13:43:41 -07:00
Michal Moskal
93770e5821 Merge branch 'master' of github.com:Microsoft/pxt-microbit 2016-09-09 10:17:35 +01:00
Michal Moskal
cb8e28beb0 Bump pxt-microbit-core to 0.5.0 2016-09-09 10:17:28 +01:00
Daryl Zuniga
c63e2c85f1 new part definitions (#247)
* working on new part definitions

* draft of new part definitions

* updates comments

* starting new allocator

* starting from the old allocator

* alloc internals renaming

* alloc minor renaming

* alloc internal renaming

* progress on new parts definition

* progress on new part defs allocator

* refactors BBLoc; progress on new allocator

* more progress on new allocator

* finishing new allocator

* deleting old allocator

* moves new allocator and part definitions

* porting to new part definitions

* refactors instructions for new definitions

* debugging new allocator

* fixes ground and power wire colros

* fixing new part definition bugs

* fixes wire end offsets; fixes NeoPixel placement

* fixes colorGroup issue

* fixes led matrix wiring

* naming tweaks

* fixes instructions regressions

* typo
2016-09-09 01:23:39 -07:00
Peli de Halleux
91a8d05e45 updated loc strings 2016-09-08 23:11:58 -07:00
Michal Moskal
6a7d1bd95c Support for object literals
bump pxt-microbit-core to 0.4.4
see https://github.com/Microsoft/pxt/issues/287
2016-09-07 16:27:28 +01:00
Michal Moskal
e0de55d689 Add pxtrt::runtimeWarning() support; see https://github.com/Microsoft/pxt/issues/31 2016-09-02 17:29:40 +01:00
Michal Moskal
9a2367cf8e Add dummy implementations for some bluetooth functions to avoid crashes 2016-09-02 16:03:55 +01:00
Peli de Halleux
a656fbbd7b embedding parts svg files in pxt.json 2016-09-01 16:24:12 -07:00
Peli de Halleux
e681cc8c97 added parts to microbit 2016-09-01 15:37:39 -07:00
Michal Moskal
a8b427fd89 Merge branch 'master' of github.com:Microsoft/pxt-microbit 2016-09-01 12:13:54 +01:00
Michal Moskal
79c23e2e2a Bump pxt-microbit-core to 0.4.2 with class support 2016-09-01 12:13:40 +01:00
Peli de Halleux
9085c98c7f merging TD_ID 2016-08-31 11:23:30 -07:00
Peli de Halleux
60f8dd8228 annotating note with TD_ID 2016-08-31 11:22:07 -07:00
darzu
008cbf543f adds "speaker" parts annotation 2016-08-30 11:17:15 -07:00
Michal Moskal
7b11a04727 Upgrade pxt-microbit-core to 0.4.1 2016-08-30 12:48:58 +02:00
Peli de Halleux
f4768d99ff Merge pull request #220 from Microsoft/parts
adds "parts" annotations
2016-08-26 12:00:59 -07:00
Michal Moskal
0023710209 String/ptr -> boolean helpers added 2016-08-26 13:14:48 +02:00
Michal Moskal
0756091e8c Remove st/ldglb (no longer used) 2016-08-26 11:09:18 +02:00
darzu
8b46698f50 adds "parts" annotations...
...to libs/microbit and libs/microbit-bluetooth
2016-08-22 08:48:48 -07:00
Shigeru KANEMOTO
b24b65abcd Call init() before using beatsPerMinute. 2016-08-18 22:19:03 +09:00
Shigeru KANEMOTO
2cc0523f9a Fix changeTempo() calculation 2016-08-18 22:13:12 +09:00
Michal Moskal
b1cf3246ae Revert "Use embedded version of microbit to avoid yotta build"
This reverts commit 8eb3376cf5.
2016-08-18 15:55:23 +03:00
Michal Moskal
8eb3376cf5 Use embedded version of microbit to avoid yotta build 2016-08-18 14:26:56 +03:00
Michal Moskal
b863d5663d Add buffer shift rotate tests (moved from pxt) 2016-08-18 10:52:19 +03:00
Peli de Halleux
9f31637000 support for max-duration in pulse-in 2016-08-17 11:35:54 -07:00
Peli de Halleux
8e811b913e adding pins.pulseIn API 2016-08-17 11:18:15 -07:00
Michal Moskal
719370f6b0 Use the new lambdas 2016-08-17 18:08:46 +03:00
Peli de Halleux
9159c297a5 added wait-micros function 2016-08-16 17:04:21 -07:00
Peli de Halleux
c99138b02e adding SPI support 2016-08-10 23:26:58 -07:00
Peli de Halleux
0e0275e496 doc fixes 2016-08-10 13:10:40 -07:00
Peli de Halleux
ffd4d96539 properly escape values in json payload 2016-08-10 09:28:22 -07:00
Thomas Denney
141420d337 Correct Bluetooth doc comment 2016-08-09 16:05:25 +01:00
Thomas Denney
084f83ba1b Merge branch 'master' of https://github.com/thomasdenney/pxt-microbit 2016-08-09 15:13:35 +01:00
Peli de Halleux
7481b9c24c call receiveNumber in onDataReceived to flush queue if needed (startup race)
fixed simulator issue when event onDataReceived gets raised
2016-08-08 16:54:43 -07:00
Peli de Halleux
de5def8dde adding led.toggle as a block 2016-08-08 16:53:55 -07:00
Peli de Halleux
20d0dd91ad added input.onPinRelease. Fix for #294 2016-08-08 15:23:18 -07:00
Peli de Halleux
825c6d57e7 testing fr jsdoc transtions 2016-08-08 13:47:45 -07:00
Peli de Halleux
b3edb81d3c adding URL for SEO 2016-08-08 13:08:15 -07:00
Peli de Halleux
f2c43c74ac support for start/length in buffer methods 2016-08-04 08:42:47 -07:00
Peli de Halleux
4e46682489 keep older value longer 2016-08-02 15:35:33 -07:00
Peli de Halleux
e329b3bd2e prepend all radio blocks with "radio" 2016-08-01 16:02:06 -07:00
Sam El-Husseini
c6ed665f84 Fix for issue 176: basic.showNumber timing in the simulator
- updated basic.cpp::showNumber to use printChar instead of print.
2016-07-28 15:04:56 -07:00
Michal Moskal
5b2e877aef Merge branch 'master' of github.com:Microsoft/pxt-microbit 2016-07-28 11:49:04 +01:00
Michal Moskal
dbcd9e535c Get generic part of lang-test from pxt-core package 2016-07-28 11:35:17 +01:00
Michal Moskal
63a26835b1 Format code 2016-07-27 19:32:58 +01:00
Peli de Halleux
573ed7f6f2 updated localization strings in bundled packages 2016-07-27 08:42:58 -07:00
Peli de Halleux
42c766b6d7 updated shim definition 2016-07-26 16:17:54 -07:00
Peli de Halleux
8440f7c763 adding "pin is pressed" block 2016-07-26 13:51:41 -07:00
Peli de Halleux
8add7e8efb updated radio strings / docs page 2016-07-26 08:47:45 -07:00
Michal Moskal
a9865a731a Moved to separate repos 2016-07-26 12:41:30 +01:00
Peli de Halleux
8e74965964 remove experiemental translations 2016-07-21 14:22:30 -07:00
Peli de Halleux
63913c2182 updated getting-started intro 2016-07-21 13:46:22 -07:00
Peli de Halleux
dd94442555 Merge pull request #173 from gingemonster/master
fixing more help broken links
2016-07-21 11:10:55 -07:00
Peli de Halleux
56f6a2fa56 Merge pull request #172 from gingemonster/patch-1
updated setPull help annotation
2016-07-21 11:10:15 -07:00
Michal Moskal
3c8027425a Fix order of arguments for memset() 2016-07-21 09:54:53 +01:00
gingemonster
20ac14fdf6 fixing more help documentation links
set-accelerometer-range was wrong so fixing reference to help doc
2016-07-20 10:44:32 +01:00
gingemonster
c805d67cf6 fixing help for pins.pulseDuration
Help document at https://codethemicrobit.com/reference/pins/pulse-duration doesnt match the help annotation in the code so this fixes it
2016-07-20 06:29:44 +01:00
gingemonster
943c2e7716 Fixing help annotation on serial.redirect
Code currently points to help at https://codethemicrobit.com/reference/serial/redirect but the working url is https://codethemicrobit.com/reference/serial/redirect-to so fixed the help annotation
2016-07-20 06:21:15 +01:00
gingemonster
298a37e576 updated setPull help annotation
At some point Im guessing the help file has been renamed and its current url is https://codethemicrobit.com/reference/pins/set-pull. This change to the annotation of setPull removes the word "digital" so that the link should work again
2016-07-20 06:14:18 +01:00
Thomas Denney
e942fb5733 Minor linting changes 2016-07-18 10:12:00 +01:00
Thomas Denney
6a1415b3e1 Default indentation for default project.
The editor lints the TS file every time it launches, might as well commit the change.
2016-07-15 15:39:16 +01:00
Thomas Denney
84a29eec65 Merge remote-tracking branch 'upstream/master' 2016-07-13 09:17:32 +01:00
Michal Moskal
c81e56613e Mark microbit DAL config as just defaults 2016-07-11 14:29:49 +02:00
Thomas Denney
a8e1d2a86c Fixed '@params' in Neopixel blocks' docs 2016-07-08 14:30:45 +01:00
Michal Moskal
8413b61397 Format code 2016-07-01 14:46:05 +01:00
Michal Moskal
31002ae1a8 Fix typo in onPulse; hook up createBuffer 2016-06-25 19:17:43 +01:00
Peli de Halleux
d8d2129685 removed strings page 2016-06-24 09:02:31 -07:00
Peli de Halleux
5dd37a1494 updated bluetooth docs page 2016-06-24 09:02:14 -07:00
Peli de Halleux
6cfe39dac3 patching up bluetooth uart 2016-06-24 08:12:52 -07:00
Martin Woolley
ecc71a3295 UART read block with string param unlimited length added 2016-06-24 08:46:05 +01:00
Martin Woolley
0834402b18 Pairing documentation worj in progress. UART write block added 2016-06-24 07:59:08 +01:00
Martin Woolley
76005841fa Increased default power to 6, added UART write block 2016-06-23 11:38:23 +01:00
Martin Woolley
7bf00ff139 Merge remote-tracking branch 'upstream/master' 2016-06-23 08:06:34 +01:00
Martin Woolley
82e34d852c checking in 2016-06-23 08:05:49 +01:00
Peli de Halleux
34effcefc6 jsdoc on bluetooth 2016-06-21 14:30:05 -07:00
Peli de Halleux
67b5afd73a integrating docs about "devices" namespace 2016-06-21 11:17:34 -07:00
Peli de Halleux
98238caffb updated translations 2016-06-20 11:28:52 -07:00
Peli de Halleux
f55977a51d Merge branch 'master' of https://github.com/Microsoft/pxt-microbit 2016-06-20 11:07:20 -07:00
Peli de Halleux
91938f156a Merge pull request #136 from bluetooth-mdw/master
Documentation for Bluetooth IO Pin service block++
2016-06-20 11:07:04 -07:00
Peli de Halleux
17cbea9989 refreshing localizations 2016-06-20 08:37:17 -07:00
Martin Woolley
22c03dfd7a Documentation for Bluetooth IO Pin service block.
Addition of event handler blocks for Bluetooth connection state changes.
2016-06-20 08:39:51 +01:00
Peli de Halleux
cd0b2a646f fixing various doc links 2016-06-19 05:28:46 -07:00
Peli de Halleux
d7528c09e3 updated transmit power default value 2016-06-19 05:15:13 -07:00
Peli de Halleux
e055484492 updated loc strings 2016-06-19 05:14:46 -07:00
Peli de Halleux
947d69da48 added strings for block in microbit project 2016-06-17 22:11:32 -07:00
Peli de Halleux
ece91d980a updated bundled translations 2016-06-15 23:12:44 -07:00
Peli de Halleux
a6a9f25e86 updated docs and strings 2016-06-15 22:50:23 -07:00
Tom Ball
2c399f198a move LED namespace after music 2016-06-14 19:16:08 -04:00
Peli de Halleux
4a537b1ce8 updated bluetooth library 2016-06-14 13:57:27 -07:00
Peli de Halleux
cf0372aeaa adding bluetooth button service. fix for #106 2016-06-14 13:53:05 -07:00
Peli de Halleux
918d2f1a3a support for bluetooth accelerometer service. fix for #105 2016-06-14 13:47:18 -07:00
Peli de Halleux
c1a6c1c66a support for magnetometer service. fix for #112 2016-06-14 13:39:24 -07:00
Peli de Halleux
7a2c4f0056 updated shims 2016-06-14 13:27:21 -07:00
Peli de Halleux
23eefb28d2 support for starting the temperature service #113 2016-06-14 13:24:55 -07:00
Peli de Halleux
bb20c1780b Add Bluetooth LED service. fix for #111 2016-06-14 13:17:20 -07:00
Peli de Halleux
fe39eec686 fixing color, help of io pin service 2016-06-14 06:40:44 -07:00
Peli de Halleux
655fa0fde8 updated annotations 2016-06-14 06:33:18 -07:00
Peli de Halleux
2841df6950 added 'microbit-bluetooth' package 2016-06-14 06:30:07 -07:00
Peli de Halleux
c6f5a8dcc6 updated help links. fix for #90 2016-06-09 21:41:41 -07:00
Peli de Halleux
f94015803f fixing some docs on microbit-devices 2016-06-07 14:21:19 -07:00
Peli de Halleux
f085253306 bundling and fixing microbit-devices 2016-06-07 14:06:13 -07:00
Peli de Halleux
3051e09bcf updated yotta settings for neopixel package 2016-06-07 10:53:44 -07:00
Peli de Halleux
e6ca366d20 full support for setPull 2016-06-03 23:15:51 -07:00
Peli de Halleux
af42dbf30a support for setpull 2016-06-03 10:34:20 -07:00
Peli de Halleux
f3a6b00734 fixing localized file path 2016-06-02 09:48:40 -07:00
Peli de Halleux
3de977c98f updated naming of locale strings 2016-06-02 09:07:30 -07:00
Peli de Halleux
7a0ad8e3ed disabling source maps 2016-05-27 14:16:47 -07:00
Peli de Halleux
f3463b5961 refactor strings.json generation for packages 2016-05-27 09:23:47 -07:00
Peli de Halleux
f4afa773ad missing images blocks 2016-05-26 20:42:15 -07:00
Peli de Halleux
21280f41bc updated random boolean color 2016-05-26 19:55:25 -07:00
Peli de Halleux
41c7053f3f added math.randomBoolean 2016-05-26 19:49:38 -07:00
Peli de Halleux
0648e80131 added serial.redirect 2016-05-26 11:07:09 -07:00
Peli de Halleux
1c8fa5eab6 move pins->map up in block list 2016-05-24 21:39:57 -07:00
Peli de Halleux
4e56342e52 updated docs 2016-05-20 05:40:54 -07:00
Peli de Halleux
7273354944 support for 3g/6g gestures 2016-05-20 05:39:44 -07:00
Peli de Halleux
c65bdb34af various docs updates 2016-05-19 13:56:24 -07:00
Peli de Halleux
9a36a2fc05 removing serial event (not supported in DAL) 2016-05-19 13:39:28 -07:00
Peli de Halleux
0b226bc9aa updated category colors theme 2016-05-19 11:59:57 -07:00
Peli de Halleux
f2bab5d122 missing async annotation on serial 2016-05-19 10:53:48 -07:00
Peli de Halleux
bfac2910da tentative serial fix for #66 2016-05-18 11:57:10 -07:00
Peli de Halleux
5e024c6f23 added test package 2016-05-17 10:42:44 -07:00
Peli de Halleux
2e3d875b7d added serial events 2016-05-17 09:36:01 -07:00
Peli de Halleux
845d7a004c updated docs 2016-05-16 22:18:58 -07:00
Peli de Halleux
89f09c7f35 added pins->on pulsed 2016-05-16 16:24:44 -07:00
Peli de Halleux
879a85bdbb exposing i2c blocks in pins 2016-05-13 03:38:52 -07:00
Peli de Halleux
b4bc985068 upgraded to lancaster 2.0.0.rc3 (core 0.1.9)
added radio.send/receive string
2016-05-12 12:35:40 -07:00
Peli de Halleux
a62f2b00b4 updated radio apis to support key/value pair 2016-05-10 21:13:16 -07:00
Peli de Halleux
7d0101af25 marking various radio functions as debug until API is stable 2016-05-10 16:42:18 -07:00
Peli de Halleux
2cc6f864a8 remove logging 2016-05-10 10:26:36 -07:00
Peli de Halleux
47f9362e5f read radio values 2016-05-10 10:14:51 -07:00
Peli de Halleux
fcfdbcc7e4 moving block down category 2016-05-09 23:03:42 -07:00
Peli de Halleux
5884231399 null terminated name 2016-05-09 23:01:20 -07:00
Peli de Halleux
e8887f5904 radio blocks to read/stream value pairs 2016-05-09 22:55:37 -07:00
Peli de Halleux
b33d0ba470 updated strings 2016-05-06 14:17:39 -07:00
Peli de Halleux
f854dfd9c8 updated generated docs 2016-05-05 12:32:40 -07:00
Peli de Halleux
d905f24f9c updated generated strings.json 2016-05-05 11:32:35 -07:00
Peli de Halleux
81b8b1b69c updated docs 2016-05-05 11:16:14 -07:00
Peli de Halleux
04a60a5b47 fixing various lint violations 2016-05-04 23:31:55 -07:00
Peli de Halleux
db0c5d9f9f exposing serial number block. 2016-04-28 10:46:03 -07:00
Michal Moskal
6c539fb04f Add some debugger hooks 2016-04-27 19:26:55 +01:00
Peli de Halleux
ac942e198a missed file in previous checkin 2016-04-26 17:09:27 -07:00
Peli de Halleux
cef1f57e30 expose device serial number in javascript 2016-04-26 17:09:15 -07:00
Peli de Halleux
55859b1237 support for exposing device name 2016-04-26 13:43:02 -07:00
Peli de Halleux
512e40fae3 clearer api name in serial 2016-04-26 12:19:42 -07:00
Peli de Halleux
10d44b97cc more serial infos 2016-04-26 10:29:05 -07:00
Peli de Halleux
e746c13212 don't filter or throttle serial, let the user deal with it. 2016-04-22 13:12:43 -07:00
Peli de Halleux
9e073aee36 fixing doc links. fix for #49 2016-04-22 12:37:47 -07:00
Peli de Halleux
d89747fa46 typo in default value 2016-04-22 00:14:57 -07:00
Peli de Halleux
5232be58ce auto adjusting bar graph + debouncing sending data over serial 2016-04-21 23:44:22 -07:00
Michal Moskal
c54cd21efa Don't go through uBit object if not needed 2016-04-19 11:52:44 -07:00
Peli de Halleux
13bdcf762d updated dal definition 2016-04-19 09:43:23 -07:00
Peli de Halleux
0c7d49256d don't use blockStatement anymore 2016-04-18 13:31:05 -07:00
Peli de Halleux
5e23bc96ca don't expose storage in blocks 2016-04-18 09:21:11 -07:00
Peli de Halleux
4795c58e97 initial blocks for storage 2016-04-16 07:45:04 -07:00
Peli de Halleux
8fb96934ca panic when radio does not start 2016-04-15 22:41:30 -07:00
Peli de Halleux
cd91504c1f fix help urls 2016-04-15 16:54:44 -07:00
Peli de Halleux
26841de6cf bring back 'write number' 2016-04-15 16:40:51 -07:00
Peli de Halleux
67c5f0612a added serial docs 2016-04-15 16:36:31 -07:00
Peli de Halleux
3a434197a3 updated neopixel 2016-04-15 07:42:52 -07:00
Peli de Halleux
db4692843f fixing text scroll on simulator 2016-04-14 21:42:02 -07:00
Michal Moskal
b9f17c3143 Re-generate for new DAL 2016-04-14 17:58:10 -07:00
Peli de Halleux
10e3fdf007 upated to 0.1.7. fixing rename issues 2016-04-14 14:29:28 -07:00
Peli de Halleux
f7531ea9b0 fix for #4 2016-04-13 08:55:20 -07:00
Peli de Halleux
8e27d596aa making neopixels block friendly 2016-04-12 22:09:03 -07:00
Michal Moskal
a0a0554633 Add String.substr 2016-04-12 19:08:26 -07:00
Michal Moskal
df92a3daae Remove unused file 2016-04-12 18:51:56 -07:00
Michal Moskal
26985f2813 Default enum arguments not supported yet 2016-04-12 17:57:16 -07:00
Michal Moskal
e63b764568 Merge branch 'master' of github.com:Microsoft/kindscript-microbit 2016-04-12 17:10:46 -07:00
Michal Moskal
ef821e4b8b Add missing Image methods 2016-04-12 17:10:37 -07:00
Michal Moskal
c1a4a55e2b Fix typo 2016-04-11 20:54:26 -07:00
Michal Moskal
abc9e90cb9 Add control.panic and control.assert 2016-04-11 19:44:49 -07:00
Michal Moskal
3119bcc625 Fix note block names 2016-04-11 19:44:39 -07:00
Michal Moskal
ce53d5c386 Renaming stuff in the simulator 2016-04-07 12:52:02 -07:00
Michal Moskal
08b9b10ac8 Files renamed 2016-04-07 11:41:39 -07:00
Michal Moskal
92d8adfdbd Rename json files 2016-04-07 11:30:07 -07:00
Peli de Halleux
b80edb43fc removing some serial functions 2016-04-06 07:00:34 -07:00
Peli de Halleux
6c9b609fe0 annotate math namespace 2016-04-06 06:16:59 -07:00
Peli de Halleux
baf2c3247f Merge branch 'master' of https://github.com/Microsoft/kindscript-microbit 2016-04-05 20:49:54 -07:00
Michal Moskal
c9536b0cf2 Use constant for end of memory 2016-04-05 19:19:27 -07:00
Michal Moskal
7fd7e15bd4 Add README.md to kind.json 2016-04-05 19:02:12 -07:00
Michal Moskal
948b0ef304 Add readme to neopixel 2016-04-05 18:21:24 -07:00
Michal Moskal
715771b991 Add readme to i2c fram module 2016-04-05 18:21:15 -07:00
Michal Moskal
65d48f4b02 Add FRAM driver 2016-04-05 17:25:45 -07:00
Peli de Halleux
283c331a5e moving namespace docs 2016-04-05 16:54:09 -07:00
Peli de Halleux
ba96e94fa7 added jsdoc 2016-04-05 16:52:50 -07:00
Peli de Halleux
761e4f38cd adding namespace descriptions 2016-04-05 15:59:25 -07:00
Michal Moskal
47e3737245 Use common helpers/core 2016-04-04 21:18:16 -07:00
Michal Moskal
b8d5ec853e Prep for moving common stuff out to main ks 2016-04-04 20:28:08 -07:00