diff --git a/sbfspot/rootfs/usr/bin/sbfspot/generateConfig.sh b/sbfspot/rootfs/usr/bin/sbfspot/generateConfig.sh index 294eda4..4e675bc 100644 --- a/sbfspot/rootfs/usr/bin/sbfspot/generateConfig.sh +++ b/sbfspot/rootfs/usr/bin/sbfspot/generateConfig.sh @@ -2,10 +2,12 @@ CFG_PATH=$1 CFG_PATH_UPLOAD=$2 CONFIG_PATH=/data/options.json -echo "Generating $CFG_PATH & $CFG_PATH_UPLOAD" - +#CONFIG_CONNECTION_TYPE="$(jq --raw-output '.Connection_Type' $CONFIG_PATH)" +#CONFIG_BLUETOOTH="$(jq --raw-output '.Bluetooth' $CONFIG_PATH)" +#CONFIG_ETHERNET="$(jq --raw-output '.Ethernet' $CONFIG_PATH)" CONFIG_BTADDRESS="$(jq --raw-output '.BTAddress' $CONFIG_PATH)" CONFIG_LOCALBTADDRESS="$(jq --raw-output '.LocalBTAddress' $CONFIG_PATH)" +CONFIG_IP_ADDRESS="$(jq --raw-output '.IP_Address' $CONFIG_PATH)" CONFIG_PASSWORD="$(jq --raw-output '.Password' $CONFIG_PATH)" CONFIG_MSI_ENABLED="$(jq --raw-output '.MIS_Enabled' $CONFIG_PATH)" CONFIG_PLANTNAME="$(jq --raw-output '.Plantname' $CONFIG_PATH)" @@ -50,7 +52,7 @@ CONFIG_LOGLEVEL="$(jq --raw-output '.LogLevel' $CONFIG_PATH)" CONFIG_PVOUTPUT_SID="$(jq --raw-output '.PVoutput_SID' $CONFIG_PATH)" CONFIG_PVOUTPUT_KEY="$(jq --raw-output '.PVoutput_Key' $CONFIG_PATH)" -cat > $CFG_PATH < "$CFG_PATH" < $CFG_PATH <1 | >1 | 1 | # +------------+-------+-------------+ -MIS_Enabled=$CONFIG_MSI_ENABLED + MIS_Enabled=$CONFIG_MSI_ENABLED # Plantname -Plantname=$CONFIG_PLANTNAME + Plantname=$CONFIG_PLANTNAME # OutputPath (Place to store CSV files) # # Windows: C:\Users\Public\SMAdata\%Y # Linux : /home/pi/smadata/%Y # %Y %m and %d will be expanded to Year Month and Day -OutputPath=$CONFIG_OUTPUTPATH + OutputPath=$CONFIG_OUTPUTPATH # OutputPathEvents (Place to store CSV files for events) # If omitted, OutputPath is used -OutputPathEvents=$CONFIG_OUTPUTPATHEVENTS + OutputPathEvents=$CONFIG_OUTPUTPATHEVENTS # Position of pv-plant http://itouchmap.com/latlong.html # Example for Ukkel, Belgium -Latitude=$CONFIG_LATITUDE -Longitude=$CONFIG_LONGITUDE + Latitude=$CONFIG_LATITUDE + Longitude=$CONFIG_LONGITUDE # Calculate Missing SpotValues # If set to 1, values not provided by inverter will be calculated # eg: Pdc1 = Idc1 * Udc1 -CalculateMissingSpotValues=$CONFIG_CALCULATEMISSINGSPOTVALUES + CalculateMissingSpotValues=$CONFIG_CALCULATEMISSINGSPOTVALUES # DateTimeFormat (default %d/%m/%Y %H:%M:%S) # For details see strftime() function # http://www.cplusplus.com/reference/clibrary/ctime/strftime/ -DateTimeFormat=$CONFIG_DATETIMEFORMAT + DateTimeFormat=$CONFIG_DATETIMEFORMAT # DateFormat (default %d/%m/%Y) -DateFormat=$CONFIG_DATEFORMAT + DateFormat=$CONFIG_DATEFORMAT # DecimalPoint (comma/point default comma) -DecimalPoint=$CONFIG_DECIMALPOINT + DecimalPoint=$CONFIG_DECIMALPOINT # TimeFormat (default %H:%M:%S) -TimeFormat=$CONFIG_TIMEFORMAT + TimeFormat=$CONFIG_TIMEFORMAT # SynchTime (0-30 - 0=disabled, 1=once a day (default), 7=once a week, 30=once a month) # If set to non-zero value, the plant time is synchronised with local host time # Some inverters don't have a real-time clock -SynchTime=$CONFIG_SYNCHTIME + SynchTime=$CONFIG_SYNCHTIME # SynchTimeLow (1-120 - default 1) # SynchTimeHigh (1200-3600 - default 3600) # Plant time is adjusted to local host time when SynchTime=1 and # time difference is between SynchTimeLow and SynchTimeHigh limits -SynchTimeLow=$CONFIG_SYNCHTIMELOW -SynchTimeHigh=$CONFIG_SYNCHTIMEHIGH + SynchTimeLow=$CONFIG_SYNCHTIMELOW + SynchTimeHigh=$CONFIG_SYNCHTIMEHIGH # SunRSOffset # Offset to start before sunrise and end after sunset (0-3600 - default 900 seconds) -SunRSOffset=$CONFIG_SUNRSOFFSET + SunRSOffset=$CONFIG_SUNRSOFFSET # Locale # Translate Entries in CSV files # Supported locales: de-DE;en-US;fr-FR;nl-NL;es-ES;it-IT # Default en-US -Locale=$CONFIG_LOCALE + Locale=$CONFIG_LOCALE # Timezone # Select the right timezone in date_time_zonespec.csv # e.g. Timezone=Europe/Brussels -Timezone=$CONFIG_TIMEZONE + Timezone=$CONFIG_TIMEZONE # BTConnectRetries # Number of Bluetooth Connection attempts (1-15; Default=10) -BTConnectRetries=$CONFIG_BTCONNECTRETRIES + BTConnectRetries=$CONFIG_BTCONNECTRETRIES ########################### ### CSV Export Settings ### @@ -180,7 +182,7 @@ BTConnectRetries=$CONFIG_BTCONNECTRETRIES # CSV_Export (default 1 = Enabled) # Enables or disables the CSV Export functionality -CSV_Export=$CONFIG_CSV_EXPORT + CSV_Export=$CONFIG_CSV_EXPORT # CSV_ExtendedHeader (default 1 = On) # Enables or disables the SMA extended header info (8 lines) @@ -188,29 +190,29 @@ CSV_Export=$CONFIG_CSV_EXPORT # Version CSV1|Tool SBFspot|Linebreaks CR/LF|Delimiter semicolon|Decimalpoint comma|Precision 3 # etc... # This is usefull for manual data upload to pvoutput.org -CSV_ExtendedHeader=$CONFIG_CSV_EXTENDEDHEADER + CSV_ExtendedHeader=$CONFIG_CSV_EXTENDEDHEADER # CSV_Header (default 1 = On) # Enables or disables the CSV data header info (1 line) # dd/MM/yyyy HH:mm:ss;kWh;kW # This is usefull for manual data upload to pvoutput.org # If CSV_ExtendedHeader is enabled, CSV_Header is also enabled -CSV_Header=$CONFIG_CSV_HEADER + CSV_Header=$CONFIG_CSV_HEADER # CSV_SaveZeroPower (default 1 = On) # When enabled, daily csv files contain all data from 00:00 to 23:55 # This is usefull for manual data upload to pvoutput.org -CSV_SaveZeroPower=$CONFIG_CSV_SAVEZEROPOWER + CSV_SaveZeroPower=$CONFIG_CSV_SAVEZEROPOWER # CSV_Delimiter (comma/semicolon default semicolon) -CSV_Delimiter=$CONFIG_CSV_DELIMITER + CSV_Delimiter=$CONFIG_CSV_DELIMITER # CSV_Spot_TimeSource (Inverter|Computer default Inverter) -CSV_Spot_TimeSource=$CONFIG_CSV_SPOT_TIMESOURCE + CSV_Spot_TimeSource=$CONFIG_CSV_SPOT_TIMESOURCE # CSV_Spot_WebboxHeader (Default 0 = Off) # When enabled, use Webbox style header (DcMs.Watt[A];DcMs.Watt[B]...) -CSV_Spot_WebboxHeader=$CONFIG_CSV_SPOT_WEBBOXHEADER + CSV_Spot_WebboxHeader=$CONFIG_CSV_SPOT_WEBBOXHEADER ########################### ### SQL DB Settings ### @@ -223,30 +225,30 @@ CSV_Spot_WebboxHeader=$CONFIG_CSV_SPOT_WEBBOXHEADER #SQL_Database=/home/pi/smadata/SBFspot.db # MySQL -SQL_Database=$CONFIG_SQL_DATABASE -SQL_Hostname=$CONFIG_SQL_HOSTNAME -SQL_Port=$CONFIG_SQL_PORT -SQL_Username=$CONFIG_SQL_USERNAME -SQL_Password=$CONFIG_SQL_PASSWORD + SQL_Database=$CONFIG_SQL_DATABASE + SQL_Hostname=$CONFIG_SQL_HOSTNAME + SQL_Port=$CONFIG_SQL_PORT + SQL_Username=$CONFIG_SQL_USERNAME + SQL_Password=$CONFIG_SQL_PASSWORD ######################### ### MQTT Settings ### ######################### -MQTT_Publisher=$CONFIG_MQTT_PUBLISHER -MQTT_Host=$CONFIG_MQTT_HOST -MQTT_Port=$CONFIG_MQTT_PORT -MQTT_Topic=$CONFIG_MQTT_TOPIC -MQTT_ItemFormat=$CONFIG_MQTT_ITEMFORMAT -MQTT_ItemDelimiter=$CONFIG_MQTT_ITEMDELIMITER -MQTT_PublisherArgs=$CONFIG_MQTT_PUBLISHERARGS -MQTT_Data=$CONFIG_MQTT_DATA + MQTT_Publisher=$CONFIG_MQTT_PUBLISHER + MQTT_Host=$CONFIG_MQTT_HOST + MQTT_Port=$CONFIG_MQTT_PORT + MQTT_Topic=$CONFIG_MQTT_TOPIC + MQTT_ItemFormat=$CONFIG_MQTT_ITEMFORMAT + MQTT_ItemDelimiter=$CONFIG_MQTT_ITEMDELIMITER + MQTT_PublisherArgs=$CONFIG_MQTT_PUBLISHERARGS + MQTT_Data=$CONFIG_MQTT_DATA EOL #cat $1 -cat > $CFG_PATH_UPLOAD < "$CFG_PATH_UPLOAD" < $CFG_PATH_UPLOAD <