Add additional pubber opts

bin/pubber

@@ -2,8 +2,8 @@
 
 ROOT_DIR=$(realpath $(dirname $0)/..)
 
-if [ $# != 4 ]; then
-    echo $0 SITE_PATH PROJECT_ID DEVICE_ID SERIAL_NO
+if [[ "${#}" -lt "4" ]]; then
+    echo $0 SITE_PATH PROJECT_ID DEVICE_ID SERIAL_NO [options] ...
     false
 fi
 
@@ -23,4 +23,35 @@ $ROOT_DIR/pubber/bin/build > /dev/null
 
 echo Running tools version `(cd $ROOT_DIR; git describe)`
 
-$ROOT_DIR/pubber/bin/run $project_id $site_path $device_id $serial_no
+if [[ "${#}" -gt "0" ]]; then   
+    declare -A options
+    for option in $*; do
+        if [[ $option == *"="* ]]; then
+            k=$(echo $option | cut -d'=' -f1)
+            v=$(echo $option | cut -d'=' -f2)
+            options[$k]=$v
+        else
+            options[$option]=$option
+        fi
+    done
+
+    extra_field="${options[extra_field]}"    
+    extra_point="${options[extra_point]}"
+
+    cloud_region=`jq -r .cloud_region $site_path/cloud_iot_config.json`
+
+        cat <<EOF > /tmp/pubber_config.json
+{
+    "projectId": "$project_id",
+    "sitePath": "$site_path",
+    "cloudRegion": "$cloud_region",
+    "deviceId": "$device_id",
+    "serialNo": "$serial",
+    "extraField": "$extra_field",
+    "extraPoint": "$extra_point"
+}
+EOF
+    $ROOT_DIR/pubber/bin/run /tmp/pubber_config.json
+else
+    $ROOT_DIR/pubber/bin/run $project_id $site_path $device_id $serial_no
+fi

pubber/src/main/java/daq/pubber/Configuration.java

@@ -18,4 +18,5 @@ public class Configuration {
   public Object extraField;
   public String serialNo;
   public String macAddr;
+  public String extraPoint;
 }

pubber/src/main/java/daq/pubber/Pubber.java

@@ -359,6 +359,10 @@ private void initializeDevice() {
     deviceState.system.software.put("firmware", "v1");
     devicePoints.extraField = configuration.extraField;
 
+    if (configuration.extraPoint != null && !configuration.extraPoint.isEmpty()) {
+      addPoint(makePoint(configuration.extraPoint,
+          makePointPointsetModel(true, 50, 50, "Celsius")));
+    }
     markStateDirty(0);
   }