Bläddra i källkod

fix: 删除airtalk 在780XX 上关于LED 控制相关的代码

梁健 5 månader sedan
förälder
incheckning
fa5e37ce64

+ 9 - 9
luat/demo/i2s/main.lua

@@ -41,17 +41,17 @@ sys.taskInit(function()
 
     local voice_vol = 70
 
-    i2c.setup(i2c_id,i2c.FAST)
-    i2s.setup(i2s_id, i2s_mode, i2s_sample_rate, i2s_bits_per_sample, i2s_channel_format, i2s_communication_format,i2s_channel_bits)
+        i2c.setup(i2c_id,i2c.FAST)
+        i2s.setup(i2s_id, i2s_mode, i2s_sample_rate, i2s_bits_per_sample, i2s_channel_format, i2s_communication_format,i2s_channel_bits)
 
-    audio.config(multimedia_id, pa_pin, pa_on_level, power_delay, pa_delay, power_pin)
-    audio.setBus(multimedia_id, audio.BUS_I2S,{chip = "es8311",i2cid = i2c_id , i2sid = i2s_id})	--通道0的硬件输出通道设置为I2S
+        audio.config(multimedia_id, pa_pin, pa_on_level, power_delay, pa_delay, power_pin)
+        audio.setBus(multimedia_id, audio.BUS_I2S,{chip = "es8311",i2cid = i2c_id , i2sid = i2s_id})	--通道0的硬件输出通道设置为I2S  
 
-    -- 播放参数设置
-    audio.start(multimedia_id, audio.PCM, 1, 16000, 16)
-    -- 音量设置
-    audio.vol(multimedia_id, 50)
-    audio.pm(multimedia_id,audio.RESUME)
+        -- 播放参数设置
+        audio.start(multimedia_id, audio.PCM, 1, 16000, 16)
+        -- 音量设置
+        audio.vol(multimedia_id, 50)
+        audio.pm(multimedia_id,audio.RESUME)
     -- PCM播放演示, 16k采样率, 16bit采样深度
     local file_size = fs.fsize("/luadb/test.pcm")
     -- print("/luadb/test.pcm size",file_size)   

+ 0 - 3
module/Air780EHM_Air780EHV_Air780EGH/demo/airtalk/readme.md

@@ -18,7 +18,6 @@
 
 1.    按一次boot,选择群组内第一个联系人,开始1对1对讲,再按一次boot,结束对讲
 2.    按一次powerkey,开始1对多广播,再按一次powerkey或者boot,结束对讲
-3.    当收到对讲信息的时候,LED灯常亮,关闭对讲的时候LED 灯灭,Air780XX 系列需要外接LED 灯
 
 ## 演示硬件环境
 
@@ -58,6 +57,4 @@ I/user. 联系人列表更新
 
 7、 点击POWERKEY按键,会进行广播,所有群组内的人,都会收到对讲消息,并亮起灯
 
-8、在进行流式播放测试的时候,使用test.pcm 模拟音频来源,通过流式传输不断填入播放的音频,使用powerkey 按键进行音量减小,点击boot 按键进行音量增加,注意流式播放目前仅支持PCM 格式音频,可选择不同的采样率,以及位深
-
 

+ 0 - 11
module/Air780EHM_Air780EHV_Air780EGH/demo/airtalk/talk.lua

@@ -3,8 +3,6 @@
     1.  按键操作
     按一次boot,开始1对1对讲,再按一次boot,结束对讲
     按一次powerkey,开始1对多对讲,再按一次powerkey或者boot,结束对讲
-    2. 指示灯
-    当收到对讲信息的时候,LED灯常亮,关闭对讲的时候LED 灯灭,Air780XX 系列需要外接LED 灯
 ]]
 
 -- 引入必要模块
@@ -46,9 +44,6 @@ local function contact_list_callback(dev_list)
     end
 end
 
-local gpio_number = 20 -- 如果开发板上有灯,可以修改此处为需要的灯
-
-LED = gpio.setup(gpio_number, 1) -- 设置为LED输出模式,用于指示对讲功能
 
 
 -- 对讲状态回调函数
@@ -57,10 +52,8 @@ local function speech_state_callback(event_table)
     
     if event_table.state == extalk.START then
         log.info("对讲开始")
-        LED(1)
         g_speech_active = true
     elseif event_table.state == extalk.STOP then
-        LED(0)
         log.info("对讲结束")
         g_speech_active = false
     elseif event_table.state == extalk.UNRESPONSIVE then
@@ -68,7 +61,6 @@ local function speech_state_callback(event_table)
         g_speech_active = false
     elseif event_table.state == extalk.ONE_ON_ONE then
         g_speech_active = true
-        LED(1)
         local dev_name = "未知设备"
         if g_dev_list then
             for i = 1, #g_dev_list do
@@ -81,7 +73,6 @@ local function speech_state_callback(event_table)
         log.info(string.format("%s 来电", dev_name))
     elseif event_table.state == extalk.BROADCAST then
         g_speech_active = true
-        LED(1)
         local dev_name = "未知设备"
         if g_dev_list then
             for i = 1, #g_dev_list do
@@ -151,7 +142,6 @@ local function handle_key_press(is_power_key)
         -- 当前正在对讲,按任何键都结束对讲
         log.info("结束当前对讲")
         extalk.stop()
-        LED(0)       -- 关闭LED 灯
         g_speech_active = false
     else
         -- 当前未在对讲,根据按键类型开始不同对讲
@@ -201,7 +191,6 @@ local function user_main_task()
         return
     end
     log.info("extalk初始化成功")
-    LED(0)
     -- lower_enter()               -- 需要进入低功耗,请打开此函数
     -- 等待按键消息并处理
     while true do

+ 2 - 2
module/Air8000/project/整机开发板出厂工程/user/talk.lua

@@ -18,7 +18,7 @@ AIRTALK_TASK_NAME = "airtalk_task"
 USER_TASK_NAME = "user"
 
 SUCC = "success"
-local speech_topic = nil
+local speech_topic = "867920075013921"
 local event = ""
 local talk_state = ""
 
@@ -145,7 +145,7 @@ function talk.run()
     run_state = true
     local_id = mobile.imei()
     sys.taskInitEx(init_talk, USER_TASK_NAME)
-    speech_topic = fskv.get("talk_number")
+    speech_topic = "867920075013921"
     log.info("get  speech_topic",speech_topic)
 
     while run_state do