1.5 development planning thread

  • 61 Replies
  • 20088 Views
*

Offline philmoz

  • *****
  • 3070
    • Photos
Re: 1.5 development planning thread
« Reply #30 on: 22 / March / 2016, 19:59:13 »
Advertisements

The lang_str.h output for conditional strings could simplified a bit:
Code: [Select]
#ifdef CAM_CHDK_HAS_EXT_VIDEO_TIME
/*485*/ "Video without time limit"
#endif
        "\0"
#ifdef CAM_CHDK_HAS_EXT_VIDEO_TIME
/*486*/ "Sensor may overheat during long recordings!"
#endif
        "\0"


The compiler will join the two string together if the conditional one is included.


Phil.
CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)

*

Offline srsa_4c

  • ******
  • 3728
Re: 1.5 development planning thread
« Reply #31 on: 22 / March / 2016, 20:06:33 »
The lang_str.h output for conditional strings could simplified a bit:
Good idea, that would make the generated file a bit less ugly.

*

Offline philmoz

  • *****
  • 3070
    • Photos
Re: 1.5 development planning thread
« Reply #32 on: 22 / March / 2016, 21:21:49 »
Small update to the language string exclusion patch:
- added more conditions to entries in lang_str_conditions.h
- updated Makefile rules to rebuild output files when lang_str_conditions.h is changed
- added support for negative logic in conditions (generates #ifndef... in lang_str.h)
- simplified output for lang_str.h


Phil.

CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)

*

Offline srsa_4c

  • ******
  • 3728
Re: 1.5 development planning thread
« Reply #33 on: 23 / March / 2016, 16:39:51 »
Small update to the language string exclusion patch:
- added more conditions to entries in lang_str_conditions.h
- updated Makefile rules to rebuild output files when lang_str_conditions.h is changed
- added support for negative logic in conditions (generates #ifndef... in lang_str.h)
- simplified output for lang_str.h
Thanks for the improvements. I think CAM_REMOTE_USES_PRECISION_SYNC will need to be inverted (noticed on the a3200). I'll update this if I find something else.


*

Offline philmoz

  • *****
  • 3070
    • Photos
Re: 1.5 development planning thread
« Reply #34 on: 23 / March / 2016, 22:44:41 »
I think CAM_REMOTE_USES_PRECISION_SYNC will need to be inverted (noticed on the a3200).


Ooops - got that one wrong :)


String # 279 does not appear to be used anywhere - we could set the conditional string to something like "___NOT_USED___" to exclude it from all builds.


Phil.

CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)

*

Offline srsa_4c

  • ******
  • 3728
Re: 1.5 development planning thread
« Reply #35 on: 24 / March / 2016, 21:20:53 »
String # 279 does not appear to be used anywhere - we could set the conditional string to something like "___NOT_USED___" to exclude it from all builds.
Also a good idea. Since lang_str_conditions.h is a bit obscure, we could add a comment to core/gui_lang.h, so that the person modifying language strings gets a reminder. Alternatively, we could break compilation if lstrc_list[] is not (GUI_LANG_ITEMS+1) long...?

*

Offline srsa_4c

  • ******
  • 3728
Re: 1.5 development planning thread
« Reply #36 on: 26 / March / 2016, 17:09:48 »
String # 279 does not appear to be used anywhere - we could set the conditional string to something like "___NOT_USED___" to exclude it from all builds.
Also a good idea. Since lang_str_conditions.h is a bit obscure, we could add a comment to core/gui_lang.h, so that the person modifying language strings gets a reminder. Alternatively, we could break compilation if lstrc_list[] is not (GUI_LANG_ITEMS+1) long...?
Fixed CAM_REMOTE_USES_PRECISION_SYNC, added ___NOT_USED___ and made makelang emit yet another check at the bottom of lang_str.h .

Is it now OK to commit this?

*

Offline philmoz

  • *****
  • 3070
    • Photos
Re: 1.5 development planning thread
« Reply #37 on: 26 / March / 2016, 17:42:43 »
String # 279 does not appear to be used anywhere - we could set the conditional string to something like "___NOT_USED___" to exclude it from all builds.
Also a good idea. Since lang_str_conditions.h is a bit obscure, we could add a comment to core/gui_lang.h, so that the person modifying language strings gets a reminder. Alternatively, we could break compilation if lstrc_list[] is not (GUI_LANG_ITEMS+1) long...?
Fixed CAM_REMOTE_USES_PRECISION_SYNC, added ___NOT_USED___ and made makelang emit yet another check at the bottom of lang_str.h .

Is it now OK to commit this?


Looks good to me.


Phil.

CHDK ports:
  sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
  g12 (1.00c, 1.00e, 1.00f & 1.00g)
  sx130is (1.01d & 1.01f)
  ixus310hs (1.00a & 1.01a)
  sx40hs (1.00d, 1.00g & 1.00i)
  g1x (1.00e, 1.00f & 1.00g)


*

Offline reyalp

  • ******
  • 11591
Re: 1.5 development planning thread
« Reply #38 on: 26 / March / 2016, 18:53:29 »
Quote
Is it now OK to commit this?
Looks good to me.
I only skimmed it very quickly but I trust both your judgement.
Don't forget what the H stands for.

*

Offline srsa_4c

  • ******
  • 3728
Re: 1.5 development planning thread
« Reply #39 on: 26 / March / 2016, 20:38:34 »
Thanks, committed.

 

Related Topics