Mercurial > public > hwos_code
changeset 641:1212d39c9f6f
3.14 beta work
| author | heinrichsweikamp |
|---|---|
| date | Sat, 21 Nov 2020 17:46:29 +0100 |
| parents | 8c1f1f334275 |
| children | 1e695355dfc4 |
| files | src/configuration.inc src/option_table.asm src/p2_deco.c src/text_italian.inc |
| diffstat | 4 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/configuration.inc Thu Oct 29 09:29:15 2020 +0100 +++ b/src/configuration.inc Sat Nov 21 17:46:29 2020 +0100 @@ -24,8 +24,8 @@ #endif #define fw_version_major 0x03 -#define fw_version_minor 0x0D -#define fw_version_beta 0x00 +#define fw_version_minor 0x0E +#define fw_version_beta 0x01 #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -64,7 +64,7 @@ ; 122.880 max. available #endif -#define _hwos_tech_3_cR +#define _hwos_tech_2_TR #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -79,8 +79,8 @@ ; #endif -#define _language_1 de -#define _language_2 en +#define _language_1 en +#define _language_2 none #ifdef xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
--- a/src/option_table.asm Thu Oct 29 09:29:15 2020 +0100 +++ b/src/option_table.asm Sat Nov 21 17:46:29 2020 +0100 @@ -147,7 +147,7 @@ OPTION_UINT8 oaGF_low, .10, .100, .30, tPercent, 0x023, 0x27, opt_aGF_low ; alternative GF low OPTION_UINT8 oaGF_high, .45, .110, .85, tPercent, 0x024, 0x28, opt_aGF_high ; alternative GF high OPTION_BOOL oEnable_aGF, .0, 0x025, 0x29, opt_enable_aGF ; =1: aGF can be selected underwater - OPTION_UINT8 oCompassGain, .0, .7, .6, tMinutes, 0x026, 0x34, opt_compass_gain ; 0-7 (230 LSB/Gauss to 1370LSB/Gauss) + OPTION_UINT8 oCompassGain, .0, .7, .5, tMinutes, 0x026, 0x34, opt_compass_gain ; 0-7 (230 LSB/Gauss to 1370LSB/Gauss) OPTION_ENUM8 oSamplingRate, .2, .0, tSetSeconds, 0x027, 0x2F, opt_sampling_rate ; =1: 10s, =0: 2s ; Managing Settings
--- a/src/p2_deco.c Thu Oct 29 09:29:15 2020 +0100 +++ b/src/p2_deco.c Sat Nov 21 17:46:29 2020 +0100 @@ -1575,7 +1575,7 @@ // static unsigned char gas_find_best(void) { - overlay unsigned char switch_depth = 255; + overlay unsigned char switch_depth = sim_gas_current_depth; overlay unsigned char switch_gas = 0;
--- a/src/text_italian.inc Thu Oct 29 09:29:15 2020 +0100 +++ b/src/text_italian.inc Sat Nov 21 17:46:29 2020 +0100 @@ -26,9 +26,9 @@ TCODE tHeading, "Direzione:" ; Heading: TCODE tLastDive, "UltimaImm." ; Last Dive (Max 10 chars) - TCODE tFTTSSurf, "TTS Futuro :" ; Future TTS - TCODE tLastDecostopSurf, "Ultima Tappa:" ; last deco stop surface custom view - TCODE tDvSalinitySurf, "Salinita' :" ; Salinity + TCODE tFTTSSurf, "TTS Futuro:" ; Future TTS + TCODE tLastDecostopSurf, "UltimaTappa:" ; last deco stop surface custom view + TCODE tDvSalinitySurf, "Salinita':" ; Salinity IFDEF _external_sensor TCODE tSensorMilliVolt, "Sensori mV" ; Sensors mV @@ -228,9 +228,9 @@ TCODE taGFenable, "aGF Selezionabile:" ; aGF Selectable TCODE tDiveaGF_active, "Usa aGF" ; using aGF TCODE tSafetyStop, "Tappa Sicurezza:" ; Safety Stop: (max. 16 chars) - TCODE tExtendedStops, "Anticipa Tappa :" ; Extended Stops - TCODE tLastDecostop, "Ultima Tappa : " ; last Deco Stop Depth - TCODE tDvSalinity, "Salinita' : " ; Salinity + TCODE tExtendedStops, "Anticipa Tappa:" ; Extended Stops + TCODE tLastDecostop, "Ultima Tappa: " ; last Deco Stop Depth + TCODE tDvSalinity, "Salinita': " ; Salinity TCODE tDepthWarn, "Depth Warning :" ; Depth Warning (no space after ':' on purpose) TCODE tGasUsage, "Utilizzo" ; Gas Usage TCODE tSetWorkSAC, "SAC Fondo: " ; SAC Work: (space)