Skip to content

Commit

Permalink
Berry rename axp drivers (#22718)
Browse files Browse the repository at this point in the history 
* Berry rename axp drivers

* fix compilation
  • Loading branch information
@s-hadinger
s-hadinger authored Dec 26, 2024
1 parent 1d244fc commit 2143082
Show file tree
Hide file tree
Showing 6 changed files with 254 additions and 238 deletions.
8 changes: 7 additions & 1 deletion lib/libesp32/berry_tasmota/solidify_all.be
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,22 @@ import sys
sys.path().push('src/embedded') # allow to import from src/embedded

# globals that need to exist to make compilation succeed
var globs = "path,ctypes_bytes_dyn,tasmota,ccronexpr,gpio,light,webclient,load,MD5,lv,light_state,udp,I2C_Driver,tcpserver,log,"
var globs = "path,ctypes_bytes_dyn,tasmota,ccronexpr,gpio,light,webclient,load,MD5,lv,light_state,udp,tcpserver,log,"
"lv_clock,lv_clock_icon,lv_signal_arcs,lv_signal_bars,lv_wifi_arcs_icon,lv_wifi_arcs,"
"lv_wifi_bars_icon,lv_wifi_bars,"
"_lvgl,"
"int64"

var glob_classes = "I2C_Driver"

for g:string2.split(globs, ",")
global.(g) = nil
end

for g:string2.split(glob_classes, ",")
compile(f"class {g} end")()
end

var prefix_dir = "src/embedded/"
var prefix_out = "src/solidify/"

Expand Down
4 changes: 2 additions & 2 deletions ...ry_tasmota/src/be_i2c_axp192_axp202_lib.c → ...ta/src/be_i2c_axp192_axp202_axp2102_lib.c
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/********************************************************************
* Drivers for AXP192 and AXP202 I2C Solidified
*******************************************************************/
#include "solidify/solidified_i2c_axp192.h"
#include "solidify/solidified_i2c_axp202.h"
#include "solidify/solidified_AXP192.h"
#include "solidify/solidified_AXP202.h"
7 changes: 4 additions & 3 deletions .../berry_tasmota/src/embedded/i2c_axp192.be → ...sp32/berry_tasmota/src/embedded/AXP192.be
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#-------------------------------------------------------------
- Generic driver for AXP192 - solidified
-------------------------------------------------------------#
class I2C_Driver end # for solidification

#@ solidify:AXP192
class AXP192 : I2C_Driver
def init()
def init(addr)
if (addr == nil) addr = 0x34 end # default address is 0x34
super(self, I2C_Driver).init("AXP192", 0x34)
end

Expand All @@ -27,7 +27,7 @@ class AXP192 : I2C_Driver
end

# Battery Charging Status
def get_battery_chargin_status()
def get_battery_charging_status()
return self.wire.read(self.addr, 0x01, 1)
end

Expand Down Expand Up @@ -187,3 +187,4 @@ class AXP192 : I2C_Driver
tasmota.response_append(msg)
end
end
return AXP192
9 changes: 5 additions & 4 deletions .../berry_tasmota/src/embedded/i2c_axp202.be → ...sp32/berry_tasmota/src/embedded/AXP202.be
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#-------------------------------------------------------------
- Generic driver for AXP202 - solidified
-------------------------------------------------------------#
class I2C_Driver end # for solidification

#@ solidify:AXP202
#@ solidify:AXP202
class AXP202 : I2C_Driver
def init()
def init(addr)
if (addr == nil) addr = 0x35 end # default address is 0x35
super(self, I2C_Driver).init("AXP202", 0x35)
end

Expand All @@ -22,7 +22,7 @@ class AXP202 : I2C_Driver
end

# Battery Charging Status
def get_battery_chargin_status()
def get_battery_charging_status()
return self.wire.read(self.addr, 0x01, 1)
end

Expand Down Expand Up @@ -189,3 +189,4 @@ class AXP202 : I2C_Driver
# # tasmota.response_append(msg)
# end
end
return AXP202
104 changes: 54 additions & 50 deletions ...mota/src/solidify/solidified_i2c_axp192.h → ..._tasmota/src/solidify/solidified_AXP192.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Solidification of i2c_axp192.h */
/* Solidification of AXP192.h */
/********************************************************************\
* Generated code, don't edit *
\********************************************************************/
Expand All @@ -11,7 +11,7 @@ static const bvalue be_ktab_class_AXP192[37] = {
/* K3 */ be_const_int(2),
/* K4 */ be_const_int(3),
/* K5 */ be_nested_str(read24),
/* K6 */ be_const_real_hex(0x3A102DE0),
/* K6 */ be_const_real_hex(0x3A102DE1),
/* K7 */ be_nested_str(read12),
/* K8 */ be_const_real_hex(0x3A902DE0),
/* K9 */ be_const_real_hex(0x3EC00000),
Expand Down Expand Up @@ -551,8 +551,8 @@ be_local_closure(class_AXP192_json_append, /* name */
********************************************************************/
be_local_closure(class_AXP192_init, /* name */
be_nested_proto(
5, /* nstack */
1, /* argc */
6, /* nstack */
2, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
Expand All @@ -562,16 +562,20 @@ be_local_closure(class_AXP192_init, /* name */
&be_ktab_class_AXP192, /* shared constants */
&be_const_str_init,
&be_const_str_solidified,
( &(const binstruction[ 9]) { /* code */
0x60040003, // 0000 GETGBL R1 G3
0x5C080000, // 0001 MOVE R2 R0
0xB80E3000, // 0002 GETNGBL R3 K24
0x7C040400, // 0003 CALL R1 2
0x8C040319, // 0004 GETMET R1 R1 K25
0x580C001A, // 0005 LDCONST R3 K26
0x54120033, // 0006 LDINT R4 52
0x7C040600, // 0007 CALL R1 3
0x80000000, // 0008 RET 0
( &(const binstruction[13]) { /* code */
0x4C080000, // 0000 LDNIL R2
0x1C080202, // 0001 EQ R2 R1 R2
0x780A0000, // 0002 JMPF R2 #0004
0x54060033, // 0003 LDINT R1 52
0x60080003, // 0004 GETGBL R2 G3
0x5C0C0000, // 0005 MOVE R3 R0
0xB8123000, // 0006 GETNGBL R4 K24
0x7C080400, // 0007 CALL R2 2
0x8C080519, // 0008 GETMET R2 R2 K25
0x5810001A, // 0009 LDCONST R4 K26
0x54160033, // 000A LDINT R5 52
0x7C080600, // 000B CALL R2 3
0x80000000, // 000C RET 0
})
)
);
Expand Down Expand Up @@ -659,34 +663,29 @@ be_local_closure(class_AXP192_web_sensor, /* name */


/********************************************************************
** Solidified function: set_chg_current
** Solidified function: get_battery_charging_status
********************************************************************/
be_local_closure(class_AXP192_set_chg_current, /* name */
be_local_closure(class_AXP192_get_battery_charging_status, /* name */
be_nested_proto(
8, /* nstack */
2, /* argc */
6, /* nstack */
1, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_AXP192, /* shared constants */
&be_const_str_set_chg_current,
&be_const_str_get_battery_charging_status,
&be_const_str_solidified,
( &(const binstruction[12]) { /* code */
0x8C08010F, // 0000 GETMET R2 R0 K15
0x54120032, // 0001 LDINT R4 51
0x8C140110, // 0002 GETMET R5 R0 K16
0x541E0032, // 0003 LDINT R7 51
0x7C140400, // 0004 CALL R5 2
0x541A00EF, // 0005 LDINT R6 240
0x2C140A06, // 0006 AND R5 R5 R6
0x541A000E, // 0007 LDINT R6 15
0x2C180206, // 0008 AND R6 R1 R6
0x30140A06, // 0009 OR R5 R5 R6
0x7C080600, // 000A CALL R2 3
0x80000000, // 000B RET 0
( &(const binstruction[ 7]) { /* code */
0x8804010A, // 0000 GETMBR R1 R0 K10
0x8C04030B, // 0001 GETMET R1 R1 K11
0x880C010C, // 0002 GETMBR R3 R0 K12
0x58100000, // 0003 LDCONST R4 K0
0x58140000, // 0004 LDCONST R5 K0
0x7C040800, // 0005 CALL R1 4
0x80040200, // 0006 RET 1 R1
})
)
);
Expand Down Expand Up @@ -823,29 +822,34 @@ be_local_closure(class_AXP192_power_off, /* name */


/********************************************************************
** Solidified function: get_battery_chargin_status
** Solidified function: set_chg_current
********************************************************************/
be_local_closure(class_AXP192_get_battery_chargin_status, /* name */
be_local_closure(class_AXP192_set_chg_current, /* name */
be_nested_proto(
6, /* nstack */
1, /* argc */
8, /* nstack */
2, /* argc */
10, /* varg */
0, /* has upvals */
NULL, /* no upvals */
0, /* has sup protos */
NULL, /* no sub protos */
1, /* has constants */
&be_ktab_class_AXP192, /* shared constants */
&be_const_str_get_battery_chargin_status,
&be_const_str_set_chg_current,
&be_const_str_solidified,
( &(const binstruction[ 7]) { /* code */
0x8804010A, // 0000 GETMBR R1 R0 K10
0x8C04030B, // 0001 GETMET R1 R1 K11
0x880C010C, // 0002 GETMBR R3 R0 K12
0x58100000, // 0003 LDCONST R4 K0
0x58140000, // 0004 LDCONST R5 K0
0x7C040800, // 0005 CALL R1 4
0x80040200, // 0006 RET 1 R1
( &(const binstruction[12]) { /* code */
0x8C08010F, // 0000 GETMET R2 R0 K15
0x54120032, // 0001 LDINT R4 51
0x8C140110, // 0002 GETMET R5 R0 K16
0x541E0032, // 0003 LDINT R7 51
0x7C140400, // 0004 CALL R5 2
0x541A00EF, // 0005 LDINT R6 240
0x2C140A06, // 0006 AND R5 R5 R6
0x541A000E, // 0007 LDINT R6 15
0x2C180206, // 0008 AND R6 R1 R6
0x30140A06, // 0009 OR R5 R5 R6
0x7C080600, // 000A CALL R2 3
0x80000000, // 000B RET 0
})
)
);
Expand Down Expand Up @@ -891,12 +895,12 @@ be_local_class(AXP192,
( (struct bmapnode*) &(const bmapnode[]) {
{ be_const_key(set_dcdc_enable, -1), be_const_closure(class_AXP192_set_dcdc_enable_closure) },
{ be_const_key(get_bat_power, -1), be_const_closure(class_AXP192_get_bat_power_closure) },
{ be_const_key(get_bat_charge_current, 3), be_const_closure(class_AXP192_get_bat_charge_current_closure) },
{ be_const_key(get_battery_chargin_status, -1), be_const_closure(class_AXP192_get_battery_chargin_status_closure) },
{ be_const_key(get_bat_charge_current, -1), be_const_closure(class_AXP192_get_bat_charge_current_closure) },
{ be_const_key(set_chg_current, -1), be_const_closure(class_AXP192_set_chg_current_closure) },
{ be_const_key(get_warning_level, -1), be_const_closure(class_AXP192_get_warning_level_closure) },
{ be_const_key(power_off, -1), be_const_closure(class_AXP192_power_off_closure) },
{ be_const_key(get_vbus_current, 22), be_const_closure(class_AXP192_get_vbus_current_closure) },
{ be_const_key(get_aps_voltage, -1), be_const_closure(class_AXP192_get_aps_voltage_closure) },
{ be_const_key(get_aps_voltage, 17), be_const_closure(class_AXP192_get_aps_voltage_closure) },
{ be_const_key(set_exten, -1), be_const_closure(class_AXP192_set_exten_closure) },
{ be_const_key(battery_present, -1), be_const_closure(class_AXP192_battery_present_closure) },
{ be_const_key(get_vbus_voltage, -1), be_const_closure(class_AXP192_get_vbus_voltage_closure) },
Expand All @@ -906,9 +910,9 @@ be_local_class(AXP192,
{ be_const_key(init, 2), be_const_closure(class_AXP192_init_closure) },
{ be_const_key(get_bat_current, -1), be_const_closure(class_AXP192_get_bat_current_closure) },
{ be_const_key(web_sensor, -1), be_const_closure(class_AXP192_web_sensor_closure) },
{ be_const_key(set_dc_voltage, -1), be_const_closure(class_AXP192_set_dc_voltage_closure) },
{ be_const_key(get_battery_charging_status, -1), be_const_closure(class_AXP192_get_battery_charging_status_closure) },
{ be_const_key(get_temp, -1), be_const_closure(class_AXP192_get_temp_closure) },
{ be_const_key(set_chg_current, 17), be_const_closure(class_AXP192_set_chg_current_closure) },
{ be_const_key(set_dc_voltage, 3), be_const_closure(class_AXP192_set_dc_voltage_closure) },
{ be_const_key(get_bat_voltage, 5), be_const_closure(class_AXP192_get_bat_voltage_closure) },
{ be_const_key(json_append, -1), be_const_closure(class_AXP192_json_append_closure) },
{ be_const_key(get_input_power_status, -1), be_const_closure(class_AXP192_get_input_power_status_closure) },
Expand Down
Loading

0 comments on commit 2143082

Please sign in to comment.