1
0
mirror of https://github.com/rene-dev/stmbl.git synced 2024-12-22 00:22:28 +00:00
Commit Graph

1223 Commits

Author SHA1 Message Date
Rene Hopf
7d1a216ba1 Merge pull request #16 from Netzpfuscher/motsim
Motsim
2015-11-06 10:31:02 +01:00
Rene Hopf
18537b14b7 Merge pull request #15 from ianmcmahon/new_sserial
New sserial
2015-11-06 10:22:40 +01:00
Ian McMahon
2fa3a8ff0c sending vals from linuxcnc to stmbl works (no scaling yet) 2015-11-06 04:00:13 -05:00
Ian McMahon
4d9f5df3ad fixed some miscellany that was keeping it from building 2015-11-06 03:48:18 -05:00
Ian McMahon
81a319393c merged 2015-11-06 03:32:05 -05:00
Ian McMahon
ce88818a20 data unpacking working 2015-11-06 03:29:55 -05:00
Ian McMahon
f3502d6fe3 fixed issues in the dump routines 2015-11-06 03:05:20 -05:00
Ian McMahon
0cef393cd8 incorporated unpacking 2015-11-06 02:54:25 -05:00
Ian McMahon
95b746b00b updated processdata rpc to fix unpacking 2015-11-06 02:39:14 -05:00
Rene Hopf
ef9b0b0bfd debug out 2015-11-06 08:02:05 +01:00
Ian McMahon
69189bebd3 adding memtemp 2015-11-06 01:41:17 -05:00
Netzpfuscher
48849610f3 Merge remote-tracking branch 'upstream/motsim' into motsim
Merged upstream
2015-11-06 07:25:38 +01:00
Netzpfuscher
35ef12a1dd Removed magic numbers 2015-11-06 07:25:20 +01:00
Rene Hopf
8dc6170b53 Merge pull request #14 from ianmcmahon/new_sserial
New sserial
2015-11-06 07:15:02 +01:00
Ian McMahon
61709d6154 ported over the new memory building code 2015-11-06 01:08:42 -05:00
Netzpfuscher
4923a73733 Merge remote-tracking branch 'upstream/motsim' into motsim 2015-11-06 06:57:48 +01:00
Ian McMahon
bdb050a2d9 minor changes, about to get terribly refactored for the new memory creation scheme 2015-11-06 00:29:02 -05:00
Rene Hopf
9f7cd37600 Merge branch 'Netzpfuscher-motsim' into motsim 2015-11-05 23:35:19 +01:00
Rene Hopf
5aa4ea90fd Merge branch 'motsim' of https://github.com/Netzpfuscher/stmbl into Netzpfuscher-motsim
Conflicts:
	src/main.c
2015-11-05 23:34:49 +01:00
Rene Hopf
1e81f9a287 float fix 2015-11-05 23:24:46 +01:00
Rene Hopf
386c83712c sserial min max type fix 2015-11-05 21:03:57 +01:00
Rene Hopf
0ac7c12819 sserial timeout 2015-11-05 17:53:33 +01:00
Rene Hopf
5083a859b5 sserial 2015-11-05 17:21:33 +01:00
Sync
861640ba9d Forgot file. 2015-11-05 12:52:59 +01:00
Rene Hopf
012a7bf514 Merge pull request #12 from ianmcmahon/new_sserial
toc changes
2015-11-05 11:51:12 +01:00
Ian McMahon
e9e5661c71 removed datasize array 2015-11-05 01:28:05 -05:00
Ian McMahon
02c7a83a07 fixed the send bug, it was the datasize array missing 2015-11-05 01:17:04 -05:00
Ian McMahon
17e097ad2b runs, ptoc/gtoc aren't being read properly. Added dump_ptoc and dump_gtoc pins which work in term 2015-11-05 00:35:16 -05:00
Sync
1c8b15b522 Forgot traces. 2015-11-05 03:41:20 +01:00
Ian McMahon
10d7075876 added the rest of the toc building code and string funcs 2015-11-04 18:55:52 -05:00
Sync
fc206d3143 Changed schematic to current feature set.
The bob will use two connections to the Mesa hardware and break out 5 SSerial
connections, 4 ABZ encoder interfaces, 5 inputs and 5 outputs.
2015-11-05 00:38:42 +01:00
Rene Hopf
117fec6e94 fixed pd rpc and strings 2015-11-04 23:32:05 +01:00
Ian McMahon
de3f8ce1cc merged add_pd 2015-11-04 23:30:21 +01:00
Ian McMahon
b40d535d36 added back in TOC building code 2015-11-04 14:14:45 -05:00
Rene Hopf
1bf887d18b fix txbuf 2015-11-04 19:55:42 +01:00
Ian McMahon
1430fb0666 merging ians sserial changes 2015-11-04 19:49:21 +01:00
Rene Hopf
e6120d4c66 cmd rx lockout 2015-11-04 19:39:34 +01:00
Rene Hopf
130863da58 Merge branch 'origin/sserial' into motsim
* origin/sserial:
  frt thread
  20 khz test
2015-11-04 19:32:15 +01:00
Rene Hopf
3b1423245b Merge branch 'master' into motsim
* master:
  pcb errata update
  Update README.md
  Update README.md
  Update README.md
2015-11-04 19:01:12 +01:00
Sync
add1e5b1a4 Added more isolators. 2015-11-04 00:01:56 +01:00
Sync
0c97d0c76c Initial commit for the Mesa card DB25 breakout board.
Just some isolators...
2015-11-03 23:45:50 +01:00
Rene Hopf
4cb81b52d3 frt thread 2015-11-02 20:01:36 +01:00
Rene Hopf
b9bba08e5b 20 khz test 2015-11-02 16:56:37 +01:00
Rene Hopf
a6389d7e52 serial 2015-11-02 16:39:42 +01:00
Rene Hopf
dd024ba477 cmd tx lockout 2015-11-02 16:02:43 +01:00
Netzpfuscher
fcd68ee678 Merge remote-tracking branch 'upstream/motsim' into motsim 2015-10-30 06:39:01 +01:00
Rene Hopf
8f3860a45f sserial 2015-10-29 01:20:46 +01:00
Netzpfuscher
dfeb012a14 term reset button/fault text 2015-10-28 17:21:42 +01:00
Rene Hopf
5e4b610843 Update README.md 2015-10-28 15:47:51 +01:00
Netzpfuscher
073915514f Merge remote-tracking branch 'upstream/motsim' into motsim
Conflicts:
	src/main.c
2015-10-26 12:04:55 +01:00