diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 31f3e0d..e43a731 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -60,6 +60,7 @@ wifi: 8. Support to `remote` 9. Home page chips now supports covers 10. Chips can be inverted +11. Add swipe control to screensaver page   ## Details of noteworthy changes @@ -125,6 +126,10 @@ Chips now include cover visualization, allowing for easy monitoring of covers di ### 10. Chips can be inverted Chips now have an 'invert' option on the blueprint settings, providing additional customization flexibility. +  +### 11. Add swipe control to Screensaver page +You can now navigate to button pages from the screensaver while your panel is in sleep mode. The swipe controls will function as they do on the Home page. +   ## What's Next? Discover what's next and what we are working on right now in our [Milestones](https://github.com/Blackymas/NSPanel_HA_Blueprint/milestones?direction=asc&sort=due_date) diff --git a/advanced/hmi/nspanel_CJK_eu.HMI b/advanced/hmi/nspanel_CJK_eu.HMI index efdbbcd..391dc19 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.HMI and b/advanced/hmi/nspanel_CJK_eu.HMI differ diff --git a/advanced/hmi/nspanel_CJK_eu.tft b/advanced/hmi/nspanel_CJK_eu.tft index fb243fe..21e9057 100644 Binary files a/advanced/hmi/nspanel_CJK_eu.tft and b/advanced/hmi/nspanel_CJK_eu.tft differ diff --git a/advanced/hmi/nspanel_CJK_eu_code/screensaver.txt b/advanced/hmi/nspanel_CJK_eu_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_CJK_eu_code/screensaver.txt +++ b/advanced/hmi/nspanel_CJK_eu_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/advanced/hmi/nspanel_CJK_us.HMI b/advanced/hmi/nspanel_CJK_us.HMI index 670a32c..70a58a3 100644 Binary files a/advanced/hmi/nspanel_CJK_us.HMI and b/advanced/hmi/nspanel_CJK_us.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us.tft b/advanced/hmi/nspanel_CJK_us.tft index d9d0acc..58bb505 100644 Binary files a/advanced/hmi/nspanel_CJK_us.tft and b/advanced/hmi/nspanel_CJK_us.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_code/screensaver.txt b/advanced/hmi/nspanel_CJK_us_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_CJK_us_code/screensaver.txt +++ b/advanced/hmi/nspanel_CJK_us_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/advanced/hmi/nspanel_CJK_us_land.HMI b/advanced/hmi/nspanel_CJK_us_land.HMI index c08af79..32772fd 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.HMI and b/advanced/hmi/nspanel_CJK_us_land.HMI differ diff --git a/advanced/hmi/nspanel_CJK_us_land.tft b/advanced/hmi/nspanel_CJK_us_land.tft index 22235a7..59648c3 100644 Binary files a/advanced/hmi/nspanel_CJK_us_land.tft and b/advanced/hmi/nspanel_CJK_us_land.tft differ diff --git a/advanced/hmi/nspanel_CJK_us_land_code/screensaver.txt b/advanced/hmi/nspanel_CJK_us_land_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_CJK_us_land_code/screensaver.txt +++ b/advanced/hmi/nspanel_CJK_us_land_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/advanced/hmi/nspanel_eu.HMI b/advanced/hmi/nspanel_eu.HMI index e58b87f..da3562b 100644 Binary files a/advanced/hmi/nspanel_eu.HMI and b/advanced/hmi/nspanel_eu.HMI differ diff --git a/advanced/hmi/nspanel_eu_code/screensaver.txt b/advanced/hmi/nspanel_eu_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_eu_code/screensaver.txt +++ b/advanced/hmi/nspanel_eu_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/advanced/hmi/nspanel_us.HMI b/advanced/hmi/nspanel_us.HMI index 7018fc3..3a2b6eb 100644 Binary files a/advanced/hmi/nspanel_us.HMI and b/advanced/hmi/nspanel_us.HMI differ diff --git a/advanced/hmi/nspanel_us_code/screensaver.txt b/advanced/hmi/nspanel_us_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_us_code/screensaver.txt +++ b/advanced/hmi/nspanel_us_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/advanced/hmi/nspanel_us_land.HMI b/advanced/hmi/nspanel_us_land.HMI index e0d8703..a008dcd 100644 Binary files a/advanced/hmi/nspanel_us_land.HMI and b/advanced/hmi/nspanel_us_land.HMI differ diff --git a/advanced/hmi/nspanel_us_land_code/screensaver.txt b/advanced/hmi/nspanel_us_land_code/screensaver.txt index 7967660..f5055b1 100644 --- a/advanced/hmi/nspanel_us_land_code/screensaver.txt +++ b/advanced/hmi/nspanel_us_land_code/screensaver.txt @@ -24,6 +24,18 @@ Variable (int32) orign Scope: local Value: 0 +Timer swipestore + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : no + + Events + Timer Event + swipex=tch0 + swipey=tch1 + TouchCap wakeup Attributes ID : 1 @@ -34,3 +46,48 @@ TouchCap wakeup Touch Press Event page orign.val +TouchCap swipe + Attributes + ID : 3 + Scope: local + Value: 0 + + Events + Touch Press Event + swipestore.en=1 // Start swipestore timer + + Touch Release Event + swipestore.en=0 + // Touch has ended, x + if(tch0==0) + { + swipec=swipex-tch2 + // From Left to Right + if(swipec>swipedx&&api==1) + { + page buttonpage04 + } + // Right to Left + swipec2=0-swipedx + if(swipec100&&api==1) + { + page buttonpage02 + } + // Down to Up + swipec2=0-swipedy + if(swipec<-100&&api==1) + { + page buttonpage03 + } + } + diff --git a/nspanel_eu.tft b/nspanel_eu.tft index 86e1a4c..88c06ed 100644 Binary files a/nspanel_eu.tft and b/nspanel_eu.tft differ diff --git a/nspanel_us.tft b/nspanel_us.tft index d5b564e..07b993a 100644 Binary files a/nspanel_us.tft and b/nspanel_us.tft differ diff --git a/nspanel_us_land.tft b/nspanel_us_land.tft index 1d94095..40be722 100644 Binary files a/nspanel_us_land.tft and b/nspanel_us_land.tft differ