X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fstm-demo%2Fao_demo.c;h=9a581ff91a9ce4dc0ec19fa14f6ef1e01948899d;hb=e033a72d3f420e18ed24354c7dfc7e1317a03fb6;hp=879f7f75bb4fbdb1cb3c71c67fddb43aa645439d;hpb=67044cca5b463772491d0712d0ce07a8f897a476;p=fw%2Faltos

diff --git a/src/stm-demo/ao_demo.c b/src/stm-demo/ao_demo.c
index 879f7f75..9a581ff9 100644
--- a/src/stm-demo/ao_demo.c
+++ b/src/stm-demo/ao_demo.c
@@ -83,7 +83,7 @@ ao_spi_write(void) {
 	int i;
 
 	for (i = 0; i < 10; i++) {
-		ao_spi_get(0);
+		ao_spi_get(0, AO_SPI_SPEED_FAST);
 		stm_gpio_set(&stm_gpioc, 12, 0);
 		ao_spi_send(data, 4, 0);
 		stm_gpio_set(&stm_gpioc, 12, 1);
@@ -100,7 +100,7 @@ ao_spi_read(void) {
 	int i;
 
 	for (i = 0; i < 10; i++) {
-		ao_spi_get(0);
+		ao_spi_get(0, AO_SPI_SPEED_FAST);
 		stm_gpio_set(&stm_gpioc, 12, 0);
 		ao_spi_recv(data, 4, 0);
 		stm_gpio_set(&stm_gpioc, 12, 1);
@@ -119,7 +119,7 @@ ao_i2c_write(void) {
 	for (i = 0; i < 10; i++) {
 		ao_i2c_get(0);
 		if (ao_i2c_start(0, 0x55))
-			ao_i2c_send(data, 4, 0);
+			ao_i2c_send(data, 4, 0, TRUE);
 		else {
 			printf ("i2c start failed\n");
 			ao_i2c_put(0);
@@ -135,16 +135,16 @@ ao_i2c_write(void) {
 static void
 ao_temp (void)
 {
-	struct ao_adc	adc;
+	struct ao_data	packet;
 	int temp;
 
-	ao_adc_get(&adc);
+	ao_data_get(&packet);
 
 	/*
 	 * r = (110 - 25) / (ts_cal_hot - ts_cal_cold)
 	 * 25 + (110 - 25) * (temp - ts_cal_cold) / (ts_cal_hot - ts_cal_cold)
 	 */
-	temp = 25 + (110 - 25) * (adc.temp - stm_temp_cal.ts_cal_cold) / (stm_temp_cal.ts_cal_hot - stm_temp_cal.ts_cal_cold);
+	temp = 25 + (110 - 25) * (packet.adc.temp - stm_temp_cal.ts_cal_cold) / (stm_temp_cal.ts_cal_hot - stm_temp_cal.ts_cal_cold);
 	printf ("temp: %d\n", temp);
 }
 
@@ -166,7 +166,7 @@ main(void)
 	ao_timer_init();
 	ao_dma_init();
 	ao_cmd_init();
-//	ao_lcd_stm_init();
+	ao_lcd_stm_init();
 //	ao_lcd_font_init();
 	ao_spi_init();
 	ao_i2c_init();
@@ -174,6 +174,7 @@ main(void)
 	ao_timer_set_adc_interval(100);
 
 	ao_adc_init();
+	ao_usb_init();
 
 	ao_cmd_register(&ao_demo_cmds[0]);