JAVA: Unified Java Example names

Unified all Java examples to *match* <LIBRARY>[_otherstuf]_Example.java.
Note, a handful of the examples have a pseudo-random string for the
first component (see FlexSensor_Example.java, ideally this would be
Flex_Example.java).

This commit allows for quick development on a single sensor library
since a -DMODULE_LIST=mysensorlib now works with Java examples
(previously Java examples would fail generation when using
MODULE_LIST).

    * Renamed examples
    * Updated class names
    * Updated library descriptor .json files
    * Updated sample mapping file

TODO: Make this work like the C/C++ examples - grab the target library
name from the filename and grab all dependencies from that target
library.  Fix the handful of example names which don't conform.

Signed-off-by: Noel Eck <noel.eck@intel.com>

doxy/samples.mapping.txt

@@ -1,79 +1,79 @@
 # Mapping examples across provided languages
-a110x.cxx	A110XSample.java	a110x.js	a110x.py
+a110x.cxx A110X_Example.java a110x.js a110x.py
-a110x-intr.cxx	A110X_intrSample.java	a110x-intr.js	a110x-intr.py
+a110x-intr.cxx A110X_intr_Example.java a110x-intr.js a110x-intr.py
-adc121c021.cxx	ADC121C021Sample.java	adc121c021.js	adc121c021.py
+adc121c021.cxx ADC121C021_Example.java adc121c021.js adc121c021.py
-adxl345.cxx	Adxl345Sample.java	adxl345.js	adxl345.py
+adxl345.cxx Adxl345_Example.java adxl345.js adxl345.py
-biss0001.cxx	BISS0001Sample.java	biss0001.js	biss0001.py
+biss0001.cxx BISS0001_Example.java biss0001.js biss0001.py
-bmpx8x.cxx	BMPX8XSample.java	bmpx8x.js	bmpx8x.py
+bmpx8x.cxx BMPX8X_Example.java bmpx8x.js bmpx8x.py
-bno055.cxx	BNO055_Example.java	bno055.js	bno055.py
+bno055.cxx BNO055_Example.java bno055.js bno055.py
-button.cxx	ButtonSample.java	button.js	button.py
+button.cxx Button_Example.java button.js button.py
-buzzer.cxx	BuzzerSample.java	buzzer.js	buzzer.py
+buzzer.cxx Buzzer_Example.java buzzer.js buzzer.py
-cjq4435.cxx	CJQ4435Sample.java	cjq4435.js	cjq4435.py
+cjq4435.cxx CJQ4435_Example.java cjq4435.js cjq4435.py
-ds1307.cxx	DS1307Sample.java	ds1307.js	ds1307.py
+ds1307.cxx DS1307_Example.java ds1307.js ds1307.py
-enc03r.cxx	ENC03RSample.java	enc03r.js	enc03r.py
+enc03r.cxx ENC03R_Example.java enc03r.js enc03r.py
-servo-es08a.cxx	ES08ASample.java	es08a.js	es08a.py
+servo-es08a.cxx ES08A_Example.java es08a.js es08a.py
-groveehr.cxx	GroveEHRSample.java	groveehr.js	groveehr.py
+groveehr.cxx GroveEHR_Example.java groveehr.js groveehr.py
-my9221-groveledbar.cxx	GroveLEDBar.java	groveledbar.js	groveledbar.py
+my9221-groveledbar.cxx GroveLEDBar_Example.java groveledbar.js groveledbar.py
-grove-groveled.cxx	GroveLEDSample.java	groveled.js	groveled.py
+grove-groveled.cxx GroveLED_Example.java groveled.js groveled.py
-grovelinefinder.cxx	GroveLineFinderSample.java	grovelinefinder.js	grovelinefinder.py
+grovelinefinder.cxx GroveLineFinder_Example.java grovelinefinder.js grovelinefinder.py
-grovemoisture.cxx	GroveMoistureSample.java	grovemoisture.js	grovemoisture.py
+grovemoisture.cxx GroveMoisture_Example.java grovemoisture.js grovemoisture.py
-grovescam.cxx	GROVESCAMSample.java	grovescam.js	grovescam.py
+grovescam.cxx GROVESCAM_Example.java grovescam.js grovescam.py
-grovewfs.cxx	GroveWFSSample.java	grovewfs.js	grovewfs.py
+grovewfs.cxx GroveWFS_Example.java grovewfs.js grovewfs.py
-guvas12d.cxx	GUVAS12DSample.java	guvas12d.js	guvas12d.py
+guvas12d.cxx GUVAS12D_Example.java guvas12d.js guvas12d.py
-h3lis331dl.cxx	H3LIS331DLSample.java	h3lis331dl.js	h3lis331dl.py
+h3lis331dl.cxx H3LIS331DL_Example.java h3lis331dl.js h3lis331dl.py
-hcsr04.cxx	HCSR04Sample.java	hcsr04.js	hcsr04.py
+hcsr04.cxx HCSR04_Example.java hcsr04.js hcsr04.py
-hm11.cxx	HM11Sample.java	hm11.js	hm11.py
+hm11.cxx HM11_Example.java hm11.js hm11.py
-hmc5883l.cxx	Hmc5883lSample.java	hmc5883l.js	hmc5883l.py
+hmc5883l.cxx Hmc5883l_Example.java hmc5883l.js hmc5883l.py
-htu21d.cxx	HTU21DSample.java	htu21d.js	htu21d.py
+htu21d.cxx HTU21D_Example.java htu21d.js htu21d.py
-ims.cxx	IMS_Example.java	ims.js	ims.py
+ims.cxx IMS_Example.java ims.js ims.py
-itg3200.cxx	Itg3200Sample.java	itg3200.js	itg3200.py
+itg3200.cxx Itg3200_Example.java itg3200.js itg3200.py
-jhd1313m1-lcd.cxx	Jhd1313m1_lcdSample.java	jhd1313m1-lcd.js	jhd1313m1-lcd.py
+jhd1313m1-lcd.cxx Jhd1313m1_lcd_Example.java jhd1313m1-lcd.js jhd1313m1-lcd.py
-joystick12.cxx	Joystick12Sample.java	joystick12.js	joystick12.py
+joystick12.cxx Joystick12_Example.java joystick12.js joystick12.py
-lcm1602-i2c.cxx	Lcm1602_i2cSample.java	lcm1602-i2c.js	lcm1602-i2c.py
+lcm1602-i2c.cxx Lcm1602_i2c_Example.java lcm1602-i2c.js lcm1602-i2c.py
-ldt0028.cxx	LDT0028Sample.java	ldt0028.js	ldt0028.py
+ldt0028.cxx LDT0028_Example.java ldt0028.js ldt0028.py
-light.cxx	LightSample.java	light.js	light.py
+light.cxx Light_Example.java light.js light.py
-lol.cxx	LoLSample.java	lol.js	lol.py
+lol.cxx LoL_Example.java lol.js lol.py
-lsm303dlh.cxx	LSM303DLHSample.java	lsm303dlh.js	lsm303dlh.py
+lsm303dlh.cxx LSM303DLH_Example.java lsm303dlh.js lsm303dlh.py
-m24lr64e.cxx	M24LR64ESample.java	m24lr64e.js	m24lr64e.py
+m24lr64e.cxx M24LR64E_Example.java m24lr64e.js m24lr64e.py
-max44000.cxx	MAX44000Sample.java	max44000.js	max44000.py
+max44000.cxx MAX44000_Example.java max44000.js max44000.py
-mic.cxx	MicrophoneSample.java	mic.js	mic.py
+mic.cxx Microphone_Example.java mic.js mic.py
-mma7455.cxx	MMA7455Sample.java	mma7455.js	mma7455.py
+mma7455.cxx MMA7455_Example.java mma7455.js mma7455.py
-mma7660.cxx	MMA7660Sample.java	mma7660.js	mma7660.py
+mma7660.cxx MMA7660_Example.java mma7660.js mma7660.py
-mpl3115a2.cxx	MPL3115A2Sample.java	mpl3115a2.js	mpl3115a2.py
+mpl3115a2.cxx MPL3115A2_Example.java mpl3115a2.js mpl3115a2.py
-mpr121.cxx	MPR121Sample.java	mpr121.js	mpr121.py
+mpr121.cxx MPR121_Example.java mpr121.js mpr121.py
-mpu9150.cxx	MPU9150Sample.java	mpu9150.js	mpu9150.py
+mpu9150.cxx MPU9150_Example.java mpu9150.js mpu9150.py
-gas-mq2.cxx	MQ2Sample.java	mq2.js	mq2.py
+gas-mq2.cxx MQ2_Example.java mq2.js mq2.py
-mq303a.cxx	MQ303ASample.java	mq303a.js	mq303a.py
+mq303a.cxx MQ303A_Example.java mq303a.js mq303a.py
-gas-mq5.cxx	MQ5Sample.java	mq5.js	mq5.py
+gas-mq5.cxx MQ5_Example.java mq5.js mq5.py
-nrf24l01-receiver.cxx	NRF24L01_receiverSample.java	nrf24l01-receiver.js	nrf24l01-receiver.py
+nrf24l01-receiver.cxx NRF24L01_receiver_Example.java nrf24l01-receiver.js nrf24l01-receiver.py
-nrf24l01-transmitter.cxx	NRF24L01_transmitterSample.java	nrf24l01-transmitter.js	nrf24l01-transmitter.py
+nrf24l01-transmitter.cxx NRF24L01_transmitter_Example.java nrf24l01-transmitter.js nrf24l01-transmitter.py
-nunchuck.cxx	NUNCHUCKSample.java	nunchuck.js	nunchuck.py
+nunchuck.cxx NUNCHUCK_Example.java nunchuck.js nunchuck.py
-otp538u.cxx	OTP538USample.java	otp538u.js	otp538u.py
+otp538u.cxx OTP538U_Example.java otp538u.js otp538u.py
-ppd42ns.cxx	PPD42NSSample.java	ppd42ns.js	ppd42ns.py
+ppd42ns.cxx PPD42NS_Example.java ppd42ns.js ppd42ns.py
-pulsensor.cxx	PulsensorSample.java	pulsensor.js	pulsensor.py
+pulsensor.cxx Pulsensor_Example.java pulsensor.js pulsensor.py
-relay.cxx	RelaySample.java	relay.js	relay.py
+relay.cxx Relay_Example.java relay.js relay.py
-rfr359f.cxx	RFR359FSample.java	rfr359f.js	rfr359f.py
+rfr359f.cxx RFR359F_Example.java rfr359f.js rfr359f.py
-rotary.cxx	RotarySample.java	rotary.js	rotary.py
+rotary.cxx Rotary_Example.java rotary.js rotary.py
-rotaryencoder.cxx	RotaryEncoderSample.java	rotaryencoder.js	rotaryencoder.py
+rotaryencoder.cxx RotaryEncoder_Example.java rotaryencoder.js rotaryencoder.py
-rpr220.cxx	RPR220Sample.java	rpr220.js	rpr220.py
+rpr220.cxx RPR220_Example.java rpr220.js rpr220.py
-rpr220-intr.cxx	RPR220_intrSample.java	rpr220-intr.js	rpr220-intr.py
+rpr220-intr.cxx RPR220_intr_Example.java rpr220-intr.js rpr220-intr.py
-slide.cxx	SlideSample.java	slide.js	slide.py
+slide.cxx Slide_Example.java slide.js slide.py
-speaker.cxx	SpeakerSample.java	speaker.js	speaker.py
+speaker.cxx Speaker_Example.java speaker.js speaker.py
-lcd-ssd1308-oled.cxx	SSD1308_oledSample.java	ssd1308-oled.js	ssd1308-oled.py
+lcd-ssd1308-oled.cxx SSD1308_oled_Example.java ssd1308-oled.js ssd1308-oled.py
-lcd-ssd1327-oled.cxx	SSD1327_oledSample.java	ssd1327-oled.js	ssd1327-oled.py
+lcd-ssd1327-oled.cxx SSD1327_oled_Example.java ssd1327-oled.js ssd1327-oled.py
-st7735.cxx	ST7735Sample.java	st7735.js	st7735.py
+st7735.cxx ST7735_Example.java st7735.js st7735.py
-stepmotor.cxx	StepMotorSample.java	stepmotor.js	stepmotor.py
+stepmotor.cxx StepMotor_Example.java stepmotor.js stepmotor.py
-tm1637.cxx	TM1637Sample.java	tm1637.js	tm1637.py
+tm1637.cxx TM1637_Example.java tm1637.js tm1637.py
-gas-tp401.cxx	TP401Sample.java	tp401.js	tp401.py
+gas-tp401.cxx TP401_Example.java tp401.js tp401.py
-tsl2561.cxx	TSL2561Sample.java	tsl2561.js	tsl2561.py
+tsl2561.cxx TSL2561_Example.java tsl2561.js tsl2561.py
-ttp223.cxx	TTP223Sample.java	ttp223.js	ttp223.py
+ttp223.cxx TTP223_Example.java ttp223.js ttp223.py
-uln200xa.cxx	ULN200XASample.java	uln200xa.js	uln200xa.py
+uln200xa.cxx ULN200XA_Example.java uln200xa.js uln200xa.py
-vdiv.cxx	VDivSample.java	vdiv.js	vdiv.py
+vdiv.cxx VDiv_Example.java vdiv.js vdiv.py
-water.cxx	WaterSample.java	water.js	water.py
+water.cxx Water_Example.java water.js water.py
-wt5001.cxx	WT5001Sample.java	wt5001.js	wt5001.py
+wt5001.cxx WT5001_Example.java wt5001.js wt5001.py
-yg1006.cxx	YG1006Sample.java	yg1006.js	yg1006.py
+yg1006.cxx YG1006_Example.java yg1006.js yg1006.py
-sensortemplate.cxx	SensorTemplateSample.java	sensortemplate.js	sensortemplate.py
+sensortemplate.cxx SensorTemplate_Example.java sensortemplate.js sensortemplate.py
-p9813.cxx	P9813Sample.java	p9813.js	p9813.py
+p9813.cxx P9813_Example.java p9813.js p9813.py
 tcs37727.cxx tcs37727.py
 tmp006.cxx tmp006.py
 mma8x5x.cxx mma8x5x.py

examples/java/A110X_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class A110XSample {
+public class A110X_Example {
 	
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]

examples/java/A110X_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class A110X_intrSample {
+public class A110X_intr_Example {
 	
 	public static int counter=0;
 		
@@ -52,6 +52,6 @@ class A110XISR implements Runnable {
 		super();
 	}
 	public void run(){
-		A110X_intrSample.counter++;
+		A110X_intr_Example.counter++;
 	}
 }

examples/java/ADC121C021_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class ADC121C021Sample {
+public class ADC121C021_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/AM2315_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_am2315.AM2315;
 
-public class AM2315Example {
+public class AM2315_Example {
 
 	static {
 		try {

examples/java/APA102_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class APA102Sample {
+public class APA102_Example {
 
   public static void main(String[] args) throws InterruptedException {
     // ! [Interesting]

examples/java/Ad8232_Example.java

@@ -23,7 +23,7 @@
 */
 import upm_ad8232.AD8232;
 
-public class Ad8232Example {
+public class Ad8232_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/Ads1015_Example.java

@@ -31,7 +31,7 @@ import java.io.*;
 import java.util.concurrent.*;
 import upm_ads1x15.*;
 
-public class Ads1015Sample
+public class Ads1015_Example
 {
     static boolean running = true;
     static int id = 0; // Sample number

examples/java/Ads1115_Example.java

@@ -30,7 +30,7 @@ import java.io.*;
 import java.util.concurrent.*;
 import upm_ads1x15.*;
 
-public class Ads1115Sample
+public class Ads1115_Example
 {
     static boolean running = true;
     static int id = 0; // Sample number

examples/java/Adxl345_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class Adxl345Sample {
+public class Adxl345_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Apds9002_Example.java

@@ -24,7 +24,7 @@
 
 import upm_apds9002.APDS9002;
 
-public class Apds9002 {
+public class Apds9002_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/BISS0001_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BISS0001Sample{
+public class BISS0001_Example{
 
 	public static void main(String[] args) throws InterruptedException {
 //! [Interesting]

examples/java/BMA220_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BMA220Sample {
+public class BMA220_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/BME280_Interface_Example.java

@@ -26,7 +26,7 @@
 import upm_bmp280.*;
 import upm_interfaces.*;
 
-public class BME280_InterfaceExample
+public class BME280_Interface_Example
 {
     public static void main(String[] args) throws InterruptedException
     {

examples/java/BMPX8X_Example.java

@@ -23,7 +23,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BMPX8XSample {
+public class BMPX8X_Example {
 
     public static void main(String[] args) throws InterruptedException {
 // ! [Interesting]

examples/java/Button_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class ButtonSample {
+public class Button_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Button_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Button_intrSample {
+public class Button_intr_Example {
 
 	public static int counter = 0;
 
@@ -47,7 +47,7 @@ class ButtonISR implements Runnable {
 	}
 
 	public void run() {
-		Button_intrSample.counter++;
+		Button_intr_Example.counter++;
 		System.out.println("Button pressed!");
 	}
 }

examples/java/Buzzer_Example.java

@@ -23,7 +23,7 @@
  */
 
 import upm_buzzer.Buzzer;
-public class BuzzerSample {
+public class Buzzer_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/CJQ4435_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class CJQ4435Sample {
+public class CJQ4435_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// Instantiate a CJQ4435 MOSFET on a PWM capable digital pin D3

examples/java/CMakeLists.txt

@@ -1,225 +1,262 @@
+# The purpose of this CMakeLists.txt is to compile all listed JAVA examples
+# during build time (ensuring that ALL examples compile against their
+# dependency JAVA packages).
+
 find_package(Java REQUIRED)
 include(UseJava)
 
-macro(add_example example_name jar_name)
+# Add a JAVA example target for the provided JAVA source file which depends
-    set(example_src "${example_name}.java")
+# on UPM JAVA targets.
-    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_name}/upm_${jar_name}.jar")
+#
+# Usage:
+#   add_example(example_class_name upm_target_dependency_list)
+#
+# Parameters:
+#   example_class_name: JAVA class name.  This name MUST match the JAVA
+#                       example file name.
+#                       <example_class_name>.java
+#   upm_target_dependency_list: One or more UPM library targets.  This
+#                       function assumes a javaupm_<target> also exists.
+#
+# Examples:
+#   # Creates SensorFooExample JAVA target, depends on target: sensorfoo,
+#   # and will add upm_sensorfoo.jar to the javac classpath.
+#   add_example(SensorFooExample sensorfoo)
+#
+#   # Creates SensorFooExample JAVA target, depends on targets: sensorfoo,
+#   # and interfaces and will add both upm_sensorfoo.jar and upm_interfaces.jar
+#   # to the javac classpath.
+#   add_example(SensorFooExample "sensorfoo;interfaces"")
+#
+function(add_example example_class_name dependency_list)
+    set(example_file "${example_class_name}.java")
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
+    # Build a list of all dependency jar files
-    add_dependencies(${example_name} javaupm_${jar_name})
+    set(jar_file_list "")
-endmacro()
 
-macro(add_example_with_path example_name jar_path jar_name)
+    # Build a list of all dependency java target names
-    set(example_src "${example_name}.java")
+    set(java_targets_list "")
-    set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_path}/upm_${jar_name}.jar")
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${example_jar})
+    # Iterate over the dependencies
-    add_dependencies(${example_name} javaupm_${jar_name})
+    foreach(dependency ${dependency_list})
-endmacro()
+        set(java_target "javaupm_${dependency}")
 
-macro(add_example_multiple_jars example_name example_jar_name jar_name_list)
+        # Append to the targets list
-    set(example_src "${example_name}.java")
+        list(APPEND java_targets_list ${java_target})
 
-    set(list_of_jars "")
+        # If a dependency target does NOT exist, print a warning and skip
-    foreach(jar_name ${jar_name_list})
+        if (NOT TARGET ${java_target})
-        set(example_jar "${CMAKE_CURRENT_BINARY_DIR}/../../src/${jar_name}/upm_${jar_name}.jar")
+            message(STATUS "Example ${example_file} is missing a required CMake target (${java_target}), skipping...")
-        list(APPEND list_of_jars ${example_jar})
+            return()
+        endif()
+
+        # Get the jar for this java_target (saved as a property)
+        get_target_property(jar_file ${java_target} JAR_FILE_ABSOLUTE)
+
+        # Append to the jar list
+        list(APPEND jar_file_list ${jar_file})
     endforeach()
 
-    add_jar(${example_name} SOURCES ${example_src} INCLUDE_JARS ${list_of_jars})
+    # Add the jar/s
-    add_dependencies(${example_name} javaupm_${example_jar_name})
+    add_jar(${example_class_name} SOURCES ${example_file} INCLUDE_JARS ${jar_file_list})
-endmacro()
 
-add_example(A110X_intrSample a110x)
+    # Add a dependency from this jar to all dependency java targets
-add_example(A110XSample a110x)
+    add_dependencies(${example_class_name} ${java_targets_list})
-add_example(ADC121C021Sample adc121c021)
+endfunction()
-add_example(Adxl345Sample adxl345)
+
-add_example(Apds9002 apds9002)
+add_example(A110X_Example a110x)
-add_example(BISS0001Sample biss0001)
+add_example(A110X_intr_Example a110x)
-add_example_multiple_jars(BMPX8XSample bmpx8x "bmpx8x;interfaces")
+add_example(Ad8232_Example ad8232)
-add_example(BuzzerSample buzzer)
+add_example(ADC121C021_Example adc121c021)
-add_example(CJQ4435Sample cjq4435)
+add_example(Ads1015_Example "ads1x15;interfaces")
-add_example(DS1307Sample ds1307)
+add_example(Ads1115_Example ads1x15)
-add_example(ENC03RSample enc03r)
+add_example(Adxl345_Example adxl345)
-add_example(ES08ASample servo)
+add_example(AM2315_Example am2315)
-add_example(ButtonSample button)
+add_example(APA102_Example apa102)
-add_example(GroveButtonSample grove)
+add_example(Apds9002_Example apds9002)
-add_example(Button_intrSample button)
-add_example(GroveButton_intrSample grove)
-add_example(Collision collision)
-add_example(EHRSample ehr)
-add_example(GroveEHRSample groveehr)
-add_example(Emg emg)
-add_example(GroveEmg groveemg)
-add_example(Gsr gsr)
-add_example(GroveGsr grovegsr)
-add_example(LEDSample led)
-add_example(LightSample light)
-add_example(GroveLightSample grove)
-add_example(GroveLineFinderSample grovelinefinder)
-add_example(LineFinderSample linefinder)
-add_example(GroveLed_multiSample grove)
-add_example(GroveLEDSample grove)
-add_example(GroveMDSample grovemd)
-add_example(MDSample md)
-add_example(MoistureSample moisture)
-add_example(GroveMoistureSample grovemoisture)
-add_example(GroveMQ3 gas)
-add_example(GroveMQ9 gas)
-add_example(O2Example o2)
-add_example(GroveO2Example groveo2)
-add_example(GroveQTouch at42qt1070)
-add_example(RelaySample relay)
-add_example(GroveRelaySample grove)
-add_example(RotarySample rotary)
-add_example(GroveRotarySample grove)
-add_example(GROVESCAMSample grovescam)
-add_example(SCAMSample scam)
-add_example(SlideSample slide)
-add_example(GroveSlideSample grove)
-add_example(SpeakerSample speaker)
-add_example(GroveSpeakerSample grovespeaker)
-add_example(TemperatureSample temperature)
-add_example(GroveTempSample grove)
-add_example(VDivSample vdiv)
-add_example(GroveVDivSample grovevdiv)
-add_example(WaterSample water)
-add_example(GroveWaterSample grovewater)
-add_example(GroveWFSSample grovewfs)
-add_example(WFSSample wfs)
-add_example(GUVAS12DSample guvas12d)
-add_example(H3LIS331DLSample h3lis331dl)
-add_example(HCSR04Sample hcsr04)
-add_example(HM11Sample hm11)
-add_example(Hmc5883lSample hmc5883l)
-add_example(HMTRPSample hmtrp)
-add_example(HP20xExample hp20x)
-add_example(HTU21DSample htu21d)
-add_example(Itg3200Sample itg3200)
-add_example(Joystick12Sample joystick12)
-add_example(LDT0028Sample ldt0028)
-add_example(LoLSample lol)
-add_example(LSM303DLHSample lsm303dlh)
-add_example(M24LR64ESample m24lr64e)
-add_example(MAX44000Sample max44000)
-add_example(MHZ16Sample mhz16)
-add_example(MicrophoneSample mic)
-add_example(MMA7455Sample mma7455)
-add_example(MMA7660Sample mma7660)
-add_example(MPL3115A2Sample mpl3115a2)
-add_example(MPR121Sample mpr121)
-add_example(MPU9150Sample mpu9150)
-add_example(MQ2Sample gas)
-add_example(MQ303ASample mq303a)
-add_example(MQ5Sample gas)
-add_example(GroveLEDBar my9221)
-add_example(NRF24L01_receiverSample nrf24l01)
-add_example(NRF24L01_transmitterSample nrf24l01)
-add_example(NUNCHUCKSample nunchuck)
-add_example(OTP538USample otp538u)
-add_example(PPD42NSSample ppd42ns)
-add_example(PulsensorSample pulsensor)
-add_example(RFR359FSample rfr359f)
-add_example(RotaryEncoderSample rotaryencoder)
-add_example(RPR220_intrSample rpr220)
-add_example(RPR220Sample rpr220)
-add_example(ST7735Sample st7735)
-if (NOT ANDROID)
-  add_example(StepMotorSample stepmotor)
-endif ()
-add_example(TM1637Sample tm1637)
-add_example(TP401Sample gas)
-add_example(TSL2561Sample tsl2561)
-add_example(TTP223Sample ttp223)
-add_example(ULN200XASample uln200xa)
-add_example(WaterLevelSensor waterlevel)
-add_example(WT5001Sample wt5001)
-add_example(YG1006Sample yg1006)
-add_example(ZFM20Sample zfm20)
-add_example(Ad8232Example ad8232)
-add_example(Gp2y0aExample gp2y0a)
-add_example(Th02Example th02)
-add_example(FlexSensorExample flex)
-add_example(CWLSXXA_Example cwlsxxa)
-add_example(TEAMS_Example teams)
-add_example(APA102Sample apa102)
-add_example(TEX00_Example tex00)
-add_example(BMI160_Example bmi160)
-add_example(Tsl2561 tsl2561)
-add_example(AM2315Example am2315)
-add_example(MAX31855Example max31855)
-add_example(MAX5487Example max5487)
-add_example(MAXds3231mExample maxds3231m)
-add_example(ECS1030Example ecs1030)
-add_example(SM130Example sm130)
-if (MODBUS_FOUND)
-  add_example(H803X_Example h803x)
-endif()
-if (BACNET_FOUND)
-  add_example(E50HX_Example e50hx)
-  add_example(T8100_Example t8100)
-  add_example(TB7300_Example tb7300)
-endif()
-if (JPEG_FOUND)
-  add_example(VCAP_Example vcap)
-endif()
-add_example_multiple_jars(BMP280_Example bmp280 "bmp280;interfaces")
-add_example(BNO055_Example bno055)
-add_example(BMX055_Example bmx055)
-add_example(NMEAGPS_Example nmea_gps)
-add_example(MMA7361_Example mma7361)
 add_example(BH1750_Example bh1750)
-add_example(HKA5_Example hka5)
+add_example(BISS0001_Example biss0001)
-add_example(DFRORP_Example dfrorp)
-add_example(DFREC_Example dfrec)
-add_example(SHT1X_Example sht1x)
-add_example(MS5803_Example ms5803)
-add_example(ECEZO_Example ecezo)
-add_example(IMS_Example ims)
-add_example(MB704X_Example mb704x)
-add_example(MCP2515_Example mcp2515)
-add_example_multiple_jars(Ads1015Sample ads1x15 "ads1x15;interfaces")
-add_example(MAX30100_Example max30100)
-add_example(Ads1115Sample ads1x15)
-add_example(SensorTemplateSample sensortemplate)
-add_example(P9813Sample p9813)
-add_example(BMG160_Example bmg160)
 add_example(BMA250E_Example bma250e)
+add_example(BMC150_Example bmx055)
+add_example(BME280_Example "bmp280;interfaces")
+add_example(BMG160_Example bmg160)
+add_example(BMI055_Example bmx055)
+add_example(BMI160_Example bmi160)
 add_example(BMM150_Example bmm150)
+add_example(BMP280_Example "bmp280;interfaces")
+add_example(BMPX8X_Example "bmpx8x;interfaces")
+add_example(BMX055_Example bmx055)
+add_example(BNO055_Example bno055)
+add_example(Button_Example button)
+add_example(Button_intr_Example button)
+add_example(Buzzer_Example buzzer)
+add_example(CJQ4435_Example cjq4435)
+add_example(Collision_Example collision)
+add_example(CWLSXXA_Example cwlsxxa)
+add_example(DFREC_Example dfrec)
+add_example(DFRORP_Example dfrorp)
+add_example(DS1307_Example ds1307)
+add_example(ECEZO_Example ecezo)
+add_example(ECS1030_Example ecs1030)
+add_example(EHR_Example ehr)
+add_example(Emg_Example emg)
+add_example(ENC03R_Example enc03r)
+add_example(ES08A_Example "servo;interfaces")
+add_example(FlexSensor_Example flex)
+add_example(Gp2y0a_Example gp2y0a)
+add_example(GroveButton_Example grove)
+add_example(GroveButton_intr_Example grove)
+add_example(GroveEHR_Example groveehr)
+add_example(GroveEmg_Example groveemg)
+add_example(GroveGsr_Example grovegsr)
+add_example(GroveLEDBar_Example my9221)
+add_example(GroveLED_Example grove)
+add_example(GroveLed_multi_Example grove)
+add_example(GroveLight_Example grove)
+add_example(GroveLineFinder_Example grovelinefinder)
+add_example(GroveMD_Example grovemd)
+add_example(GroveMoisture_Example grovemoisture)
+add_example(GroveMQ3_Example gas)
+add_example(GroveMQ9_Example gas)
+add_example(GroveO2_Example groveo2)
+add_example(GroveQTouch_Example at42qt1070)
+add_example(GroveRelay_Example grove)
+add_example(GroveRotary_Example grove)
+add_example(GROVESCAM_Example grovescam)
+add_example(GroveSlide_Example grove)
+add_example(GroveSpeaker_Example grovespeaker)
+add_example(GroveTemp_Example grove)
+add_example(GroveVDiv_Example grovevdiv)
+add_example(GroveWater_Example grovewater)
+add_example(GroveWFS_Example grovewfs)
+add_example(Gsr_Example gsr)
+add_example(GUVAS12D_Example guvas12d)
+add_example(H3LIS331DL_Example h3lis331dl)
+add_example(HCSR04_Example hcsr04)
+add_example(HKA5_Example hka5)
+add_example(HM11_Example hm11)
+add_example(Hmc5883l_Example hmc5883l)
+add_example(HMTRP_Example hmtrp)
+add_example(HP20x_Example hp20x)
+add_example(HTU21D_Example htu21d)
+add_example(Itg3200_Example itg3200)
+add_example(Jhd1313m1_Example jhd1313m1)
+add_example(Jhd1313m1_lcd_Example jhd1313m1)
+add_example(Joystick12_Example joystick12)
+add_example(KX122_Example kx122)
+add_example(Lcm1602_i2c_Example lcm1602)
+add_example(Lcm1602_parallel_Example lcm1602)
+add_example(LDT0028_Example ldt0028)
+add_example(LE910_Example uartat)
+add_example(LED_Example led)
+add_example(Light_Example light)
+add_example(LineFinder_Example linefinder)
+add_example(LIS2DS12_Example lis2ds12)
+add_example(LoL_Example lol)
 add_example(LSM303AGR_Example lsm303agr)
 add_example(LSM303D_Example lsm303d)
-add_example(VEML6070Sample veml6070)
+add_example(LSM303DLH_Example lsm303dlh)
-add_example(RN2903_Example rn2903)
-add_example(LIS2DS12_Example lis2ds12)
 add_example(LSM6DS3H_Example lsm6ds3h)
 add_example(LSM6DSL_Example lsm6dsl)
-
+add_example(M24LR64E_Example m24lr64e)
-add_example_with_path(Jhd1313m1_lcdSample jhd1313m1 jhd1313m1)
+add_example(MAX30100_Example max30100)
-add_example_with_path(Jhd1313m1Sample jhd1313m1 jhd1313m1)
+add_example(MAX31855_Example max31855)
-add_example_with_path(Lcm1602_i2cSample lcm1602 lcm1602)
+add_example(MAX44000_Example max44000)
-add_example_with_path(Lcm1602_parallelSample lcm1602 lcm1602)
+add_example(MAX5487_Example max5487)
-add_example_with_path(SSD1308_oledSample lcd lcd)
+add_example(MAXds3231m_Example maxds3231m)
-add_example_with_path(SSD1327_oledSample lcd lcd)
+add_example(MB704X_Example mb704x)
-add_example_multiple_jars(BME280_Example bmp280 "bmp280;interfaces")
+add_example(MCP2515_Example mcp2515)
+add_example(MCP2515_TXRX_Example mcp2515)
+add_example(MD_Example md)
+add_example(MHZ16_Example mhz16)
+add_example(Microphone_Example mic)
+add_example(MMA7361_Example mma7361)
+add_example(MMA7455_Example mma7455)
+add_example(MMA7660_Example mma7660)
+add_example(Moisture_Example moisture)
+add_example(MPL3115A2_Example mpl3115a2)
+add_example(MPR121_Example mpr121)
+add_example(MPU9150_Example mpu9150)
+add_example(MQ2_Example gas)
+add_example(MQ303A_Example mq303a)
+add_example(MQ5_Example gas)
+add_example(MS5803_Example ms5803)
+add_example(NMEAGPS_Example nmea_gps)
+add_example(NMEAGPS_I2C_Example nmea_gps)
+add_example(NRF24L01_receiver_Example nrf24l01)
+add_example(NRF24L01_transmitter_Example nrf24l01)
+add_example(NUNCHUCK_Example nunchuck)
+add_example(O2_Example o2)
+add_example(OTP538U_Example otp538u)
+add_example(P9813_Example p9813)
+add_example(PPD42NS_Example ppd42ns)
+add_example(Pulsensor_Example pulsensor)
+add_example(Relay_Example relay)
+add_example(RFR359F_Example rfr359f)
+add_example(RN2903_Example rn2903)
+add_example(RN2903_P2P_RX_Example rn2903)
+add_example(RN2903_P2P_TX_Example rn2903)
+add_example(RotaryEncoder_Example rotaryencoder)
+add_example(Rotary_Example rotary)
+add_example(RPR220_Example rpr220)
+add_example(RPR220_intr_Example rpr220)
+add_example(SCAM_Example scam)
+add_example(SensorTemplate_Example sensortemplate)
+add_example(SHT1X_Example sht1x)
+add_example(Slide_Example slide)
+add_example(SM130_Example sm130)
+add_example(Speaker_Example speaker)
+add_example(SpeakerPWM_Example speaker)
+add_example(SSD1308_oled_Example lcd)
+add_example(SSD1327_oled_Example lcd)
+add_example(ST7735_Example st7735)
+add_example(TEAMS_Example teams)
+add_example(Temperature_Example temperature)
+add_example(TEX00_Example tex00)
+add_example(Th02_Example th02)
+add_example(TM1637_Example tm1637)
+add_example(TP401_Example gas)
+add_example(TSL2561_Example tsl2561)
+add_example(Tsl2561_Example tsl2561)
+add_example(TTP223_Example ttp223)
+add_example(ULN200XA_Example uln200xa)
+add_example(VDiv_Example vdiv)
+add_example(VEML6070_Example veml6070)
+add_example(Water_Example water)
+add_example(WaterLevelSensor_Example waterlevel)
+add_example(WFS_Example wfs)
+add_example(WT5001_Example wt5001)
+add_example(YG1006_Example yg1006)
+add_example(ZFM20_Example zfm20)
 
 if(SWIG_VERSION VERSION_GREATER 3.0.8)
-  add_example_multiple_jars(BME280_InterfaceExample bmp280 "bmp280;interfaces")
+    add_example(BME280_Interface_Example "bmp280;interfaces")
+    add_example(IMS_Example "ims;interfaces")
+    add_example(RHUSB_Example "rhusb;interfaces")
 endif()
 
-add_example_with_path(BMC150_Example bmx055 bmx055)
-add_example_with_path(BMI055_Example bmx055 bmx055)
 if (OPENZWAVE_FOUND)
-  add_example_with_path(AeotecSS6_Example ozw ozw)
+    add_example(AeotecDSB09104_Example ozw)
-  add_example_with_path(AeotecSDG2_Example ozw ozw)
+    add_example(AeotecDW2E_Example ozw)
-  add_example_with_path(AeotecDW2E_Example ozw ozw)
+    add_example(AeotecSDG2_Example ozw)
-  add_example_with_path(AeotecDSB09104_Example ozw ozw)
+    add_example(AeotecSS6_Example ozw)
-  add_example_with_path(TZEMT400_Example ozw ozw)
+    add_example(TZEMT400_Example ozw)
 endif()
-add_example_with_path(NMEAGPS_I2C_Example nmea_gps nmea_gps)
-add_example_with_path(MCP2515_TXRX_Example mcp2515 mcp2515)
-add_example_with_path(LE910_Example uartat uartat)
-add_example_with_path(SpeakerPWMSample speaker speaker)
-add_example_with_path(RN2903_P2P_RX_Example rn2903 rn2903)
-add_example_with_path(RN2903_P2P_TX_Example rn2903 rn2903)
 
-add_example(KX122Example kx122)
+if (MODBUS_FOUND)
+    add_example(H803X_Example h803x)
+endif()
+
+if (BACNET_FOUND)
+    add_example(E50HX_Example e50hx)
+    add_example(T8100_Example t8100)
+    add_example(TB7300_Example tb7300)
+endif()
+
+if (JPEG_FOUND)
+    add_example(VCAP_Example vcap)
+endif()
+
+if (NOT ANDROID)
+    add_example(StepMotor_Example stepmotor)
+endif ()

examples/java/Collision_Example.java

@@ -24,7 +24,7 @@
 
 import upm_collision.*;
 
-public class Collision {
+public class Collision_Example {
 
 	public static void main(String[] args) {
 		// Initializing the sensor on D2 on the Base Shield

examples/java/DFRPH_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class DFRPHSample {
+public class DFRPH_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/DS1307_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class DS1307Sample {
+public class DS1307_Example {
 
 	static private void printTime(upm_ds1307.DS1307 rtc) {
 		System.out.print("The time is: " + rtc.getMonth() + "/" + rtc.getDayOfMonth() + "/"

examples/java/ECS1030_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_ecs1030.ECS1030;
 
-public class ECS1030Example {
+public class ECS1030_Example {
 
 	static {
 		try {

examples/java/EHR_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class EHRSample {
+public class EHR_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/ENC03R_Example.java

@@ -23,7 +23,7 @@
  */
 
 
-public class ENC03RSample {
+public class ENC03R_Example {
 	private static final long CALIBRATION_SAMPLES = 1000;
 
 	public static void main(String[] args) throws InterruptedException {

examples/java/ES08A_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class ES08ASample {
+public class ES08A_Example {
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
 		upm_servo.ES08A servo = new upm_servo.ES08A(6);

examples/java/Emg_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_emg.EMG;
 
-public class Emg {
+public class Emg_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/FlexSensor_Example.java

@@ -1,6 +1,6 @@
 import upm_flex.Flex;
 
-public class FlexSensorExample {
+public class FlexSensor_Example {
 
 	static {
 		try {

examples/java/GROVESCAM_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GROVESCAMSample {
+public class GROVESCAM_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GUVAS12D_Example.java

@@ -23,7 +23,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GUVAS12DSample {
+public class GUVAS12D_Example {
     // analog voltage, usually 3.3 or 5.0
     private static final float GUVAS12D_AREF = 5;
 

examples/java/Gp2y0a_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_gp2y0a.GP2Y0A;
 
-public class Gp2y0aExample {
+public class Gp2y0a_Example {
 	
 	public static final float GP2Y0A_AREF 		= 5;
 	public static final short SAMPLES_PER_QUERY = 20;

examples/java/GroveButton_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveButtonSample {
+public class GroveButton_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveButton_intr_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveButton_intrSample {
+public class GroveButton_intr_Example {
 
 	public static int counter = 0;
 
@@ -47,7 +47,7 @@ class ButtonISR implements Runnable {
 	}
 
 	public void run() {
-		GroveButton_intrSample.counter++;
+		GroveButton_intr_Example.counter++;
 		System.out.println("Button pressed!");
 	}
 }

examples/java/GroveCollision_Example.java

@@ -24,7 +24,7 @@
 
 import upm_grovecollision.*;
 
-public class GroveCollision {
+public class GroveCollision_Example {
 
 	public static void main(String[] args) {
 		// Initializing the sensor on D2 on the Base Shield

examples/java/GroveEHR_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveEHRSample {
+public class GroveEHR_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveEmg_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_groveemg.GroveEMG;
 
-public class GroveEmg {
+public class GroveEmg_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveGsr_Example.java

@@ -24,7 +24,7 @@
 
 import upm_grovegsr.GroveGSR;
 
-public class GroveGsr {
+public class GroveGsr_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveLEDBar_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLEDBar {
+public class GroveLEDBar_Example {
 
     public static void main(String[] args) throws InterruptedException {
         //! [Interesting]

examples/java/GroveLED_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLEDSample {
+public class GroveLED_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         upm_grove.GroveLed led = new upm_grove.GroveLed(2);

examples/java/GroveLed_multi_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveLed_multiSample {
+public class GroveLed_multi_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveLight_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLightSample {
+public class GroveLight_Example {
 	public static void main(String args[]) throws InterruptedException {
 		// ! [Interesting]
 		upm_grove.GroveLight gl = new upm_grove.GroveLight(2);

examples/java/GroveLineFinder_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveLineFinderSample {
+public class GroveLineFinder_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveMD_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveMDSample {
+public class GroveMD_Example {
 	private static final short speed50 = 127;
 	private static final short speed0 = 0;
 

examples/java/GroveMQ3_Example.java

@@ -34,7 +34,7 @@ import upm_gas.MQ9;
 import upm_gas.TP401;
 import upm_gas.thresholdContext;
 
-public class GroveMQ3 {
+public class GroveMQ3_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveMQ9_Example.java

@@ -34,7 +34,7 @@ import upm_gas.MQ9;
 import upm_gas.TP401;
 import upm_gas.thresholdContext;
 
-public class GroveMQ9 {
+public class GroveMQ9_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveMoisture_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveMoistureSample {
+public class GroveMoisture_Example {
 	public static void main(String args[]) throws InterruptedException {
 		// ! [Interesting]
 		upm_grovemoisture.GroveMoisture gm = new upm_grovemoisture.GroveMoisture(1);

examples/java/GroveO2_Example.java

@@ -24,7 +24,7 @@
 
 import upm_groveo2.GroveO2;
 
-public class GroveO2Example {
+public class GroveO2_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveQTouch_Example.java

@@ -24,7 +24,7 @@
 
 import upm_at42qt1070.AT42QT1070;
 
-public class GroveQTouch {
+public class GroveQTouch_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/GroveRelay_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveRelaySample {
+public class GroveRelay_Example {
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]
 		// Create the button object using UART

examples/java/GroveRotary_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveRotarySample {
+public class GroveRotary_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveSlide_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveSlideSample {
+public class GroveSlide_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         // Instantiate new grove slide potentiometer on  analog pin A0

examples/java/GroveSpeaker_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveSpeakerSample {
+public class GroveSpeaker_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveTemp_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveTempSample {
+public class GroveTemp_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         upm_grove.GroveTemp temp = new upm_grove.GroveTemp(3);

examples/java/GroveUltraSonic_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveUltraSonicSample {
+public class GroveUltraSonic_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveVDiv_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveVDivSample {
+public class GroveVDiv_Example {
 	private static final short gain3 = 3;
 	private static final short gain10 = 10;
 

examples/java/GroveWFS_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class GroveWFSSample {
+public class GroveWFS_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/GroveWater_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class GroveWaterSample {
+public class GroveWater_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Gsr_Example.java

@@ -24,7 +24,7 @@
 
 import upm_gsr.GSR;
 
-public class Gsr {
+public class Gsr_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/H3LIS331DL_Example.java

@@ -27,7 +27,7 @@
 import java.util.AbstractList;
 import java.lang.Float;
 
-public class H3LIS331DLSample {
+public class H3LIS331DL_Example {
 	
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]

examples/java/HCSR04_Example.java

@@ -25,7 +25,7 @@
 //NOT TESTED!!!
 import upm_hcsr04.*;
 
-public class HCSR04Sample {
+public class HCSR04_Example {
 
 	// ! [Interesting]
 	public static void main(String[] args) throws InterruptedException {

examples/java/HM11_Example.java

@@ -23,12 +23,12 @@
  */
 
 //NOT TESTED!!!
-public class HM11Sample {
+public class HM11_Example {
 
 	private static final int BUFSIZ = 1024;
 
 	private static void printUsage() {
-		System.out.println("Usage: java HM11Sample [AT command]");
+		System.out.println("Usage: java HM11_Example [AT command]");
 
 		System.out.println("If an argument is supplied on the command line, that argument is");
 		System.out.println("sent to the module and the response is printed out.");

examples/java/HMTRP_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class HMTRPSample {
+public class HMTRP_Example {
 
 	static private final int bufferLength = 255;
 

examples/java/HP20x_Example.java

@@ -24,7 +24,7 @@
 
 import upm_hp20x.HP20X;
 
-public class HP20xExample {
+public class HP20x_Example {
 
 	public static void main(String[] args) {
 		// TODO Auto-generated method stub

examples/java/HTU21D_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class HTU21DSample {
+public class HTU21D_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Hmc5883l_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Hmc5883lSample {
+public class Hmc5883l_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Itg3200_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class Itg3200Sample {
+public class Itg3200_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Jhd1313m1_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Jhd1313m1Sample {
+public class Jhd1313m1_Example {
 
     public static void main(String[] args) throws InterruptedException {
         // ! [Interesting]

examples/java/Jhd1313m1_lcd_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Jhd1313m1_lcdSample{
+public class Jhd1313m1_lcd_Example{
 
     public static void main(String[] args) throws InterruptedException {
         //! [Interesting]

examples/java/Joystick12_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Joystick12Sample {
+public class Joystick12_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]

examples/java/Joystick12_example_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Joystick12_exampleSample {
+public class Joystick12_example_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]

examples/java/KX122_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class KX122Example {
+public class KX122_Example {
 	public static void main(String[] args) throws InterruptedException {
 		//! [Interesting]
 		// Instantiate a KX122

examples/java/LCD_EBOLED_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LCD_EBOLEDSample {
+public class LCD_EBOLED_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LCD_SSD1306_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LCD_SSD1306Sample {
+public class LCD_SSD1306_Example {
 	
 	static private final int[] intel_logo = new int[]{
 	        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,

examples/java/LDT0028_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class LDT0028Sample {
+public class LDT0028_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LED_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LEDSample {
+public class LED_Example {
 	public static void main (String args[]) throws InterruptedException {
 		//! [Interesting]
         upm_led.Led led = new upm_led.Led(2);

examples/java/LM35_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LM35Sample {
+public class LM35_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LSM303DLH_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class LSM303DLHSample {
+public class LSM303DLH_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LSM9DS0_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LSM9DS0Sample {
+public class LSM9DS0_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting

examples/java/Lcm1602_i2c_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class Lcm1602_i2cSample {
+public class Lcm1602_i2c_Example {
 
     public static void main(String[] args) throws InterruptedException {
         // ! [Interesting]

examples/java/Lcm1602_parallel_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class Lcm1602_parallelSample {
+public class Lcm1602_parallel_Example {
 
     public static void main(String[] args) throws InterruptedException {
         // ! [Interesting]

examples/java/Light_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LightSample {
+public class Light_Example {
     public static void main(String args[]) throws InterruptedException {
         // ! [Interesting]
         upm_light.Light gl = new upm_light.Light(0);

examples/java/LineFinder_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LineFinderSample {
+public class LineFinder_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LoL_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class LoLSample {
+public class LoL_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/LoL_example_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class LoL_exampleSample {
+public class LoL_example_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/Loudness_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class LoudnessSample {
+public class Loudness_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/M24LR64E_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class M24LR64ESample {
+public class M24LR64E_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MAX31855_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_max31855.MAX31855;
 
-public class MAX31855Example {
+public class MAX31855_Example {
 
 	static {
 		try {

examples/java/MAX44000_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class MAX44000Sample {
+public class MAX44000_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MAX5487_Example.java

@@ -23,7 +23,7 @@
  */
 import upm_max5487.MAX5487;
 
-public class MAX5487Example {
+public class MAX5487_Example {
 
 	static {
 		try {

examples/java/MAXds3231m_Example.java

@@ -24,7 +24,7 @@
 import upm_maxds3231m.MAXDS3231M;
 import upm_maxds3231m.Time3231;
 
-public class MAXds3231mExample {
+public class MAXds3231m_Example {
 
 	static {
 		try {

examples/java/MCP9808_Example.java

@@ -24,7 +24,7 @@
 import java.io.*;
 import upm_mcp9808.MCP9808;
 
-public class MCP9808Sample {
+public class MCP9808_Example {
 
 	public static void main(String[] args) throws InterruptedException, IOException {
 		// ! [Interesting]

examples/java/MD_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class MDSample {
+public class MD_Example {
 	private static final short speed50 = 127;
 	private static final short speed0 = 0;
 

examples/java/MG811_Example.java

@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class MG811Sample {
+public class MG811_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MHZ16_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class MHZ16Sample {
+public class MHZ16_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MMA7455_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class MMA7455Sample {
+public class MMA7455_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MMA7660_Example.java

@@ -25,7 +25,7 @@
 
 import upm_mma7660.MMA7660;
 
-public class MMA7660Sample
+public class MMA7660_Example
 {
     public static void main(String[] args) throws InterruptedException
         {

examples/java/MPL3115A2_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class MPL3115A2Sample {
+public class MPL3115A2_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]

examples/java/MPR121_Example.java

@@ -1,4 +1,4 @@
-public class MPR121Sample {
+public class MPR121_Example {
 
 	private static void printButtons(upm_mpr121.MPR121 touch) {
 		boolean buttonPresed = false;

examples/java/MPU9150_Example.java

@@ -23,7 +23,7 @@
  */
 
 //NOT TESTED!!!
-public class MPU9150Sample {
+public class MPU9150_Example {
 
 	public static void main(String[] args) throws InterruptedException {
 		// ! [Interesting]