Mercurial > public > ostc4

comparison Discovery/Src/base.c @ 138:cc9c18075e00 FlipDisplay

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed no longer supported scooter code
author Ideenmodellierer
date Sat, 23 Feb 2019 21:10:51 +0100
parents 135eae957389
children e1d66bc78f9a
comparison
equal deleted inserted replaced
137:9eda5a75c5fd 138:cc9c18075e00
228 #include "simulation.h" 228 #include "simulation.h"
229 #include "decom.h" 229 #include "decom.h"
230 #include "timer.h" 230 #include "timer.h"
231 #include "logbook_miniLive.h" 231 #include "logbook_miniLive.h"
232 #include "test_vpm.h" 232 #include "test_vpm.h"
233 //#include "bonexConnect.h"
234 #include "tDebug.h" 233 #include "tDebug.h"
235 234
236 #ifdef DEMOMODE 235 #ifdef DEMOMODE
237 #include "demo.h" 236 #include "demo.h"
238 static void TIM_DEMO_init(void); 237 static void TIM_DEMO_init(void);
400 // settingsGetPointer()->serialLow = (3012 & 0xFF); 399 // settingsGetPointer()->serialLow = (3012 & 0xFF);
401 400
402 // settingsGetPointer()->showDebugInfo = 1; 401 // settingsGetPointer()->showDebugInfo = 1;
403 402
404 /* 403 /*
405 if(settingsGetPointer()->scooterControl)
406 {
407 settingsGetPointer()->bluetoothActive = 1;
408 MX_Bluetooth_PowerOn();
409 if(settingsGetPointer()->scooterDeviceAddress[0] != 0)
410 bC_setConnectRequest();
411 }
412 */
413 /*
414 if( (hardwareDataGetPointer()->primarySerial == 20+18) 404 if( (hardwareDataGetPointer()->primarySerial == 20+18)
415 || (hardwareDataGetPointer()->primarySerial == 20+25) 405 || (hardwareDataGetPointer()->primarySerial == 20+25)
416 || (hardwareDataGetPointer()->primarySerial == 20+27)) 406 || (hardwareDataGetPointer()->primarySerial == 20+27))
417 { 407 {
418 MX_Bluetooth_PowerOn(); 408 MX_Bluetooth_PowerOn();
499 createDiveSettings(); 489 createDiveSettings();
500 updateMenu(); 490 updateMenu();
501 ext_flash_write_settings(); 491 ext_flash_write_settings();
502 } 492 }
503 deco_loop(); 493 deco_loop();
504 /*
505 bonexControl();
506 if(bC_getStatus() == BC_DISCONNECTED)
507 {
508 if(tComm_control()) // will stop while loop if tComm Mode started until exit from UART
509 {
510 createDiveSettings();
511 updateMenu();
512 ext_flash_write_settings();
513 }
514 }
515 */
516 494
517 #ifdef DEBUG_RUNTIME 495 #ifdef DEBUG_RUNTIME
518 translateTime(stateUsed->lifeData.timeBinaryFormat, &Stime); 496 translateTime(stateUsed->lifeData.timeBinaryFormat, &Stime);
519 if(lastsecond == 0xFF) 497 if(lastsecond == 0xFF)
520 { 498 {