Commit Graph

4964 Commits (9ebd6e2a73ce802f05d951ead1596dbab95ec3df)

Author SHA1 Message Date
Rick Carlino 61a92ec25a Formatting fix 2020-02-11 16:25:32 -06:00
Rick Carlino 7dd311a840 Merge conflicts 2020-02-11 16:23:13 -06:00
Rick Carlino e696f7c895 Merge branch 'staging' of github.com:FarmBot/farmbot_os into week_8 2020-02-11 16:20:34 -06:00
Rick Carlino 5f93d6a03b v9.1.0-rc9 2020-02-11 16:18:22 -06:00
Rick Carlino fabd36fc80 Merge branch 'staging' of github.com:FarmBot/farmbot_os into qa/new_new_firmware 2020-02-11 16:13:45 -06:00
Rick Carlino e240e6b2f1
Merge pull request #1143 from jsimmonds2/bug/sluggish-farmware
Return rpc_ok with label from original RPC request
2020-02-11 16:10:21 -06:00
John Simmonds 6df0793e69
Merge branch 'staging' into bug/sluggish-farmware 2020-02-12 08:57:27 +11:00
Rick Carlino b5a5a6a41d Merge branch 'staging' of github.com:FarmBot/farmbot_os into qa/new_new_firmware 2020-02-11 15:07:41 -06:00
Rick Carlino 38ee343194 v9.1.0-rc8 2020-02-11 15:07:25 -06:00
Rick Carlino ff760cce70 Upgrade vintage_net 2020-02-11 15:04:31 -06:00
Rick Carlino 7a744677dc
Merge pull request #1144 from FarmBot/unit_updates
Step updates
2020-02-11 13:51:45 -06:00
Rick Carlino ea871f1563 Merge branch 'unit_updates' of github.com:FarmBot/farmbot_os into week_8 2020-02-11 11:30:42 -06:00
Rick Carlino d212710254 Merge branch 'staging' of github.com:FarmBot/farmbot_os into week_8 2020-02-11 11:30:34 -06:00
Rick Carlino 03d61d70c6 Merge branch 'unit_updates' of github.com:FarmBot/farmbot_os into qa/new_new_firmware 2020-02-11 11:16:06 -06:00
Rick Carlino ab5f3b33db 9.1.0-rc7 2020-02-11 08:17:08 -06:00
Rick Carlino 0747191a22 Clear EEPROM when user selects "none" firmware option. 2020-02-11 08:11:41 -06:00
Rick Carlino 3019782de6 v9.1.0-rc6 - Possible cleanup for `none` Firmware selection. 2020-02-11 07:49:40 -06:00
Rick Carlino 1bc2cbfe10 v9.1.0-rc5 2020-02-11 07:33:17 -06:00
John Simmonds 935a6acfc3
Return rpc_ok with label from original RPC request 2020-02-11 18:15:17 +11:00
gabrielburnworth 01e97de2a0 fix param units 2020-02-10 16:20:05 -08:00
Rick Carlino 132d737bc9 Version bump to v9.0.3-rc4 2020-02-10 18:03:31 -06:00
Rick Carlino 03874c0bfa
Merge pull request #1140 from FarmBot/week_8
Minor updates
2020-02-10 18:00:25 -06:00
Rick Carlino ba8c0caa3d Merge branch 'staging' of github.com:FarmBot/farmbot_os into week_8 2020-02-10 17:54:58 -06:00
Rick Carlino 2ab6911323
Merge branch 'staging' into week_8 2020-02-10 17:53:40 -06:00
Rick Carlino b7c9e3524b (31.6%) End Tests for Lua DataManipulation module 2020-02-10 17:22:24 -06:00
Rick Carlino 716004ee74 Tests for firmware_config related fns in Lua sandbox 2020-02-10 17:08:04 -06:00
Rick Carlino 340bbee970 Tests for `get_fbos_config` calls within lua sandbox 2020-02-10 17:00:57 -06:00
Rick Carlino cf8fccce52 Tests for `update_fbos_config` calls within lua sandbox 2020-02-10 16:45:39 -06:00
Rick Carlino b772e9d4fc Tests for `get_device` calls within lua sandbox 2020-02-10 16:29:06 -06:00
Rick Carlino 8e2626ce71 Begin Lua data manipulaltion tests 2020-02-10 16:13:55 -06:00
Rick Carlino 584071408a Debugging CI- hex is failing to install deps suddenly? 2020-02-10 14:48:24 -06:00
Rick Carlino 5f5517a276 v9.1.0-rc3 2020-02-10 14:24:57 -06:00
Rick Carlino 8429aa2331 WIP 2020-02-10 14:18:33 -06:00
Rick Carlino 1dee7fbfbe Tests for Lua related functionality 2020-02-10 12:48:04 -06:00
Rick Carlino 0478df98ea
Merge pull request #1139 from FarmBot/week_8
Feb 10 Updates
2020-02-10 11:29:33 -06:00
Rick Carlino 6fa5c5ad42 Merge branch 'remove-unused' of github.com:FarmBot/farmbot_os into week_8 2020-02-10 11:20:00 -06:00
Rick Carlino c2cbadb636 Remove unused vars 2020-02-10 11:19:02 -06:00
Rick Carlino f282f630b2 Merge branch 'test_coverage_updates' into week_8 2020-02-10 11:16:36 -06:00
Rick Carlino 8ae9335c53 Merge branch 'staging' of github.com:FarmBot/farmbot_os into test_coverage_updates 2020-02-10 11:16:16 -06:00
Rick Carlino 1a0d5732e9 Merge branch 'fix_990' into week_8 2020-02-10 11:15:18 -06:00
Rick Carlino b2fea77665 Merge branch 'staging' of github.com:FarmBot/farmbot_os into qa/week_7 2020-02-10 11:13:26 -06:00
Rick Carlino 8d657d832f Merge branch 'staging' of github.com:FarmBot/farmbot_os into qa/new_new_firmware 2020-02-10 11:05:41 -06:00
Rick Carlino a204c790ac Merge branch 'staging' of github.com:FarmBot/farmbot_os into fix_990 2020-02-10 11:02:50 -06:00
gabrielburnworth c56b4e0d6d remove unused firmware 2020-02-08 10:58:10 -08:00
Rick Carlino 4383f54c9a Remove warnings 2020-02-08 12:34:42 -06:00
Rick Carlino edd52563db Merge branch 'fix_990' into qa/new_new_firmware 2020-02-08 12:11:53 -06:00
Rick Carlino c4f1cc3aa5 Possible fix for #990 2020-02-08 12:11:05 -06:00
Rick Carlino 61efe7d97b
Merge pull request #1136 from FarmBot/ids
Support more descriptive board identifiers
2020-02-08 11:25:16 -06:00
gabrielburnworth f226fb3329 support more descriptive board identifiers 2020-02-07 16:13:37 -08:00
Rick Carlino 6686f7d60a v9.1.0-rc2 2020-02-07 10:06:48 -06:00