ExternalVendorCode/k3ng_rotator_controller
1
0
Fork 0
mirror of https://github.com/k3ng/k3ng_rotator_controller.git synced 2025-02-05 10:29:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2020.04.28.01

Browse Source 
More work on FEATURE_NEXTION_DISPLAY
      Nextion HMI file contributed by Jan ZS1VDV
This commit is contained in:
Anthony Good 2020-04-28 12:46:30 -04:00
parent 6c963806ff
commit 07123047d1
3 changed files with 32 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
k3ng_rotator_controller/Nextion/K3NG Rotator Controller - BASE - NX4832TO35 - v2020.04.19.01.HMI → k3ng_rotator_controller/Nextion/K3NG Rotator Controller - BASE - NX4832TO35 - v2020.04.28.01.HMI
View File

Binary file not shown.

BIN
k3ng_rotator_controller/Nextion/K3NG Rotator Controller - NX3224TO24 - ZS1VDV - v2020.04.27.01.HMI Normal file
View File

Binary file not shown.

54
k3ng_rotator_controller/k3ng_rotator_controller.ino
View File

@ -458,6 +458,10 @@
2020.04.27.01
New pin: pin_status_led - Status LED - blinks when there is rotation in progress
2020.04.28.01
More work on FEATURE_NEXTION_DISPLAY
Nextion HMI file contributed by Jan ZS1VDV
All library files should be placed in directories likes \sketchbook\libraries\library1\ , \sketchbook\libraries\library2\ , etc.
Anything rotator_*.* should be in the ino directory!
@ -468,7 +472,7 @@
*/
#define CODE_VERSION "2020.04.27.01"
#define CODE_VERSION "2020.04.28.01"
#include <avr/pgmspace.h>
#include <EEPROM.h>
@ -4427,11 +4431,13 @@ void service_nextion_display(){
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
// gEDS - Elevation Detailed State
dtostrf(el_state, 1, 0, workstring1);
strcpy(workstring2,"gEDS=");
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
#if defined(FEATURE_ELEVATION_CONTROL)
// gEDS - Elevation Detailed State
dtostrf(el_state, 1, 0, workstring1);
strcpy(workstring2,"gEDS=");
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
#endif
// gAOS - Azimuth Overall State
dtostrf((int)current_az_state, 1, 0, workstring1);
@ -4439,11 +4445,13 @@ void service_nextion_display(){
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
// gEOS - Elevation Overall State
dtostrf((int)current_el_state, 1, 0, workstring1);
strcpy(workstring2,"gEOS=");
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
#if defined(FEATURE_ELEVATION_CONTROL)
// gEOS - Elevation Overall State
dtostrf((int)current_el_state, 1, 0, workstring1);
strcpy(workstring2,"gEOS=");
strcat(workstring2,workstring1);
sendNextionCommand(workstring2);
#endif
// gCS - Clock State
#if defined(FEATURE_CLOCK)
@ -4474,17 +4482,19 @@ void service_nextion_display(){
break;
}
switch(el_request_queue_state){
case IN_QUEUE:
temp = temp | 32;
break;
case IN_PROGRESS_TIMED:
temp = temp | 64;
break;
case IN_PROGRESS_TO_TARGET:
temp = temp | 128;
break;
}
#if defined(FEATURE_ELEVATION_CONTROL)
switch(el_request_queue_state){
case IN_QUEUE:
temp = temp | 32;
break;
case IN_PROGRESS_TIMED:
temp = temp | 64;
break;
case IN_PROGRESS_TO_TARGET:
temp = temp | 128;
break;
}
#endif
//zzzzzz