Merge pull request #158 from MatzElectronics/Community

add s3 adc read

Author: AndyLindsay

Learn/Simple Libraries/Robotics/S3/libs3/cmm/libs3.a

@@ -74,13 +74,6 @@ the Test Utility, cycle the Scribbler//s power switch.
 
 */
 
-// ------ Libraries and Definitions ------
-#include "simpletools.h"
-#include "s3.h"
-
-
-
-// ------ Main Program ------
 int main()
 {
 

Learn/Simple Libraries/Robotics/S3/libs3/libs3.c

@@ -702,6 +702,7 @@ int32_t s3_ping(int32_t Pin)
   return result;
 }
 
+// User EEPROM read/write functions
 void s3_memoryWrite(int32_t Addr, int32_t Value) {
   int AddrMax = (32768 - SCRIBBLER_EE_USER_AREA) / 4;   // 7936
   if(Addr >= 0 && Addr < AddrMax) {
@@ -711,4 +712,9 @@ void s3_memoryWrite(int32_t Addr, int32_t Value) {
 
 int32_t s3_memoryRead(int32_t Addr) {
    return scribbler_ee_read_byte((Addr * 4) + SCRIBBLER_EE_USER_AREA);
+}
+
+// Return the ADC reading in volt-hundreths
+int32_t s3_readADC(int32_t p) {
+  (scribbler_get_results(p) * 500) >> 16;
 }

Learn/Simple Libraries/Robotics/S3/libs3/s3.c

@@ -36,6 +36,8 @@
 #define S3_COLOR_00FF00 (SCRIBBLER_GREEN)
 #define S3_OFF (0)
 #define S3_COLOR_000000 (S3_OFF)
+#define S3_ADC_A0 (SCRIBBLER_ADC_P6)
+#define S3_ADC_A1 (SCRIBBLER_ADC_P7)