Commit Graph
44 Commits
Author SHA1 Message Date
Wilhelm Westermark be72ed2dfd 3D models for scale rig 2018-11-25 08:26:37 +01:00
davide 3500e29157 Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy 2018-11-25 00:02:39 +01:00
davide 6c45e79137 Parsing new order 2018-11-25 00:02:33 +01:00
davide da94ed3e15 Added candy count code 2018-11-25 00:02:15 +01:00
Wilhelm Westermark 46801a586f Final fast code for the scale 2018-11-24 23:53:50 +01:00
Wilhelm Westermark ccaee0bddd Remove faulty file 2018-11-24 23:42:10 +01:00
Wilhelm Westermark 7d22bc3b86 Updated for mobile 2018-11-24 23:41:36 +01:00
marek ea4b383e66 fixed the numeric picker 2018-11-25 00:01:11 +02:00
davide a789310c2d Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy 2018-11-24 22:15:50 +01:00
marek 86820ebfc6 fixed windows 2018-11-24 23:13:55 +02:00
davide 3ed89ee6dc Some changes 2018-11-24 21:54:49 +01:00
marek 9b0f67b5ef order site 1 2018-11-24 22:52:47 +02:00
adligeerik 54833c1c9d working chat and robot contoller 2018-11-24 21:11:04 +01:00
pk23 95892796ed Merged the chat parser with the robot control 2018-11-24 21:23:19 +02:00
pk23 87449e287e Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy 2018-11-24 21:18:28 +02:00
pk23 0d7a234a25 move function has been updated with the chat parser 2018-11-24 21:16:16 +02:00
pk23 d0717ec157 Merged the Chat parser with the robot arm control. 2018-11-24 20:59:09 +02:00
davide 071236bc0e Merge branch 'master' of git.elab.kth.se:marek/Twitch-grabs-candy 2018-11-24 19:54:01 +01:00
davide c1f64d6f4c Some working overlay action 2018-11-24 19:53:07 +01:00
Wilhelm Westermark 974894f1ee Average code on serial available 2018-11-24 19:51:04 +01:00
adligeerik 9ee108ee57 key words 2018-11-24 19:07:40 +01:00
adligeerik 78edcbd44b Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy 2018-11-24 18:58:30 +01:00
adligeerik da0d5556a8 test 2018-11-24 18:58:22 +01:00
marek dd289bbb16 speed should accumulate correctly 2018-11-24 19:57:16 +02:00
adligeerik 06e405c86c test for chat 2018-11-24 18:26:53 +01:00
adligeerik 526b963686 Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy 2018-11-24 16:42:20 +01:00
adligeerik 7994f3a432 linear added 2018-11-24 16:42:01 +01:00
marek 4c906a71e9 changig directions mid movement fix 2018-11-24 17:41:50 +02:00
adligeerik c4fd668de7 toplevel added 2018-11-24 16:34:47 +01:00
marek eafbee72ce spaced the tabs 2018-11-24 17:06:04 +02:00
adligeerik 1db35c90c8 tabs 2018-11-24 16:04:13 +01:00
adligeerik 7d3723eab3 Merge branch 'master' of https://git.elab.kth.se/marek/Twitch-grabs-candy 2018-11-24 15:46:05 +01:00
adligeerik 902acd4cf6 functi 2018-11-24 15:45:52 +01:00
marek 8846655cd9 yes 2018-11-24 16:44:50 +02:00
marek 0842d94e68 arduino scale firmware 2018-11-24 15:54:28 +02:00
adligeerik b6c8cc2f1b Example 2018-11-24 12:59:56 +01:00
adligeerik 3bac559b81 comands work 2018-11-24 12:13:29 +01:00
adligeerik e0a898d423 waitcmd 2018-11-24 10:39:24 +01:00
adligeerik a954326103 class 2018-11-24 10:35:12 +01:00
adligeerik 0fbc0c02e0 pybot 2018-11-24 00:06:37 +01:00
adligeerik b08e51f1d3 Removed non ascii character 2018-11-23 23:37:48 +01:00
adligeerik 989a808d3f drivers for arm 2018-11-23 23:33:38 +01:00
adligeerik 6c8e7c1eed Move arm file started 2018-11-23 22:14:08 +01:00
marek 5c8afc9708 go go go 2018-11-23 22:28:39 +02:00