Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-08-19 01:13:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:geratech/controller

Browse Source
This commit is contained in:
matthew wildoer
2017-10-13 17:20:15 +11:00
parent bef43265a8 18e9df3c23
commit ec0e836b2f
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+4
View File
@@ -1,3 +1,4 @@
<<<<<<< HEAD
<img src="https://raw.githubusercontent.com/wiki/synthetos/g2/images/g2core.png" width="300" height="129" alt="g2core">
[![Build Status](https://travis-ci.org/synthetos/g2.svg?branch=edge)](https://travis-ci.org/synthetos/g2) [![Issues in Ready](https://badge.waffle.io/synthetos/g2.svg?label=ready&title=Ready)](http://waffle.io/synthetos/g2) [![Issues in Progress](https://badge.waffle.io/synthetos/g2.svg?label=in%20progress&title=In%20Progress)](http://waffle.io/synthetos/g2)
@@ -208,3 +209,6 @@ These changes are primarily fixes applied after testing
* **Different Behaviors**. There are some behaviors that are different.
* Feedhold / queue flush on v8 works with !%~ in one line. In g2 it requires a newline. Use !\n%\n This is due to using a USB stack that is partly on the chip and not being able to get at the individual characters that far upstream. This will probably not change in v9.
=======
# controller
>>>>>>> 18e9df3c23572f38c4495d0cfb370c132efb74ed
g2core/gpio.h
+2 -2
View File
@@ -38,8 +38,8 @@
#define D_OUT_CHANNELS 9 // number of digital outputs supported
#define A_IN_CHANNELS 0 // number of analog inputs supported
#define A_OUT_CHANNELS 0 // number of analog outputs supported
#define D_IN_CAN_CHANNELS 1
#define D_OUT_CAN_CHANNELS 1
#define D_IN_CAN_CHANNELS 0
#define D_OUT_CAN_CHANNELS 0
#define A_IN_CAN_CHANNELS 0
#define A_OUT_CAN_CHANNELS 0