Merge remote-tracking branch 'upstream/master'

Author: ironsheep

docs/p2.md

@@ -172,8 +172,7 @@ Propeller 2 early adopters may experiment with two options: 1) limited-edition b
 ## Software
   * ### IDEs
     * #### Spin2 & PASM2
-      - Propeller Tool - Parallax P1 & P2 IDE (built for Windows)
-        - [Propeller Tool v2.3.0.0 Alpha (09/03/20)][PTool] - for P2 Rev B/C (2nd/3rd -ES silicon) [3rd is slated as production version] as used on the Rev B and Rev C P2 Eval boards
+      - [Propeller Tool][PTool] - Parallax P1 & P2 IDE (built for Windows)
       - PNut - Parallax P2 IDE (built for Windows- can be used with wine on Linux and MacOS)
         - [PNut v34zb][PNutV34] - (signed) for P2 Rev B/C (2nd/3rd ES silicon) [3rd is slated as production version] as used on the Rev C P2 Eval boards.  DEBUG displays added and enhanced, lot of DEBUG examples.  Now supports all three text-file formats: PC (CR+LF), Linux (LF-only), and Mac (CR-only). Format preserved on save.  See [P2 Spin2 Launguage][P2SpinDoc] documentation's DEBUG details
         - [PNut v32i](https://github.com/parallaxinc/propeller/releases/download/v32i/PNut_v32i.exe) - for P2 Rev A (1st -ES silicon, as used on the Rev A P2 Eval boards)
@@ -212,6 +211,27 @@ by Dave Hein
 ## Recent Activity
 ##### _Full details [here](https://github.com/parallaxinc/propeller/pulls?q=is%3Aclosed)._
 
+* Added Jon "JonnyMac" McPhalen's [DHTxx Temperature/Humidity](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_dhtxx) object
+* Added object from Greg LaPolla's
+  * P1 [ADS1118 C](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p1/All/ads1118/C) 
+  * P1 [ADS1118 Spin](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p1/All/ads1118/Spin)
+  * P2 [ADS1118](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/ads1118)
+  * P2 [ILI9341](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/ili9341)
+* Added Dennis Gately's (and BR's) [DS1302 Full](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/DS1302_full) object.
+* Added Jon "JonnyMac" McPhalen's [Quiic Twist](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_quiic_twist) object
+* Added Objects from Jon "JonnyMac" McPhalen
+  * [AT24C32](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_at24c32)
+  * [DS3231](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_ds3231)
+  * [I2C Devices](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_i2c_devices)
+  * [NEC RX](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_nec_rx)
+  * [NEC TX](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_nec_tx)
+  * [PIXY2](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_pixy2)
+* Added Stephen Moraco's [ISP Hub75 Matrix](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/isp_hub75_matrix) object
+* Added Objects
+  * [Accessory Buttons](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/Acc_Buttons) - Bryan Thomas
+  * [FT813 EVE2 Driver](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p1/All/FT813%20EVE2%20Driver) - Chris Gadd
+  * [LPD8806 "Smart" Pixel Driver](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_lpd8806) - Jon "JonnyMac" McPhalen
+  * [Soft Timer](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_soft_timer) - Jon "JonnyMac" McPhalen
 * Added Jon "JonnyMac" McPhalen's objects
   * [Click 4-20ma Object](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_click_4-20ma)
   * [Click DMX-TX Object](https://github.com/parallaxinc/propeller/tree/master/libraries/community/p2/All/jm_click_dmx-tx)
@@ -295,4 +315,4 @@ by Dave Hein
 [P2SpinDoc]: https://docs.google.com/document/d/16qVkmA6Co5fUNKJHF6pBfGfDupuRwDtf-wyieh_fbqw/edit "P2 Spin2 Language Doc"
 [P2SmartPinDoc]: https://drive.google.com/file/d/1iTA4dwbntgaUVnpt0-9pDcFCVSsvCUnU/view?usp=sharing "P2 Smart Pin Supplementary Doc"
 [PNutV34]: https://github.com/parallaxinc/propeller/releases/tag/PNut_v34zb "PNut v34zb"
-[PTool]: https://www.parallax.com/downloads/propeller-tool-software-windows-spin-assembly "Propeller Tool v2.3.0.0 Alpha"
+[PTool]: https://www.parallax.com/package/propeller-tool-software-for-windows-spin-assembly-2/ "Propeller Tool v2.4"

libraries/community/p1/All/FT813 EVE2 Driver/FT813 demo.spin

@@ -0,0 +1,8 @@
+ADS1118.c
+>compiler=C
+>memtype=cmm main ram compact
+>optimize=-Os
+>-m32bit-doubles
+>-Wall
+>-fno-exceptions
+>BOARD::ACTIVITYBOARD

libraries/community/p1/All/FT813 EVE2 Driver/FT813 driver.spin

@@ -0,0 +1,27 @@
+# libads1118
+
+## Language
+
+C
+
+## Category
+
+Sensor
+
+## Description
+
+libads1118 is a c library that interfaces the TI ADS1118 chip with the Propeller P8X32A
+
+Learn more about the Propeller at [www.parallax.com](http://www.parallax.com).
+
+
+
+## License
+
+Copyright © 2020 Greg LaPolla libads1118 is licensed under the MIT License.
+
+## Credits
+
+libads1118 is developed by Greg LaPolla. 
+This Driver was derived from the arduino driver localted at [Github](https://github.com/denkitronik/ADS1118). 
+ 

libraries/community/p1/All/SIDcog v1.3/SIDcog_V1.4/CombinedWaveforms.bin

@@ -0,0 +1,65 @@
+/*
+ * @file ads1118_decodeConfigRegister.c
+ *
+ * @author Greg LaPolla
+ *
+ * @version 0.1
+ *
+ * @copyright Copyright (C) 2020.  See end of file for
+ * terms of use (MIT License).
+ *
+ * @brief This is a driver that allows the Propeller Multicore Microcontroller to 
+ * commnicate with the TI ADS1118 16 bit ADC with compensatin temperature sensor
+ *
+ */
+
+#include "simpletools.h"
+#include "ads1118.h"
+
+
+double volts;
+double temp;
+uint16_t adc;
+  
+
+int main()                                    // Main function
+{
+ 
+  ads1118_init(22,23,20,21);
+  
+  ads1118_enableNOP();  
+  ads1118_enablePullup();
+  ads1118_setSamplingRate(RATE_128SPS);
+  ads1118_setSingleShotMode();
+  ads1118_setFullScaleRange(FSR_0256);
+  ads1118_enableSingleStart();
+  
+  
+  while(1)
+  {
+    adc = ads1118_getADCValue(DIFF_0_1);
+    print("\n%cadc 1 reading = %d%c\n\n", HOME, adc, CLREOL);                // Display adc reading
+    
+    ads1118_decodeconfigRegister(configRegister);
+    
+    adc = ads1118_getADCValue(DIFF_2_3);
+    print("\nadc 2 reading = %d%c\n\n",adc, CLREOL);                           // Display adc reading
+    
+    ads1118_decodeconfigRegister(configRegister);
+    
+    volts = ads1118_getMilliVolts(DIFF_0_1);
+    print("\nMillivolts 1 = %f%c\n\n",volts,CLREOL);                         // Display milivolts
+     
+    ads1118_decodeconfigRegister(configRegister);
+    
+    volts = ads1118_getMilliVolts(DIFF_2_3);
+    print("\nMillivolts 2 = %f%c\n\n",volts,CLREOL);                         // Display milivolts
+    
+    ads1118_decodeconfigRegister(configRegister);
+     
+    temp = (ads1118_getTemperature() * 9 / 5) + 32;   
+    print("\nTemperature = %f%c\n",temp,CLREOL);                         // Display milivolts
+    
+    pause(1000);
+  }
+}