add 10 inch portrait mode

UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -147,10 +147,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
 # 1.5.5   : Call into binary ptuPackageVersion to get installed package
 #           versions.
 # 1.5.6   : Show additional update progress info in status bar.
-# 1.5.7   : Add support for dynamic portrait / landscape.
+VERSION="1.5.6"
-# 1.5.8   : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
-# 1.5.9   : Removed restart of Apism if ISMAS unreachable.
-VERSION="1.5.9"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
 #   2:  Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu

UpdatePTUDevCtrl/ismas/ismas_client.cpp

@@ -21,7 +21,6 @@
 #include <QThread>
 #include <QJsonDocument>
 #include <QJsonObject>
-#include <QCoreApplication>
 
 #if 0
 ########################
@@ -381,7 +380,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
         "{"
             "\"REASON\":\"SW_UP\","
             "\"TIMESTAMP\":\"%s\","
-            "\"EVENT_ID\":\"%d\","
+            "\"EVENT_ID\":\"0\","
             "\"EVENT\":\"%s\","
             "\"EVENTSTATE\":1,"
             "\"PARAMETER\": {"
@@ -391,7 +390,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
                 "\"STEP_RESULT\" : \"%s\","
                 "\"VERSION\" : \"%s\""
             "}"
-        "}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
+        "}", ts.toStdString().c_str(), event, percent, resultCode,
              step, step_result, version);
     return buf;
 }

UpdatePTUDevCtrl/mainwindow.cpp

@@ -128,6 +128,7 @@ void MainWindow::checkOrientation()
         break;
     }
 
+    this->setPortraitLayout10Inch();
     this->currentOrientation = orientation;
 }
 
@@ -140,11 +141,24 @@ void MainWindow::setPortraitLayout()
     ui->centralwidget->setFixedSize(480, 800);
 }
 
+void MainWindow::setPortraitLayout10Inch()
+{
+    // Adjust layout for portrait mode (480x800)
+    this->setFixedSize(800, 1280);
+    ui->centralwidget->setFixedSize(800, 1280);
+}
+
+
 void MainWindow::setLandscapeLayout()
 {
     // Adjust layout for landscape mode (800x480)
+    /*
     this->setFixedSize(800, 480);
     ui->centralwidget->setFixedSize(800, 480);
+    */
+    this->setFixedSize(480, 800);
+    ui->centralwidget->setFixedSize(480, 800);
+
 }
 
 

UpdatePTUDevCtrl/mainwindow.h

@@ -68,6 +68,7 @@ private:
     Ui::MainWindow *ui;
     void checkOrientation();
     void setPortraitLayout();
+    void setPortraitLayout10Inch();
     void setLandscapeLayout();
     Qt::ScreenOrientation currentOrientation;
 

UpdatePTUDevCtrl/mainwindow.ui

@@ -7,18 +7,19 @@
     <x>0</x>
     <y>0</y>
     <width>800</width>
-    <height>480</height>
+    <height>1280</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>480</width>
+    <width>800</width>
-    <height>480</height>
+    <height>1280</height>
    </size>
   </property>
   <property name="font">
    <font>
-    <family>Source Code Pro</family>
+    <family>Liberation Sans</family>
+    <pointsize>18</pointsize>
    </font>
   </property>
   <property name="windowTitle">
@@ -26,31 +27,87 @@
   </property>
   <widget class="QWidget" name="centralwidget">
    <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>16</number>
+    </property>
+    <property name="leftMargin">
+     <number>20</number>
+    </property>
+    <property name="topMargin">
+     <number>20</number>
+    </property>
+    <property name="rightMargin">
+     <number>20</number>
+    </property>
+    <property name="bottomMargin">
+     <number>20</number>
+    </property>
     <item>
-     <layout class="QGridLayout" name="gridLayout">
+     <layout class="QGridLayout" name="gridLayout" rowstretch="1,0" columnstretch="1,1,0">
-      <item row="3" column="2">
+      <property name="horizontalSpacing">
+       <number>16</number>
+      </property>
+      <property name="verticalSpacing">
+       <number>16</number>
+      </property>
+      <item row="1" column="2">
        <widget class="QPushButton" name="exit">
+        <property name="minimumSize">
+         <size>
+          <width>180</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="maximumSize">
+         <size>
+          <width>260</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>22</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="text">
          <string>Exit</string>
         </property>
        </widget>
       </item>
-      <item row="3" column="1">
+      <item row="1" column="0" colspan="2">
        <widget class="QProgressBar" name="updateProgress">
+        <property name="minimumSize">
+         <size>
+          <width>0</width>
+          <height>80</height>
+         </size>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>18</pointsize>
+          <weight>75</weight>
+          <bold>true</bold>
+         </font>
+        </property>
         <property name="value">
          <number>1</number>
         </property>
+        <property name="alignment">
+         <set>Qt::AlignCenter</set>
+        </property>
        </widget>
       </item>
-      <item row="0" column="0" rowspan="3" colspan="3">
+      <item row="0" column="0" colspan="3">
        <widget class="QTextEdit" name="updateStatus">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="font">
          <font>
-          <family>Misc Fixed</family>
+          <family>Source Code Pro</family>
-          <pointsize>11</pointsize>
+          <pointsize>18</pointsize>
           <weight>75</weight>
           <bold>true</bold>
          </font>

UpdatePTUDevCtrl/worker.cpp

@@ -584,6 +584,16 @@ bool Worker::updateTriggerSet() {
             CONSOLE(lst) << UPDATE_STEP::DEBUG;
         }
 
+        if ((repeat % 8) == 0) {
+            CONSOLE(QStringList(func) << "RESTART APISM") << UPDATE_STEP::DEBUG;
+            Command c("systemctl restart apism");
+            if (c.execute("/tmp")) {
+                QThread::sleep(20); // give APISM some time to reconnect
+                QStringList lst = (m_ismasTriggerStatusMessage = (QStringList(func) << "RESTART APISM DONE"));
+                CONSOLE(lst) << UPDATE_STEP::DEBUG;
+            }
+        }
+
         if (std::optional<QString> result
                 = IsmasClient::sendRequestReceiveResponse(
                     IsmasClient::APISM::DIRECT_PORT, "#M=APISM#C=REQ_ISMASPARAMETER#J={}")) {

on_update_failure.sh

@@ -1,184 +0,0 @@
-#!/bin/bash
-
-# set -x
-
-#
-#############################################################################
-# Check if the ATBUpdateTool(.service) did not send U0001 (sucess),
-# U0002 (activated) or U0003 (error) to ISMAS, including the case that the
-# tool did not crash or was not killed under other circumstances.
-#
-# This script will be called in the associated atbupdatetool.service (see
-# /lib/systemd/system/atbupdatetool.service).
-#
-###############################################################################
-
-readonly OUT_FILE=/tmp/out.txt
-readonly SCRIPT_NAME=$(basename $0)
-
-if [ -z "$START_DATE" ]
-then
-    START_DATE=$(date +"%Y-%m-%d00:00:00")
-fi
-
-if [ -z "$STOP_DATE" ]
-then
-    STOP_DATE=$(date +"%Y-%m-%d%H:%M:%S")
-fi
-
-echo "EXIT_CODE=$EXIT_CODE"
-echo "SERVICE_RESULT=$SERVICE_RESULT"
-echo "EXIT_STATUS=$EXIT_STATUS"
-echo "START_DATE=$START_DATE"
-echo "STOP_DATE=$STOP_DATE"
-
-
-last_cmd_event () {
-    # output json; look for start of CMD_EVENT; look for }}; extract everything between; finally re-add }}.
-    # could also look for ">>>", but this might change in the future.
-    local json=$(\
-	    journalctl -u atbupdatetool --since="$START_DATE" --until="$STOP_DATE" --output=json-pretty |\
-	    grep "#M=APISM#C=CMD_EVENT#J="                                                              |\
-	    awk '{split($0, a, "#M=APISM#C=CMD_EVENT#J="); print a[2]}'                                 |\
-	    awk '{split($0, a, /\}[\s]*\}/); print a[1]}'                                               |\
-	    tr -d '\\'                                                                                  |\
-	    tail -1)
-    json+="}}"
-    echo "$json"
-}
-
-last_percent_value () {
-    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\3/p" | xargs | awk '{print $NF}')
-}
-
-last_step () {
-    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[8]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
-}
-
-last_step_result () {
-    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[9]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
-}
-
-pid_atbupdatetool () {
-    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(ATBUpdateTool\[\)\(\\s*[0-9]\+\)\(\].*$\)/\3/p" | uniq)
-}
-
-last_event () {
-    echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[4]}' | awk '{split($0, b, ":"); print b[2]}' | tr -d ' ' | tr -d '"\\') 
-}
-
-sendU0003 () {
-    LAST_CMD_EVENT=$(last_cmd_event)
-    echo "LAST=$LAST_CMD_EVENT"
-    
-    local json_detected=0
-    local temp
-    local x
-
-    if [[ ! -z "$LAST_CMD_EVENT" ]]
-    then
-       temp=$(mktemp -p /tmp)
-       echo "$LAST_CMD_EVENT" > "$temp"
-       x=$(jq .EVENT $temp)
-       if [ $? -eq 0 ]; then
-           json_detected=1
-       fi
-    fi
-
-    if [ $json_detected -eq 1 ]
-    then
-        # local pid=$(jq .EVENT_ID $temp)
-
-	# if json has been detected, use "jq".
-
-        x=$(jq .PARAMETER.PERCENT $temp | tr -d '"')
-        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
-
-        x=$(jq .PARAMETER.STEP $temp | tr -d '"')
-        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
-       
-        x=$(jq .PARAMETER.STEP_RESULT $temp | tr -d '"')
-        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
-    
-        x=$(pid_atbupdatetool)
-        [[ -z "$x" ]] && PID=99999 || PID=$x
-    
-        x=$(last_event)
-        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
-    
-    else 
-        # cannot parse valid json. try original journal text file.
-
-        x=$(last_percent_value)
-        [[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
-
-        x=$(last_step)
-        [[ -z "$x" ]] && STEP="unknown" || STEP="$x"
-    
-        x=$(last_step_result)
-        [[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
-    
-        x=$(pid_atbupdatetool)
-        [[ -z "$x" ]] && PID=99999 || PID=$x
-
-        x=$(last_event)
-        [[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
-    fi
-
-    echo "PERCENT=$PERCENT"
-    echo "STEP=$STEP"
-    echo "STEP_RESULT=$STEP_RESULT"
-    echo "PID=$PID"
-    echo "EVENT=$EVENT"
-
-    # build json to be sent to ISMAS with "U0003"
-
-    CURRENT_DATE=$(date +"%Y-%m-%d %H:%M:%S.000%z")
-    U0003Msg="{\
-        \"REASON\":\"SW_UP\",\
-        \"TIMESTAMP\":\"$CURRENT_DATE\",\
-        \"EVENT_ID\":\"$PID\",\
-        \"EVENT\":\"U0003\",\
-        \"EVENTSTATE\":1,\
-        \"PARAMETER\": {\
-            \"PERCENT\" : $PERCENT,\
-            \"RESULTCODE\" : 99,\
-                    \"STEP\" : \"$1 -> monitored last step: $STEP\",\
-                    \"STEP_RESULT\" : \"$1 -> monitored last step result: $STEP_RESULT\",\
-            \"VERSION\" : \"\"\
-        }\
-    }"
-
-    echo -e "U0003Msg=$U0003Msg"
-
-    (echo "#M=APISM#C=CMD_EVENT#J=$U0003Msg"; sleep 5) | nc localhost 7777
-}
-
-# save journal for the last run of atbupdatetool in $OUT_FILE
-echo $(journalctl -u atbupdatetool --since="$START_DATE" --until=$STOP_DATE) > $OUT_FILE
-
-if [[ "$EXIT_CODE" = "exited" && "$SERVICE_RESULT" = "success" && "$EXIT_STATUS" = "0" ]]
-then
-    # almost normal run; at least there was no crash.	
-    if cat $OUT_FILE | grep -o "U0003" | wc -l; then
-        echo "$SCRIPT_NAME: Failure code U0003 already sent to ISMAS"
-        exit 0
-    fi
-
-    if cat $OUT_FILE | grep -o "U0002" | wc -l; then
-        echo "$SCRIPT_NAME: Success code U0002 already sent to ISMAS"
-        exit 0
-    else
-        sendU0003 "$SCRIPT_NAME: Success code U0002 not sent to ISMAS"
-    fi
-
-    if cat $OUT_FILE | grep -o "U0001" | wc -l; then
-        echo "$SCRIPT_NAME: Success code U0001 already sent to ISMAS"
-        exit 0
-    else
-        sendU0003 "$SCRIPT_NAME: Success code U0001 not sent to ISMAS"
-    fi
-else
-    # something unexpected has happened.
-    sendU0003 "$SCRIPT_NAME: EXIT_CODE=$EXIT_CODE;SERVICE_RESULT=$SERVICE_RESULT;EXIT_STATUS=$EXIT_STATUS"
-fi