Skip to content
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

Gas sensor firmware update #733

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Gas sensor firmware update #733

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6948474
gas sensor fw update - initial commit
divkam Dec 2, 2016
41b01c8
Merge remote-tracking branch 'origin/master' into ccs811-fw-update
divkam Dec 6, 2016
05e251b
comments
divkam Jan 4, 2017
b3befb7
Merge remote-tracking branch 'origin/master' into ccs811-fw-update
divkam Jan 4, 2017
024a23b
can program, ver doesn't update
divkam Jan 10, 2017
bb14443
add fw app version
divkam Jan 10, 2017
ce5571a
fix app version, get err id
divkam Jan 10, 2017
6df05ec
init tvoc after fw update
divkam Jan 10, 2017
24a2715
debug comments
divkam Jan 10, 2017
912be89
16bit ver, reset tvoc_wa, dbg logs
divkam Jan 10, 2017
4727c15
text
divkam Jan 23, 2017
5f6c00f
updated proto fields for tvoc fw update
divkam Jan 23, 2017
decebc4
moved update_tvoc_fw to sync response proto
divkam Jan 23, 2017
8fb35d7
update fw from download task
divkam Jan 23, 2017
a296b6e
tvoc ver in periodic upload
divkam Jan 24, 2017
a12cadd
tvfw cmd options
divkam Jan 30, 2017
1284516
Merge remote-tracking branch 'origin/master' into ccs811-fw-update
divkam Jan 30, 2017
158ffa5
Fix function
divkam Jan 31, 2017
6218fc5
updated for only periodic version upload
divkam Feb 2, 2017
a22a7c8
removed fw updated related code
divkam Feb 2, 2017
e30ab13
updated protobuf
divkam Feb 2, 2017
6429bfc
remove unused
divkam Feb 2, 2017
1c292aa
Updated init tvoc
divkam Feb 2, 2017
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
Prev Previous commit
Next Next commit
add fw app version
  • Loading branch information
@divkam
divkam committed Jan 10, 2017
commit bb1444393c779ca4a4e206285440e4700899297b
38 changes: 31 additions & 7 deletions kitsune/i2c_cmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,18 +508,35 @@ inline static uint8_t _tvoc_get_fw_boot_version(void){
xSemaphoreGiveRecursive(i2c_smphr);
}

LOGI("FW: 0x%x%x\n",fw_boot_ver_cmd[1], fw_boot_ver_cmd[2] );
LOGI("FW Boot: 0x%x%x\n",fw_boot_ver_cmd[1], fw_boot_ver_cmd[2] );
return fw_boot_ver_cmd[1];

}

inline static uint8_t _tvoc_get_fw_app_version(void){

uint8_t fw_app_ver_cmd[3] = {0x25, 0xFF, 0xFF};

if(xSemaphoreTakeRecursive(i2c_smphr, 30000)){

(I2C_IF_Write(tvoc_i2c_addr, fw_app_ver_cmd, 1, 1));
(I2C_IF_Read(tvoc_i2c_addr, &fw_app_ver_cmd[1], 2));

xSemaphoreGiveRecursive(i2c_smphr);
}

LOGI("FW APP: 0x%x%x\n",fw_app_ver_cmd[1], fw_app_ver_cmd[2] );
return fw_app_ver_cmd[1];

}
// CCS811 firmware update
// Returns 0 if firmware update is successful, -1 otherwise
int tvoc_fw_update(const char* file)
{
int ret_val = 0;

LOGI("*TVOC FW UPDATE* \n -Current HW version: 0x%x. FW Boot Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version());
LOGI("*TVOC FW UPDATE* \n -Current HW version: 0x%x. FW Boot Version: 0x%x, FW App Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version(), _tvoc_get_fw_app_version());


if( !file ){
Expand Down Expand Up @@ -552,8 +569,15 @@ int tvoc_fw_update(const char* file)

// verify
if(!_tvoc_verify_app()){
LOGI("*TVOC FW UPDATE SUCCESSFUL* \n -HW version: 0x%x. FW Boot Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version());
LOGI("*TVOC FW UPDATE* \n -Current HW version: 0x%x. FW Boot Version: 0x%x, FW App Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version(), _tvoc_get_fw_app_version());

// reset CCS811
if(_tvoc_reset()){
ret_val = -2;
goto tvoc_fail;
}

return 0;
}
else{
Expand Down Expand Up @@ -581,8 +605,8 @@ int cmd_tvoc_fw_update(int argc, char *argv[]) {
// Cmd to get hardware and fw version of CCS811
int cmd_tvoc_get_ver(int argc, char *argv[]) {

LOGI("*TVOC VERSION* \n -Current HW version: 0x%x. FW Boot Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version());
LOGI("*TVOC FW UPDATE* \n -Current HW version: 0x%x. FW Boot Version: 0x%x, FW App Version: 0x%x- \n",
_tvoc_get_hw_version(), _tvoc_get_fw_boot_version(), _tvoc_get_fw_app_version());

return 0;
}
Expand Down