Skip to content

merge from main #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xuliqun25 merged 34 commits into from
Dec 3, 2019
Merged

merge from main #6

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7e3784f
Merge pull request #2 from LiteOS/iot_link
LoveHelenMore Nov 7, 2019
e67dd4f
Merge pull request #3 from LiteOS/iot_link
LoveHelenMore Nov 25, 2019
e7ca73b
add fota feature.
songjiannan Nov 25, 2019
d6752bd
Merge pull request #239 from xuliqun25/iot_link
xuliqun25 Nov 25, 2019
7ce9671
modify bearpi os func sdkconfig
BearPi Nov 25, 2019
038fd18
Add ota_package_toos,use this tool to make package for sota and fota
LoveHelenMore Nov 26, 2019
27e443d
Merge pull request #238 from songjiannan/iotlink
cruise2018 Nov 27, 2019
be572a1
Merge pull request #240 from BearPi/iot_link
cruise2018 Nov 27, 2019
2ed78f3
modify:BearPI_demo:modify the default demo to street light
1552971348 Nov 27, 2019
0513b91
add oc_streetlight_infrared_template
1552971348 Nov 27, 2019
d69ed04
modify:BearPI:add my own sensor
1552971348 Nov 27, 2019
a5afb92
add file ota_package_tool_guide.md
LoveHelenMore Nov 27, 2019
8549a16
add:add my own demo function
1552971348 Nov 27, 2019
c6c62cb
fix:bearpi:fix GPIO
1552971348 Nov 27, 2019
cf12d97
Merge pull request #243 from 1552971348/iot
cruise2018 Nov 27, 2019
bd552c7
Merge branch 'iot' into mysensor
1552971348 Nov 27, 2019
26bf07a
Merge pull request #242 from LoveHelenMore/iot_link
cruise2018 Nov 27, 2019
193937e
modify bearpi helloworld sdkconfig
BearPi Nov 27, 2019
775d106
add GPIO PC9 interrupts
1552971348 Nov 27, 2019
7c2db72
Merge pull request #244 from BearPi/iot_link
cruise2018 Nov 28, 2019
e789f21
ok
1552971348 Nov 28, 2019
bd7819c
add ota binary signature check.
songjiannan Nov 28, 2019
3e3d91b
ok
1552971348 Nov 29, 2019
af8b3af
Merge branch 'bearpi_Infrared' into iot
1552971348 Nov 29, 2019
2cc9724
change defaut DEMO
1552971348 Nov 29, 2019
1a7bb93
Merge branch 'mysensor' into iot
1552971348 Nov 29, 2019
ef0b63a
Merge pull request #245 from songjiannan/iotlink
cruise2018 Nov 29, 2019
43d3352
Merge pull request #246 from 1552971348/iot
cruise2018 Nov 29, 2019
560f2d3
add ota support document
songjiannan Nov 30, 2019
3d102f9
rename ota_package_tool to ota_tool.add verify signature and restore
LoveHelenMore Nov 30, 2019
b6aff02
Merge pull request #248 from songjiannan/iotlink
cruise2018 Dec 3, 2019
8edf4de
Merge pull request #249 from LoveHelenMore/iot_link
cruise2018 Dec 3, 2019
189c139
modify:target:modify the qutel/neoway project to QUALCOMM9X07
cruise2018 Dec 3, 2019
8c72f43
Merge pull request #250 from cruise2018/iot_link
cruise2018 Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions targets/STM32L431_BearPi/Demos/oc_streetlight_template/oc_streetlight_template.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin)
key2 = 1;
printf("toggle LED and report!\r\n");
toggle = !toggle;
HAL_GPIO_TogglePin(Light_GPIO_Port,Light_Pin);
HAL_GPIO_TogglePin(SC1_Light_GPIO_Port,SC1_Light_Pin);
break;
default:
break;
Expand Down Expand Up @@ -205,7 +205,7 @@ static int app_cmd_task_entry()
toggle = 1;
key2 = true;
}
HAL_GPIO_WritePin(Light_GPIO_Port,Light_Pin,GPIO_PIN_SET);
HAL_GPIO_WritePin(SC1_Light_GPIO_Port,SC1_Light_Pin,GPIO_PIN_SET);

//if you need response message,do it here--TODO
replymsg.msgid = cn_app_cmdreply;
Expand All @@ -225,7 +225,7 @@ static int app_cmd_task_entry()
toggle = 0;
key2 = true;
}
HAL_GPIO_WritePin(Light_GPIO_Port,Light_Pin,GPIO_PIN_RESET);
HAL_GPIO_WritePin(SC1_Light_GPIO_Port,SC1_Light_Pin,GPIO_PIN_RESET);

//if you need response message,do it here--TODO
replymsg.msgid = cn_app_cmdreply;
Expand Down
4 changes: 2 additions & 2 deletions targets/STM32L431_BearPi/Inc/gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@

#define LED_Pin GPIO_PIN_13
#define LED_GPIO_Port GPIOC
#define Light_Pin GPIO_PIN_9
#define Light_GPIO_Port GPIOB
//#define Light_Pin GPIO_PIN_9
//#define Light_GPIO_Port GPIOB
/* USER CODE BEGIN Includes */

/* USER CODE END Includes */
Expand Down
18 changes: 9 additions & 9 deletions targets/STM32L431_BearPi/Src/gpio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,15 @@ void MX_GPIO_Init(void)
__HAL_RCC_GPIOA_CLK_ENABLE();
__HAL_RCC_GPIOB_CLK_ENABLE();

/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(Light_GPIO_Port, Light_Pin, GPIO_PIN_RESET);

/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = Light_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_NOPULL;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(Light_GPIO_Port, &GPIO_InitStruct);
// /*Configure GPIO pin Output Level */
// HAL_GPIO_WritePin(Light_GPIO_Port, Light_Pin, GPIO_PIN_RESET);
//
// /*Configure GPIO pin : PtPin */
// GPIO_InitStruct.Pin = Light_Pin;
// GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
// GPIO_InitStruct.Pull = GPIO_NOPULL;
// GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
// HAL_GPIO_Init(Light_GPIO_Port, &GPIO_InitStruct);

GPIO_InitStruct.Pin = KEY1_Pin|KEY2_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_IT_FALLING;
Expand Down