diff src/comm.asm @ 636:2737ddc643bb

3.11 release
author heinrichsweikamp
date Mon, 25 May 2020 17:35:30 +0200
parents 4050675965ea
children 8c1f1f334275
line wrap: on
line diff
--- a/src/comm.asm	Thu May 07 09:12:59 2020 +0200
+++ b/src/comm.asm	Mon May 25 17:35:30 2020 +0200
@@ -1,6 +1,6 @@
 ;=============================================================================
 ;
-;   File comm.asm                           * combined next generation V3.09.5
+;   File comm.asm                           * combined next generation V3.10.0
 ;
 ;   RS232 via USB
 ;
@@ -364,7 +364,7 @@
 	command_decode 0x78,comm_option_reset_all		; x  reset all option values to their factory default
 	command_decode 0xFF,comm_service_exit			;    exit comm mode
  IFDEF _screendump
-	command_decode 0x6C,TFT_dump_screen				; l  dump the screen contents
+	command_decode 0x6C,TFT_dump_screen_comm		; l  dump the screen contents
  ENDIF
 
 	btfss	comm_service_mode						; service mode enabled?
@@ -388,6 +388,16 @@
 
 
 ;-----------------------------------------------------------------------------
+; Screendump
+;
+ IFDEF _screendump
+TFT_dump_screen_comm:
+	call	TFT_dump_screen							; dump the screen contents and set screen_dump_avail
+	;bra	comm_service_exit						; exit comm mode
+ ENDIF
+
+
+;-----------------------------------------------------------------------------
 ; Exit Comm Mode
 ;
 comm_service_exit:
@@ -1156,17 +1166,17 @@
 	; check validity of type
 	movlw	0x14						; last option index for gases
 	cpfsgt	lo							; received option index > end of gas range ?
-	bra		comm_write_check_dil		; YES - check type for diluents
-	;bra	comm_write_check_gas		; NO  - check type for gases
+	bra		comm_write_check_gas		; NO  - check type for gases
+	;bra	comm_write_check_dil		; YES - check type for diluents
+
+comm_write_check_dil:
+	; check validity of type for a diluent
+	movlw	num_dil_types				; load number of diluent types
+	bra		comm_write_check_com		; continue with common part
 
 comm_write_check_gas:
 	; check validity of type for a gas
 	movlw	num_gas_types				; load number of gas types
-	bra		comm_write_check_com		; continue with common part
-
-comm_write_check_dil:
-	; check validity of type for a diluent
-	movlw	num_dil_types				; load number of diluent types
 	;bra	comm_write_check_com		; continue with common part
 
 comm_write_check_com: