split resources, fix format
This commit is contained in:
		
							parent
							
								
									c17f4c9d38
								
							
						
					
					
						commit
						1abc98086e
					
				| @ -17,7 +17,7 @@ public: | ||||
|         app = parent_app; | ||||
| 
 | ||||
|         // TODO open record
 | ||||
|         GpioPin one_wire_pin = {iBTN_GPIO_Port, iBTN_Pin}; | ||||
|         GpioPin one_wire_pin = ibutton_gpio; | ||||
|         GpioPin* one_wire_pin_record = &one_wire_pin; | ||||
|         onewire_slave = new OneWireGpioSlave(one_wire_pin_record); | ||||
|     }; | ||||
|  | ||||
| @ -17,7 +17,7 @@ public: | ||||
|         app = parent_app; | ||||
| 
 | ||||
|         // TODO open record
 | ||||
|         GpioPin one_wire_pin = {iBTN_GPIO_Port, iBTN_Pin}; | ||||
|         GpioPin one_wire_pin = ibutton_gpio; | ||||
|         GpioPin* one_wire_pin_record = &one_wire_pin; | ||||
|         onewire = new OneWireGpio(one_wire_pin_record); | ||||
|     }; | ||||
|  | ||||
| @ -394,6 +394,11 @@ void music_player(void* p) { | ||||
|     MusicDemoContext context = {.state_mutex = &state_mutex, .event_queue = event_queue}; | ||||
|     osThreadId_t player = osThreadNew(music_player_thread, &context, &player_attr); | ||||
| 
 | ||||
|     if(player == NULL) { | ||||
|         printf("cannot create player thread\n"); | ||||
|         furiac_exit(NULL); | ||||
|     } | ||||
| 
 | ||||
|     MusicDemoEvent event; | ||||
|     while(1) { | ||||
|         osStatus_t event_status = osMessageQueueGet(event_queue, &event, NULL, 100); | ||||
|  | ||||
| @ -29,3 +29,4 @@ const GpioPin led_gpio[3] = { | ||||
| 
 | ||||
| const GpioPin backlight_gpio = {DISPLAY_BACKLIGHT_GPIO_Port, DISPLAY_BACKLIGHT_Pin}; | ||||
| const GpioPin vibro_gpio = {VIBRO_GPIO_Port, VIBRO_Pin}; | ||||
| const GpioPin ibutton_gpio = {iButton_GPIO_Port, iButton_Pin}; | ||||
|  | ||||
| @ -11,3 +11,4 @@ extern const bool input_invert[GPIO_INPUT_PINS_COUNT]; | ||||
| extern const GpioPin led_gpio[3]; | ||||
| extern const GpioPin backlight_gpio; | ||||
| extern const GpioPin vibro_gpio; | ||||
| extern const GpioPin ibutton_gpio; | ||||
| @ -27,3 +27,4 @@ const GpioPin led_gpio[3] = { | ||||
| const GpioPin backlight_gpio = {DISPLAY_BACKLIGHT_GPIO_Port, DISPLAY_BACKLIGHT_Pin}; | ||||
| const GpioPin sd_cs_gpio = {SD_CS_GPIO_Port, SD_CS_Pin}; | ||||
| const GpioPin vibro_gpio = {VIBRO_GPIO_Port, VIBRO_Pin}; | ||||
| const GpioPin ibutton_gpio = {iBTN_GPIO_Port, iBTN_Pin}; | ||||
|  | ||||
| @ -12,3 +12,4 @@ extern const GpioPin led_gpio[3]; | ||||
| extern const GpioPin backlight_gpio; | ||||
| extern const GpioPin sd_cs_gpio; | ||||
| extern const GpioPin vibro_gpio; | ||||
| extern const GpioPin ibutton_gpio; | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 DrZlo13
						DrZlo13