@@ -120,7 +120,7 @@ MetaWear.prototype.connectAndSetUp = function (callback, initBuf) {
120120 } . bind ( this ) ) ;
121121 this . readModelNumber ( function ( error , modelNumber ) {
122122 this . modelNumber = modelNumber ;
123- this . modelDescription = modelDescription ( modelNumber , this . board ) ;
123+ this . modelDescription = MetaWear . mbl_mw_metawearboard_get_model_name ( this . board ) ;
124124 debug ( "Finished MetaWear Init" ) ;
125125 initializeCallback ( code == 0 ? null : code ) ;
126126 } . bind ( this ) ) ;
@@ -129,38 +129,6 @@ MetaWear.prototype.connectAndSetUp = function (callback, initBuf) {
129129 } . bind ( this ) ) ;
130130} ;
131131
132- function modelDescription ( modelNumber , board ) {
133- if ( modelNumber === '0' ) {
134- return 'MetaWear R' ;
135- } else if ( modelNumber === '1' ) {
136- if ( MetaWear . mbl_mw_metawearboard_lookup_module ( board , MetaWear . Module . BAROMETER ) !== MetaWear . Const . MODULE_TYPE_NA ) {
137- return 'MetaWear RPro' ;
138- } else {
139- return 'MetaWear RG' ;
140- }
141- } else if ( modelNumber === '2' ) {
142- if ( MetaWear . mbl_mw_metawearboard_lookup_module ( board , MetaWear . Module . PROXIMITY ) !== MetaWear . Const . MODULE_TYPE_NA ) {
143- return 'MetaDetector' ;
144- } else if ( MetaWear . mbl_mw_metawearboard_lookup_module ( board , MetaWear . Module . HUMIDITY ) !== MetaWear . Const . MODULE_TYPE_NA ) {
145- return 'MetaEnvironment' ;
146- } else if ( MetaWear . mbl_mw_metawearboard_lookup_module ( board , MetaWear . Module . MAGNETOMETER ) !== MetaWear . Const . MODULE_TYPE_NA ) {
147- return 'MetaWear CPro' ;
148- } else {
149- return 'MetaWear C' ;
150- }
151- } else if ( modelNumber === '3' ) {
152- return 'MetaHealth' ;
153- } else if ( modelNumber === '4' ) {
154- return 'MetaTracker' ;
155- } else if ( modelNumber === '5' ) {
156- return 'MetaMotion R' ;
157- } else if ( modelNumber === '6' ) {
158- return 'MetaMotion C' ;
159- } else {
160- return 'Unknown' ;
161- }
162- }
163-
164132// Helper function to parse data types
165133MetaWear . Data . prototype . parseValue = function ( ) {
166134 var value = ref . reinterpret ( this . value , this . length , 0 ) ;
0 commit comments