Changeset 30049 for trunk/psModules/src/concepts/pmConcepts.c

Timestamp:

Dec 15, 2010, 1:29:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of realtime burntool and new nightly science code into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• psModules/src/concepts/pmConcepts.c (modified) (2 diffs)

trunk/psModules/src/concepts/pmConcepts.c

@@ -249 +249 @@
 CONCEPT_REGISTER_FUNCTION(S32, Enum, -1); // For enums: set default to -1
 CONCEPT_REGISTER_FUNCTION(S32, S32, 0); // For values: set default to 0
-//CONCEPT_REGISTER_FUNCTION(Bool, Bool, NULL); // For values: set default to 0
+CONCEPT_REGISTER_FUNCTION(Bool, Bool, NULL); // For values: set default to 0
 
 static void conceptRegisterTime(const char *name, /* Name of concept */ \
@@ -353 +353 @@
         conceptRegisterStr("CHIP.ID", "Chip identifier", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
         conceptRegisterF32("CHIP.SEEING", "Seeing FWHM (pixels)", NULL, NULL, NULL, false, PM_FPA_LEVEL_CHIP);
+        conceptRegisterBool("CHIP.VIDEOCELL", "Does this OTA have any video cells", p_pmConceptParse_VideoCell,NULL,NULL,false,PM_FPA_LEVEL_CHIP);
     }