introduced command queuing

Cumulocity-IoT · Nov 21, 2019 · b188943 · b188943
1 parent 6acf325
commit b188943
Show file tree

Hide file tree

Showing 6 changed files with 270 additions and 220 deletions.
diff --git a/source/AppController.c b/source/AppController.c
@@ -437,8 +437,8 @@ Retcode_T AppController_SyncTime() {
  ("MQTTOperation: SNTP server time was not synchronized. Retrying...\r\n"));
  }
  sntpAttemps++;
- vTaskDelay(pdMS_TO_TICKS(2000));
- } while (0UL == sntpTimeStampFromServer && sntpAttemps < 3); // only try to sync time 5 times
+ vTaskDelay(pdMS_TO_TICKS(1500));
+ } while (0UL == sntpTimeStampFromServer && sntpAttemps < 3); // only try to sync time 3 times
  if (0UL == sntpTimeStampFromServer) {
  sntpTimeStampFromServer = 1572566400UL; // use default time 1. Nov 2019 00:00:00 UTC
  SNTP_SetTime(sntpTimeStampFromServer);
@@ -505,5 +505,3 @@ void AppController_SetCmdStatus( uint8_t status) {
 uint8_t AppController_GetCmdStatus(void) {
  return cmd_status;
 }
-
-
diff --git a/source/AppController.h b/source/AppController.h
@@ -237,7 +237,7 @@ typedef enum {
  APP_ASSET_WAITING,
  APP_ASSET_PUBLISHED,
  APP_ASSET_COMPLETED,
-} APP_ASSET_STATUS;
+} APP_ASSET_UPDATE_STATUS;
 
 /* Default values for C8Y MQTT configuration*/
 #define DEFAULT_MQTTSECURE true /**use MQTT over TLS */
@@ -259,8 +259,8 @@ typedef enum {
 
 /* Sensor type and macro definitions */
 
-#define SIZE_XXLARGE_BUF 550
-#define SIZE_XLARGE_BUF 400
+#define SIZE_XXLARGE_BUF 512
+#define SIZE_XLARGE_BUF 384
 #define SIZE_LARGE_BUF 256
 #define SIZE_SMALL_BUF 128
 #define SIZE_XSMALL_BUF 64

diff --git a/source/MQTTButton.c b/source/MQTTButton.c
@@ -39,7 +39,6 @@
 /* local variables ********************************************************** */
 static CmdProcessor_T *AppCmdProcessor; /**< Application Command Processor Instance */
 
-
 /* global variables ********************************************************* */
 
 /* inline functions ********************************************************* */
@@ -57,14 +56,25 @@ static CmdProcessor_T *AppCmdProcessor; /**< Application Command Processor Insta
 static void processbuttonCallback1 (void * param1, uint32_t buttonstatus)
 {
  BCDS_UNUSED(param1);
+ static TickType_t time_start = 0;
 
  LOG_AT_TRACE(("MQTTButton: Status button %d %lu %i\r\n", AppController_GetStatus(), buttonstatus, BSP_XDK_BUTTON_PRESS));
-
- // only use button 1 when in operation mode
- if (AppController_GetStatus() == APP_STATUS_OPERATING_STARTED && BSP_XDK_BUTTON_PRESSED == buttonstatus)
- CmdProcessor_EnqueueFromIsr(AppCmdProcessor, MQTTOperation_StopTimer, NULL, buttonstatus);
- if (AppController_GetStatus() == APP_STATUS_OPERATING_STOPPED && BSP_XDK_BUTTON_PRESSED == buttonstatus)
- CmdProcessor_EnqueueFromIsr(AppCmdProcessor, MQTTOperation_StartTimer, NULL, buttonstatus);
+ if (BSP_XDK_BUTTON_PRESSED == buttonstatus ) {
+ time_start = xTaskGetTickCountFromISR();
+ } else {
+ TickType_t time_passed = xTaskGetTickCountFromISR() - time_start;
+ if (time_passed > pdMS_TO_TICKS(3000)) {
+ CmdProcessor_EnqueueFromIsr(AppCmdProcessor, MQTTOperation_QueueCommand, "511,DUMMY,requestCommands", buttonstatus);
+ LOG_AT_TRACE(("MQTTButton: Button1 pressed long: %lu\r\n", time_passed));
+ } else {
+ // only use button 1 when in operation mode
+ if (AppController_GetStatus() == APP_STATUS_OPERATING_STARTED ) {
+ CmdProcessor_EnqueueFromIsr(AppCmdProcessor, MQTTOperation_QueueCommand, "511,DUMMY,stopButton", buttonstatus);
+ } else if (AppController_GetStatus() == APP_STATUS_OPERATING_STOPPED) {
+ CmdProcessor_EnqueueFromIsr(AppCmdProcessor, MQTTOperation_QueueCommand, "511,DUMMY,startButton", buttonstatus);
+ }
+ }
+ }
 }
 
 
@@ -79,7 +89,7 @@ static void processbuttonCallback2 (void * param1, uint32_t buttonstatus)
  TickType_t time_passed = xTaskGetTickCountFromISR() - time_start;
  if (time_passed > pdMS_TO_TICKS(3000)) {
  MQTTFlash_FLWriteBootStatus((uint8_t*) NO_BOOT_PENDING);
- LOG_AT_TRACE(("MQTTButton: Button pressed long: %lu\r\n", time_passed));
+ LOG_AT_TRACE(("MQTTButton: Button2 pressed long: %lu\r\n", time_passed));
  } else {
  ConfigDataBuffer localbuffer;
  localbuffer.length = NUMBER_UINT32_ZERO;
@@ -91,7 +101,7 @@ static void processbuttonCallback2 (void * param1, uint32_t buttonstatus)
  memset(localbuffer.data, 0x00, SIZE_XXLARGE_BUF);
  MQTTCfgParser_GetConfig(&localbuffer, CFG_FALSE);
  LOG_AT_DEBUG(("MQTTButton: Currently used configuration:\r\n%s\r\n", localbuffer.data));
- LOG_AT_TRACE(("MQTTButton: Button pressed for: %lu\r\n", time_passed));
+ LOG_AT_TRACE(("MQTTButton: Button2 pressed for: %lu\r\n", time_passed));
  }
  }