Skip to content

Add chip_model method #2

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
merged 3 commits into from
Jun 29, 2023
Merged

Add chip_model method #2

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
485af79
Add ESP32::System::chip_model method
vickash Jun 28, 2023
e20c6da
Return integer from enum rather than string
vickash Jun 29, 2023
ecc50df
Add mruby constants for chip models
vickash Jun 29, 2023
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
Return integer from enum rather than string
  • Loading branch information
@vickash
vickash committed Jun 29, 2023
commit e20c6da7babb4a68315e2cd56ecf1877cee6199d
18 changes: 3 additions & 15 deletions src/mrb_esp32_system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,21 +57,9 @@ mrb_esp32_get_chip_model(mrb_state *mrb, mrb_value self) {
esp_chip_info_t info;
esp_chip_info(&info);

// The integer in info.model is one of an enum. Values taken from here:
// https://github.com/espressif/esp-idf/blob/67552c31dac8cd94fb0d63192a538f4f984c5b6e/components/esp_hw_support/include/esp_chip_info.h#L22C7-L22C7
switch (info.model) {
// String format matches style used when installing ESP-IDF.
case 1: return mrb_str_new_cstr(mrb, "esp32");
case 2: return mrb_str_new_cstr(mrb, "esp32s2");
case 9: return mrb_str_new_cstr(mrb, "esp32s3");
case 5: return mrb_str_new_cstr(mrb, "esp32c3");
case 12: return mrb_str_new_cstr(mrb, "esp32c2");
case 13: return mrb_str_new_cstr(mrb, "esp32c6");
case 16: return mrb_str_new_cstr(mrb, "esp32h2");
case 18: return mrb_str_new_cstr(mrb, "esp32p4");
case 999: return mrb_str_new_cstr(mrb, "simulator");
default: return mrb_str_new_cstr(mrb, "unknown");
}
// The integer value in info.model is one of an enum, esp_chip_model_t, found here:
// https://github.com/espressif/esp-idf/blob/master/components/esp_hw_support/include/esp_chip_info.h
return mrb_fixnum_value(info.model);
}

void
Expand Down