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.

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

use of I2C communications layer #112

Merged
merged 25 commits into from
Jun 4, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
50566a0
initial commit
fatimayousuf Apr 16, 2021
422e2a9
running into mux error
fatimayousuf Apr 16, 2021
5fde6dd
fixed mux error
fatimayousuf Apr 30, 2021
6191705
.
fatimayousuf May 3, 2021
43bbad7
Merge branch 'master' into i2c_regs
fatimayousuf May 3, 2021
b131785
use new method to read registers
fatimayousuf May 3, 2021
b156b38
^
fatimayousuf May 3, 2021
5b296c4
rmv comments
fatimayousuf May 3, 2021
fa80859
avoid passing smbus and status to method
fatimayousuf May 7, 2021
f67d086
address peter's suggestion
fatimayousuf May 14, 2021
cb89984
get rid of setdev
fatimayousuf May 14, 2021
8d9afd8
restore debug build compile (#109)
pwittich May 6, 2021
fd3408d
Merge branch 'master' into i2c_regs
pwittich May 26, 2021
b702163
Merge branch 'master' into i2c_regs
pwittich May 26, 2021
482f42b
Update FireFlyTask.c
pwittich May 27, 2021
f898068
Update FreeRTOSConfig.h
pwittich May 27, 2021
f1d5108
Update I2CCommunication.c
pwittich May 27, 2021
3b26ab9
wrong help message for ff_cdr_lol
pwittich May 27, 2021
1f70d71
Continue moving towards passing all i2c through the intermediate
pwittich May 27, 2021
3c8e000
strip out rest of SMBUS code from FireflyTask
pwittich May 28, 2021
31ff33c
continue cleanup
pwittich May 28, 2021
9808bf7
Merge remote-tracking branch 'origin/master' into i2c_regs
pwittich May 28, 2021
6ccd14e
fix codeql issue
pwittich May 28, 2021
624df0f
alignment cleanup for hard fault handler (GCC10, thanks @dan131riley)
pwittich Jun 1, 2021
9d4d02b
static -> nonstatic
pwittich Jun 1, 2021
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
2 changes: 1 addition & 1 deletion common/utils.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static const int pins[] = {

void setupActiveLowPins(void)
{
for (int8_t i = 0; i < NPINS; ++i) {
for (int i = 0; i < NPINS; ++i) {
write_gpio_pin(pins[i], 0x1);
}
}
Expand Down
16 changes: 7 additions & 9 deletions projects/cm_mcu/CommandLineTask.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,27 +435,25 @@ static struct command_t commands[] = {
{
"ff_cdr_lol",
ff_cdr_lol_alarm,
"ff_cd_lol\r\n Displays a table showing the CDR loss of lock alarms of the fireflies.\r\n",
"ff_cdr_lol\r\n Displays a table showing the CDR loss of lock alarms of the fireflies.\r\n",
0,
},
{"fpga", fpga_ctl, "fpga (<none>|done)\r\n Displays a table showing the state of FPGAs.\r\n",
-1},
{"id", board_id_info, "id\r\n Prints board ID information.\r\n", 0},
{"i2c_base", i2c_ctl_set_dev,
"i2c_base <device>\r\n Set I2C controller number. Value between 0-9.\r\n", 1},
{"i2cr", i2c_ctl_r,
"i2cr <address> <number of bytes>\r\n Read I2C controller. Addr in hex.\r\n", 2},
"i2cr <dev> <address> <number of bytes>\r\n Read I2C controller. Addr in hex.\r\n", 3},
{"i2crr", i2c_ctl_reg_r,
"i2crr <address> <reg> <number of bytes>\r\n Read I2C controller. Addr in hex\r\n", 3},
{"i2cw", i2c_ctl_w, "i2cw <address> <number of bytes> <value>\r\n Write I2C controller.\r\n",
3},
"i2crr <dev> <address> <reg> <number of bytes>\r\n Read I2C controller. Addr in hex\r\n", 3},
{"i2cw", i2c_ctl_w, "i2cw <dev> <address> <number of bytes> <value>\r\n Write I2C controller.\r\n",
4},
{"i2cwr", i2c_ctl_reg_w,
"i2cwr <address> <reg> <number of bytes>\r\n Write I2C controller.\r\n", 4},
"i2cwr <dev> <address> <reg> <number of bytes>\r\n Write I2C controller.\r\n", 5},
{
"i2c_scan",
i2c_scan,
"i2c_scan\r\n Scan current I2C bus.\r\n",
0,
1,
},
{"help", help_command_fcn, "help\r\n This help command\r\n", -1},
{"pwr", power_ctl,
Expand Down
Loading