# HG changeset patch # User heinrichsweikamp # Date 1681455619 -7200 # Node ID 682c514c53c06e93639fab3d9bd56b8fa167150f # Parent bc214815deb278cdea2172e020eeaccc57e13dcf 3.21 release preparations diff -r bc214815deb2 -r 682c514c53c0 src/Docu/Info-Pack-Cave-Mode.zip Binary file src/Docu/Info-Pack-Cave-Mode.zip has changed diff -r bc214815deb2 -r 682c514c53c0 src/comm.asm --- a/src/comm.asm Sun Aug 28 13:13:38 2022 +0200 +++ b/src/comm.asm Fri Apr 14 09:00:19 2023 +0200 @@ -975,7 +975,7 @@ SERIAL_CC_RECEIVE lo ; (try to) receive option index btfsc rs232_rx_timeout ; received option index? bra comm_command_loop ; NO - show rx timeout message and back to command loop - + ; option index 0x00 - 0x0F: unused movlw 0x0F ; last option index of the unused range cpfsgt lo ; received option index > end of unused range ? @@ -992,9 +992,10 @@ bra comm_read_sp ; NO - process setpoint read ; option index = 0x49 - special handling button polarity - movf lo,W ; copy option index to WREG - iorlw 0x49 ; received option index for button polarity ? - bz comm_read_button_polarity ; YES - process button polarity read + movlw 0x49 + cpfseq lo ; received option index for button polarity ? + bra $+4 ; NO + bra comm_read_button_polarity ; YES - process button polarity read ; option index 0x1F - 0xF9: options managed by option table movlw 0xF9 ; last option index for options @@ -1030,9 +1031,10 @@ bra comm_write_sp ; NO - process setpoint write ; option index = 0x49 - special handling button polarity - movf lo,W ; copy option index to WREG - iorlw 0x49 ; received option index for button polarity ? - bz comm_write_button_polarity ; YES - process button polarity write + movlw 0x49 + cpfseq lo ; received option index for button polarity ? + bra $+4 ; NO + bra comm_write_button_polarity ; YES - process button polarity write ; option index 0x1F - 0xF9: options managed by option table movlw 0xF9 ; last option index for options diff -r bc214815deb2 -r 682c514c53c0 src/configuration.inc --- a/src/configuration.inc Sun Aug 28 13:13:38 2022 +0200 +++ b/src/configuration.inc Fri Apr 14 09:00:19 2023 +0200 @@ -23,8 +23,8 @@ ; #endif -#define fw_version_major 0x03 -#define fw_version_minor 0x13 +#define fw_version_major .3;0x03 +#define fw_version_minor .21;0x15 #define fw_version_beta 0x00 @@ -42,13 +42,13 @@ ; #endif -#define firmware_creation_year 0x16 -#define firmware_creation_month 0x08 -#define firmware_creation_day 0x1C +#define firmware_creation_year .23;0x18 +#define firmware_creation_month .03;0x09 +#define firmware_creation_day .31;0x06 -#define firmware_expire_year 0x18 -#define firmware_expire_month 0x08 -#define firmware_expire_day 0x1C +#define firmware_expire_year .25;0x18 +#define firmware_expire_month .03;0x08 +#define firmware_expire_day .31;0x1C #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -64,7 +64,7 @@ ; 122.880 max. available #endif -#define _hwos_tech_3_cR +#define _hwos_tech_2_TR #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -79,7 +79,7 @@ ; #endif -#define _language_1 en +#define _language_1 de #define _language_2 none diff -r bc214815deb2 -r 682c514c53c0 src/menu_tree.asm --- a/src/menu_tree.asm Sun Aug 28 13:13:38 2022 +0200 +++ b/src/menu_tree.asm Fri Apr 14 09:00:19 2023 +0200 @@ -1144,8 +1144,9 @@ btfsc ble_available ; BT available? bra do_menu_settings_bt ; YES - do BT menu - MENU_BEGIN tSystSets, .5 + MENU_BEGIN tSystSets, .6 MENU_CALL tInfoMenu, do_menu_info + MENU_CALL tUsbTitle, do_comm_mode_usb MENU_CALL tSetTimeDate, do_menu_date_time MENU_CALL tDispSets, do_menu_dispsets MENU_CALL tSysSets, do_menu_syssets @@ -1180,10 +1181,12 @@ ;----------------------------------------------------------------------------- -; Call Function - start Communication Mode (BT) +; Call Functions - start Communication Mode (BT and USB) ; do_comm_mode_bt: goto comm_mode_bt ; code hosted in comm.asm +do_comm_mode_usb: + goto comm_mode_usb ; code hosted in comm.asm ;----------------------------------------------------------------------------- diff -r bc214815deb2 -r 682c514c53c0 src/surfmode.asm --- a/src/surfmode.asm Sun Aug 28 13:13:38 2022 +0200 +++ b/src/surfmode.asm Fri Apr 14 09:00:19 2023 +0200 @@ -571,21 +571,22 @@ btfsc comm_mode_disabled ; COMM mode disabled? return ; YES - done ENDIF - btfss surfmode_menu ; in surface menus? - return ; NO - done - - btfsc simulatormode ; currently in simulator (deco calculator) mode? - return ; YES - suppress COMM mode to not jeopardize backup/restore of tissue data - - btfss vusb_in ; USB plugged in? - return ; NO - done - IFDEF _screendump - btfsc screen_dump_avail ; YES - screen dump enabled? - return ; YES - no COMM mode to be able to make screen shots of the menu and simulator mode - ENDIF - btfss ble_available ; skip "USB" check in all Bluetooth models (required for very old OSTC sport) - goto comm_mode_usb ; YES / NO - proceed to COMM mode, will also set CPU to speed normal return +; btfss surfmode_menu ; in surface menus? +; return ; NO - done +; +; btfsc simulatormode ; currently in simulator (deco calculator) mode? +; return ; YES - suppress COMM mode to not jeopardize backup/restore of tissue data +; +; btfss vusb_in ; USB plugged in? +; return ; NO - done +; IFDEF _screendump +; btfsc screen_dump_avail ; YES - screen dump enabled? +; return ; YES - no COMM mode to be able to make screen shots of the menu and simulator mode +; ENDIF +; btfss ble_available ; skip "USB" check in all Bluetooth models (required for very old OSTC sport) +; goto comm_mode_usb ; YES / NO - proceed to COMM mode, will also set CPU to speed normal +; return ;-----------------------------------------------------------------------------